Snap for 8303596 from d86dd8b03225cdfa85fbc1e835cc8eb1653c4787 to mainline-sdkext-release
Change-Id: Ib7212a11ad544e900cf51fb5f19d934a20b00e29
diff --git a/OWNERS b/OWNERS
index 1d8d2ba..f9f6035 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,13 +3,16 @@
jiakaiz@google.com
lokeshgidra@google.com
mast@google.com
+miguelaranda@google.com
mingaleev@google.com
+mythria@google.com
ngeoffray@google.com
nikitai@google.com
oth@google.com
prb@google.com
rpl@google.com
skvadrik@google.com
+solanes@google.com
sorinbasca@google.com
vichang@google.com
vmarko@google.com
diff --git a/libartbase/base/file_magic.cc b/libartbase/base/file_magic.cc
index 1471c59..21b762f 100644
--- a/libartbase/base/file_magic.cc
+++ b/libartbase/base/file_magic.cc
@@ -44,6 +44,10 @@
}
bool ReadMagicAndReset(int fd, uint32_t* magic, std::string* error_msg) {
+ if (lseek(fd, 0, SEEK_SET) != 0) {
+ *error_msg = StringPrintf("Failed to seek to beginning of file : %s", strerror(errno));
+ return false;
+ }
int n = TEMP_FAILURE_RETRY(read(fd, magic, sizeof(*magic)));
if (n != sizeof(*magic)) {
*error_msg = StringPrintf("Failed to find magic");
diff --git a/odrefresh/odr_config.h b/odrefresh/odr_config.h
index 4161944..467bb53 100644
--- a/odrefresh/odr_config.h
+++ b/odrefresh/odr_config.h
@@ -17,6 +17,7 @@
#ifndef ART_ODREFRESH_ODR_CONFIG_H_
#define ART_ODREFRESH_ODR_CONFIG_H_
+#include <optional>
#include <string>
#include <vector>
@@ -49,6 +50,7 @@
std::string dex2oat_;
std::string dex2oat_boot_classpath_;
bool dry_run_;
+ std::optional<bool> partial_compilation_;
InstructionSet isa_;
std::string program_name_;
std::string system_server_classpath_;
@@ -115,6 +117,10 @@
}
bool GetDryRun() const { return dry_run_; }
+ bool GetPartialCompilation() const {
+ return partial_compilation_.value_or(true);
+ }
+
const std::string& GetSystemServerClasspath() const { return system_server_classpath_; }
const std::string& GetUpdatableBcpPackagesFile() const { return updatable_bcp_packages_file_; }
@@ -126,6 +132,9 @@
}
void SetDryRun() { dry_run_ = true; }
+ void SetPartialCompilation(bool value) {
+ partial_compilation_ = value;
+ }
void SetIsa(const InstructionSet isa) { isa_ = isa; }
void SetSystemServerClasspath(const std::string& classpath) {
diff --git a/odrefresh/odrefresh.cc b/odrefresh/odrefresh.cc
index 2cef50d..7ca6cf2 100644
--- a/odrefresh/odrefresh.cc
+++ b/odrefresh/odrefresh.cc
@@ -38,6 +38,7 @@
#include <memory>
#include <optional>
#include <ostream>
+#include <regex>
#include <sstream>
#include <string>
#include <string_view>
@@ -48,7 +49,9 @@
#include "android-base/file.h"
#include "android-base/logging.h"
#include "android-base/macros.h"
+#include "android-base/parseint.h"
#include "android-base/properties.h"
+#include "android-base/result.h"
#include "android-base/stringprintf.h"
#include "android-base/strings.h"
#include "android/log.h"
@@ -65,14 +68,13 @@
#include "dexoptanalyzer.h"
#include "exec_utils.h"
#include "log/log.h"
-#include "palette/palette.h"
-#include "palette/palette_types.h"
-
#include "odr_artifacts.h"
#include "odr_compilation_log.h"
#include "odr_config.h"
#include "odr_fs_utils.h"
#include "odr_metrics.h"
+#include "palette/palette.h"
+#include "palette/palette_types.h"
namespace art {
namespace odrefresh {
@@ -85,6 +87,8 @@
// Name of cache info file in the ART Apex artifact cache.
static constexpr const char* kCacheInfoFile = "cache-info.xml";
+using ::android::base::Result;
+
static void UsageErrorV(const char* fmt, va_list ap) {
std::string error;
android::base::StringAppendV(&error, fmt, ap);
@@ -211,6 +215,30 @@
return true;
}
+Result<int> ParseSecurityPatchStr(const std::string& security_patch_str) {
+ std::regex security_patch_regex(R"re((\d{4})-(\d{2})-(\d{2}))re");
+ std::smatch m;
+ if (!std::regex_match(security_patch_str, m, security_patch_regex)) {
+ return Errorf("Invalid security patch string \"{}\"", security_patch_str);
+ }
+ int year = 0, month = 0, day = 0;
+ if (!android::base::ParseInt(m[1], &year) || !android::base::ParseInt(m[2], &month) ||
+ !android::base::ParseInt(m[3], &day)) {
+ // This should never happen because the string already matches the regex.
+ return Errorf("Unknown error when parsing security patch string \"{}\"", security_patch_str);
+ }
+ return year * 10000 + month * 100 + day;
+}
+
+bool ShouldDisablePartialCompilation(const std::string& security_patch_str) {
+ Result<int> security_patch_value = ParseSecurityPatchStr(security_patch_str);
+ if (!security_patch_value.ok()) {
+ LOG(ERROR) << security_patch_value.error();
+ return false;
+ }
+ return security_patch_value.value() < ParseSecurityPatchStr("2022-03-05").value();
+}
+
} // namespace
bool ParseZygoteKind(const char* input, ZygoteKind* zygote_kind) {
@@ -1272,7 +1300,7 @@
const char* staging_dir = nullptr;
metrics.SetStage(OdrMetrics::Stage::kPreparation);
// Clean-up existing files.
- if (force_compile && !CleanApexdataDirectory()) {
+ if ((force_compile || !config_.GetPartialCompilation()) && !CleanApexdataDirectory()) {
metrics.SetStatus(OdrMetrics::Status::kIoError);
return ExitCode::kCleanupFailed;
}
@@ -1434,6 +1462,11 @@
android::base::GetProperty("dalvik.vm.dex2oat-updatable-bcp-packages-file", {});
config->SetUpdatableBcpPackagesFile(updatable_packages);
+ if (ShouldDisablePartialCompilation(
+ android::base::GetProperty("ro.build.version.security_patch", /*default_value=*/""))) {
+ config->SetPartialCompilation(false);
+ }
+
int n = 1;
for (; n < argc - 1; ++n) {
if (!InitializeCommonConfig(argv[n], config)) {
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 8b13523..bc079f0 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3232,7 +3232,7 @@
}
self->AssertNoPendingException();
CHECK(h_new_class != nullptr) << descriptor;
- CHECK(h_new_class->IsResolved() && !h_new_class->IsErroneousResolved()) << descriptor;
+ CHECK(h_new_class->IsResolved()) << descriptor << " " << h_new_class->GetStatus();
// Instrumentation may have updated entrypoints for all methods of all
// classes. However it could not update methods of this class while we
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 4eb7f25..3a92965 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -25,7 +25,6 @@
#include "android-base/stringprintf.h"
#include "android-base/strings.h"
#include "android-base/unique_fd.h"
-
#include "arch/instruction_set.h"
#include "art_field-inl.h"
#include "art_method-inl.h"
@@ -1503,6 +1502,12 @@
const char* file_description,
/*out*/std::string* error_msg);
+ bool ValidateOatFile(const std::string& base_location,
+ const std::string& base_filename,
+ size_t bcp_index,
+ size_t component_count,
+ /*out*/std::string* error_msg);
+
bool ReadHeader(const std::string& base_location,
const std::string& base_filename,
size_t bcp_index,
@@ -1811,6 +1816,61 @@
return true;
}
+bool ImageSpace::BootImageLayout::ValidateOatFile(
+ const std::string& base_location,
+ const std::string& base_filename,
+ size_t bcp_index,
+ size_t component_count,
+ /*out*/std::string* error_msg) {
+ std::string art_filename = ExpandLocation(base_filename, bcp_index);
+ std::string art_location = ExpandLocation(base_location, bcp_index);
+ std::string oat_filename = ImageHeader::GetOatLocationFromImageLocation(art_filename);
+ std::string oat_location = ImageHeader::GetOatLocationFromImageLocation(art_location);
+ int oat_fd = -1;
+ int vdex_fd = -1;
+ auto dex_filenames =
+ ArrayRef<const std::string>(boot_class_path_).SubArray(bcp_index, component_count);
+ auto dex_fds = ArrayRef<const int>();
+ // We open the oat file here only for validating that it's up-to-date. We don't open it as
+ // executable or mmap it to a reserved space. This `OatFile` object will be dropped after
+ // validation, and will not go into the `ImageSpace`.
+ std::unique_ptr<OatFile> oat_file;
+ DCHECK_EQ(oat_fd >= 0, vdex_fd >= 0);
+ if (oat_fd >= 0) {
+ oat_file.reset(OatFile::Open(
+ /*zip_fd=*/ -1,
+ vdex_fd,
+ oat_fd,
+ oat_location,
+ /*executable=*/ false,
+ /*low_4gb=*/ false,
+ dex_filenames,
+ /*reservation=*/ nullptr,
+ error_msg));
+ } else {
+ oat_file.reset(OatFile::Open(
+ /*zip_fd=*/ -1,
+ oat_filename,
+ oat_location,
+ /*executable=*/ false,
+ /*low_4gb=*/ false,
+ dex_filenames,
+ /*reservation=*/ nullptr,
+ error_msg));
+ }
+ if (oat_file == nullptr) {
+ *error_msg = StringPrintf("Failed to open oat file '%s' when validating it for image '%s': %s",
+ oat_filename.c_str(),
+ art_location.c_str(),
+ error_msg->c_str());
+ return false;
+ }
+ if (!ImageSpace::ValidateOatFile(*oat_file, error_msg, dex_filenames, dex_fds)) {
+ return false;
+ }
+ return true;
+}
+
bool ImageSpace::BootImageLayout::ReadHeader(const std::string& base_location,
const std::string& base_filename,
size_t bcp_index,
@@ -1828,6 +1888,15 @@
return false;
}
+ // Validate oat files. We do it here so that the boot image will be re-compiled in memory if it's
+ // outdated.
+ size_t component_count = (header.GetImageSpaceCount() == 1u) ? header.GetComponentCount() : 1u;
+ for (size_t i = 0; i < header.GetImageSpaceCount(); i++) {
+ if (!ValidateOatFile(base_location, base_filename, bcp_index + i, component_count, error_msg)) {
+ return false;
+ }
+ }
+
if (chunks_.empty()) {
base_address_ = reinterpret_cast32<uint32_t>(header.GetImageBegin());
}
@@ -3120,6 +3189,8 @@
return false;
}
+ // Load the image. We don't validate oat files in this stage because they have been validated
+ // before.
if (!LoadImage(layout,
/*validate_oat_file=*/ false,
extra_reservation_size,
@@ -3268,20 +3339,32 @@
}
bool ImageSpace::ValidateOatFile(const OatFile& oat_file, std::string* error_msg) {
- const ArtDexFileLoader dex_file_loader;
- for (const OatDexFile* oat_dex_file : oat_file.GetOatDexFiles()) {
- const std::string& dex_file_location = oat_dex_file->GetDexFileLocation();
+ return ValidateOatFile(oat_file, error_msg, ArrayRef<const std::string>(), ArrayRef<const int>());
+}
+bool ImageSpace::ValidateOatFile(const OatFile& oat_file,
+ std::string* error_msg,
+ ArrayRef<const std::string> dex_filenames,
+ ArrayRef<const int> dex_fds) {
+ const ArtDexFileLoader dex_file_loader;
+ size_t dex_file_index = 0;
+ for (const OatDexFile* oat_dex_file : oat_file.GetOatDexFiles()) {
// Skip multidex locations - These will be checked when we visit their
// corresponding primary non-multidex location.
- if (DexFileLoader::IsMultiDexLocation(dex_file_location.c_str())) {
+ if (DexFileLoader::IsMultiDexLocation(oat_dex_file->GetDexFileLocation().c_str())) {
continue;
}
+ DCHECK(dex_filenames.empty() || dex_file_index < dex_filenames.size());
+ const std::string& dex_file_location =
+ dex_filenames.empty() ? oat_dex_file->GetDexFileLocation() : dex_filenames[dex_file_index];
+ int dex_fd = dex_file_index < dex_fds.size() ? dex_fds[dex_file_index] : -1;
+ dex_file_index++;
+
std::vector<uint32_t> checksums;
std::vector<std::string> dex_locations_ignored;
if (!dex_file_loader.GetMultiDexChecksums(
- dex_file_location.c_str(), &checksums, &dex_locations_ignored, error_msg)) {
+ dex_file_location.c_str(), &checksums, &dex_locations_ignored, error_msg, dex_fd)) {
*error_msg = StringPrintf("ValidateOatFile failed to get checksums of dex file '%s' "
"referenced by oat file %s: %s",
dex_file_location.c_str(),
diff --git a/runtime/gc/space/image_space.h b/runtime/gc/space/image_space.h
index 545f659..350b988 100644
--- a/runtime/gc/space/image_space.h
+++ b/runtime/gc/space/image_space.h
@@ -266,6 +266,16 @@
// This function is exposed for testing purposes.
static bool ValidateOatFile(const OatFile& oat_file, std::string* error_msg);
+ // Same as above, but allows to use `dex_filenames` and `dex_fds` to find the dex files instead of
+ // using the dex filenames in the header of the oat file. This overload is useful when the actual
+ // dex filenames are different from what's in the header (e.g., when we run dex2oat on host), or
+ // when the runtime can only access files through FDs (e.g., when we run dex2oat on target in a
+ // restricted SELinux domain).
+ static bool ValidateOatFile(const OatFile& oat_file,
+ std::string* error_msg,
+ ArrayRef<const std::string> dex_filenames,
+ ArrayRef<const int> dex_fds);
+
// Return the end of the image which includes non-heap objects such as ArtMethods and ArtFields.
uint8_t* GetImageEnd() const {
return Begin() + GetImageHeader().GetImageSize();
diff --git a/test/OWNERS b/test/OWNERS
index 28d5064..7d11748 100644
--- a/test/OWNERS
+++ b/test/OWNERS
@@ -1,4 +1,3 @@
# See also ART owners in the parent directory.
rpl@google.com
dsrbecky@google.com
-*
