tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add --keep_memtag_mode for --wipe_data

Browse source 
This allows us to erase the system image without resetting the MTE
state. This is useful for TestHarness looking to re-use an MTE enabled
device without incurring an extra reboot to re-enable after reboot.

Bug: 300694575
Change-Id: Ie1ea6891361e561189b9390b97b0b4a4c3a6d7e8
This commit is contained in:
Florian Mayer 2023-10-30 17:40:56 +00:00
parent a57eebae81
commit 0feef55859
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
install/include/install/wipe_data.h
View file

@ -27,4 +27,4 @@ struct selabel_handle;
bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm); bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm);
// Returns true on success. // Returns true on success.
bool WipeData(Device* device); bool WipeData(Device* device, bool keep_memtag_mode = false);

16
install/wipe_data.cpp
View file

@ -79,7 +79,7 @@ bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm_func) {
return success; return success;
} }
bool WipeData(Device* device) { bool WipeData(Device* device, bool keep_memtag_mode) {
RecoveryUI* ui = device->GetUI(); RecoveryUI* ui = device->GetUI();
ui->Print("\n-- Wiping data...\n"); ui->Print("\n-- Wiping data...\n");
ui->SetBackground(RecoveryUI::ERASING); ui->SetBackground(RecoveryUI::ERASING);
@ -101,11 +101,15 @@ bool WipeData(Device* device) {
success &= EraseVolume(METADATA_ROOT, ui); success &= EraseVolume(METADATA_ROOT, ui);
} }
} }
ui->Print("Resetting memtag message...\n"); if (keep_memtag_mode) {
std::string err; ui->Print("NOT resetting memtag message as per request...\n");
if (!WriteMiscMemtagMessage({}, &err)) { } else {
ui->Print("Failed to reset memtag message: %s\n", err.c_str()); ui->Print("Resetting memtag message...\n");
success = false; std::string err;
if (!WriteMiscMemtagMessage({}, &err)) {
ui->Print("Failed to reset memtag message: %s\n", err.c_str());
success = false;
}
} }
if (success) { if (success) {
success &= device->PostWipeData(); success &= device->PostWipeData();

6
recovery.cpp
View file

@ -608,6 +608,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
{ "wipe_ab", no_argument, nullptr, 0 }, { "wipe_ab", no_argument, nullptr, 0 },
{ "wipe_cache", no_argument, nullptr, 0 }, { "wipe_cache", no_argument, nullptr, 0 },
{ "wipe_data", no_argument, nullptr, 0 }, { "wipe_data", no_argument, nullptr, 0 },
{ "keep_memtag_mode", no_argument, nullptr, 0 },
{ "wipe_package_size", required_argument, nullptr, 0 }, { "wipe_package_size", required_argument, nullptr, 0 },
{ nullptr, 0, nullptr, 0 }, { nullptr, 0, nullptr, 0 },
}; };
@ -616,6 +617,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
bool install_with_fuse = false; // memory map the update package by default. bool install_with_fuse = false; // memory map the update package by default.
bool should_wipe_data = false; bool should_wipe_data = false;
bool should_prompt_and_wipe_data = false; bool should_prompt_and_wipe_data = false;
bool should_keep_memtag_mode = false;
bool should_wipe_cache = false; bool should_wipe_cache = false;
bool should_wipe_ab = false; bool should_wipe_ab = false;
size_t wipe_package_size = 0; size_t wipe_package_size = 0;
@ -675,6 +677,8 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
should_wipe_data = true; should_wipe_data = true;
} else if (option == "wipe_package_size") { } else if (option == "wipe_package_size") {
android::base::ParseUint(optarg, &wipe_package_size); android::base::ParseUint(optarg, &wipe_package_size);
} else if (option == "keep_memtag_mode") {
should_keep_memtag_mode = true;
} }
break; break;
} }
@ -793,7 +797,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
} else if (should_wipe_data) { } else if (should_wipe_data) {
save_current_log = true; save_current_log = true;
CHECK(device->GetReason().has_value()); CHECK(device->GetReason().has_value());
if (!WipeData(device)) { if (!WipeData(device, should_keep_memtag_mode)) {
status = INSTALL_ERROR; status = INSTALL_ERROR;
} }
} else if (should_prompt_and_wipe_data) { } else if (should_prompt_and_wipe_data) {