diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-15 17:28:31 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-08-15 17:28:31 +0000 |
commit | f4cc2764c9f11dc7a61cf4a237ad5695528925c3 (patch) | |
tree | 657b97d241906f076b6df57c13cf805f4e447107 | |
parent | 2efc12e25ab3f56295b879d45102b7ef94425ede (diff) | |
parent | 40548a48da4207ff4bb73d0c74f72a2084b9fa39 (diff) | |
download | core-android13-mainline-appsearch-release.tar.gz |
Snap for 8948084 from 40548a48da4207ff4bb73d0c74f72a2084b9fa39 to mainline-appsearch-releaseaml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-appsearch-release
Change-Id: I07c366878a79ff702110dced47b647c5a5ee767c
-rw-r--r-- | fs_mgr/libsnapshot/snapshot.cpp | 17 | ||||
-rw-r--r-- | fs_mgr/libsnapshot/snapshot_test.cpp | 27 | ||||
-rw-r--r-- | fs_mgr/libsnapshot/vts_ota_config_test.cpp | 7 | ||||
-rw-r--r-- | fs_mgr/tests/vts_fs_test.cpp | 4 | ||||
-rw-r--r-- | libcutils/trace-container.cpp | 8 | ||||
-rw-r--r-- | libcutils/trace-dev.cpp | 4 | ||||
-rw-r--r-- | libcutils/trace-dev_test.cpp | 28 | ||||
-rw-r--r-- | trusty/keymaster/TrustyKeymaster.cpp | 6 | ||||
-rw-r--r-- | trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h | 1 | ||||
-rw-r--r-- | trusty/keymaster/include/trusty_keymaster/ipc/keymaster_ipc.h | 1 | ||||
-rw-r--r-- | trusty/keymaster/keymint/TrustyKeyMintDevice.cpp | 17 |
11 files changed, 88 insertions, 32 deletions
diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp index a83f535b2..019b64a44 100644 --- a/fs_mgr/libsnapshot/snapshot.cpp +++ b/fs_mgr/libsnapshot/snapshot.cpp @@ -3273,8 +3273,21 @@ Return SnapshotManager::CreateUpdateSnapshots(const DeltaArchiveManifest& manife snapuserd_client_ = nullptr; } } else { - status.set_userspace_snapshots(!IsDmSnapshotTestingEnabled()); - if (IsDmSnapshotTestingEnabled()) { + bool userSnapshotsEnabled = true; + const std::string UNKNOWN = "unknown"; + const std::string vendor_release = android::base::GetProperty( + "ro.vendor.build.version.release_or_codename", UNKNOWN); + + // No user-space snapshots if vendor partition is on Android 12 + if (vendor_release.find("12") != std::string::npos) { + LOG(INFO) << "Userspace snapshots disabled as vendor partition is on Android: " + << vendor_release; + userSnapshotsEnabled = false; + } + + userSnapshotsEnabled = (userSnapshotsEnabled && !IsDmSnapshotTestingEnabled()); + status.set_userspace_snapshots(userSnapshotsEnabled); + if (!userSnapshotsEnabled) { is_snapshot_userspace_ = false; LOG(INFO) << "User-space snapshots disabled for testing"; } else { diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp index 36abf712b..c145da718 100644 --- a/fs_mgr/libsnapshot/snapshot_test.cpp +++ b/fs_mgr/libsnapshot/snapshot_test.cpp @@ -91,7 +91,7 @@ std::string fake_super; void MountMetadata(); bool ShouldUseCompression(); -bool ShouldUseUserspaceSnapshots(); +bool IsDaemonRequired(); class SnapshotTest : public ::testing::Test { public: @@ -1208,7 +1208,7 @@ TEST_F(SnapshotUpdateTest, FullUpdateFlow) { // Initiate the merge and wait for it to be completed. ASSERT_TRUE(init->InitiateMerge()); - ASSERT_EQ(init->IsSnapuserdRequired(), ShouldUseUserspaceSnapshots()); + ASSERT_EQ(init->IsSnapuserdRequired(), IsDaemonRequired()); { // We should have started in SECOND_PHASE since nothing shrinks. ASSERT_TRUE(AcquireLock()); @@ -1342,7 +1342,7 @@ TEST_F(SnapshotUpdateTest, SpaceSwapUpdate) { // Initiate the merge and wait for it to be completed. ASSERT_TRUE(init->InitiateMerge()); - ASSERT_EQ(init->IsSnapuserdRequired(), ShouldUseUserspaceSnapshots()); + ASSERT_EQ(init->IsSnapuserdRequired(), IsDaemonRequired()); { // Check that the merge phase is FIRST_PHASE until at least one call // to ProcessUpdateState() occurs. @@ -1450,7 +1450,7 @@ TEST_F(SnapshotUpdateTest, ConsistencyCheckResume) { // Initiate the merge and wait for it to be completed. ASSERT_TRUE(init->InitiateMerge()); - ASSERT_EQ(init->IsSnapuserdRequired(), ShouldUseUserspaceSnapshots()); + ASSERT_EQ(init->IsSnapuserdRequired(), IsDaemonRequired()); { // Check that the merge phase is FIRST_PHASE until at least one call // to ProcessUpdateState() occurs. @@ -2750,13 +2750,30 @@ void SnapshotTestEnvironment::TearDown() { } } -bool ShouldUseUserspaceSnapshots() { +bool IsDaemonRequired() { if (FLAGS_force_config == "dmsnap") { return false; } + + if (!IsCompressionEnabled()) { + return false; + } + + const std::string UNKNOWN = "unknown"; + const std::string vendor_release = + android::base::GetProperty("ro.vendor.build.version.release_or_codename", UNKNOWN); + + // No userspace snapshots if vendor partition is on Android 12 + // However, for GRF devices, snapuserd daemon will be on + // vendor ramdisk in Android 12. + if (vendor_release.find("12") != std::string::npos) { + return true; + } + if (!FLAGS_force_config.empty()) { return true; } + return IsUserspaceSnapshotsEnabled(); } diff --git a/fs_mgr/libsnapshot/vts_ota_config_test.cpp b/fs_mgr/libsnapshot/vts_ota_config_test.cpp index afc2d81a4..02bcc3438 100644 --- a/fs_mgr/libsnapshot/vts_ota_config_test.cpp +++ b/fs_mgr/libsnapshot/vts_ota_config_test.cpp @@ -17,7 +17,14 @@ #include <android-base/properties.h> #include <gtest/gtest.h> +static int GetVsrLevel() { + return android::base::GetIntProperty("ro.vendor.api_level", -1); +} + TEST(VAB, Enabled) { ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false)); + if (GetVsrLevel() < __ANDROID_API_T__) { + GTEST_SKIP(); + } ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.userspace.snapshots.enabled", false)); } diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp index aac2cfd9b..ae8e45992 100644 --- a/fs_mgr/tests/vts_fs_test.cpp +++ b/fs_mgr/tests/vts_fs_test.cpp @@ -28,8 +28,8 @@ static int GetVsrLevel() { } TEST(fs, ErofsSupported) { - // S and higher for this test. - if (GetVsrLevel() < __ANDROID_API_S__) { + // T-launch GKI kernels and higher must support EROFS. + if (GetVsrLevel() < __ANDROID_API_T__) { GTEST_SKIP(); } diff --git a/libcutils/trace-container.cpp b/libcutils/trace-container.cpp index 8901e4a40..620266294 100644 --- a/libcutils/trace-container.cpp +++ b/libcutils/trace-container.cpp @@ -231,24 +231,24 @@ void atrace_async_end_body(const char* name, int32_t cookie) void atrace_async_for_track_begin_body(const char* track_name, const char* name, int32_t cookie) { if (CC_LIKELY(atrace_use_container_sock)) { - WRITE_MSG_IN_CONTAINER("T", "|", "|%d", track_name, name, cookie); + WRITE_MSG_IN_CONTAINER("G", "|", "|%d", track_name, name, cookie); return; } if (atrace_marker_fd < 0) return; - WRITE_MSG("T|%d|", "|%" PRId32, track_name, name, cookie); + WRITE_MSG("G|%d|", "|%" PRId32, track_name, name, cookie); } void atrace_async_for_track_end_body(const char* track_name, const char* name, int32_t cookie) { if (CC_LIKELY(atrace_use_container_sock)) { - WRITE_MSG_IN_CONTAINER("U", "|", "|%d", track_name, name, cookie); + WRITE_MSG_IN_CONTAINER("H", "|", "|%d", track_name, name, cookie); return; } if (atrace_marker_fd < 0) return; - WRITE_MSG("U|%d|", "|%" PRId32, track_name, name, cookie); + WRITE_MSG("H|%d|", "|%" PRId32, track_name, name, cookie); } void atrace_instant_body(const char* name) { diff --git a/libcutils/trace-dev.cpp b/libcutils/trace-dev.cpp index eacc8ee56..e9583fb2b 100644 --- a/libcutils/trace-dev.cpp +++ b/libcutils/trace-dev.cpp @@ -90,11 +90,11 @@ void atrace_async_end_body(const char* name, int32_t cookie) } void atrace_async_for_track_begin_body(const char* track_name, const char* name, int32_t cookie) { - WRITE_MSG("T|%d|", "|%" PRId32, track_name, name, cookie); + WRITE_MSG("G|%d|", "|%" PRId32, track_name, name, cookie); } void atrace_async_for_track_end_body(const char* track_name, const char* name, int32_t cookie) { - WRITE_MSG("U|%d|", "|%" PRId32, track_name, name, cookie); + WRITE_MSG("H|%d|", "|%" PRId32, track_name, name, cookie); } void atrace_instant_body(const char* name) { diff --git a/libcutils/trace-dev_test.cpp b/libcutils/trace-dev_test.cpp index 841674a99..d4a907d7b 100644 --- a/libcutils/trace-dev_test.cpp +++ b/libcutils/trace-dev_test.cpp @@ -202,13 +202,13 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_normal) { std::string actual; ASSERT_TRUE(android::base::ReadFdToString(atrace_marker_fd, &actual)); - std::string expected = android::base::StringPrintf("T|%d|fake_track|fake_name|12345", getpid()); + std::string expected = android::base::StringPrintf("G|%d|fake_track|fake_name|12345", getpid()); ASSERT_STREQ(expected.c_str(), actual.c_str()); } TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_track_name) { const int name_size = 5; - std::string expected = android::base::StringPrintf("T|%d|", getpid()); + std::string expected = android::base::StringPrintf("G|%d|", getpid()); std::string track_name = MakeName(ATRACE_MESSAGE_LENGTH - expected.length() - 1 - name_size - 6); atrace_async_for_track_begin_body(track_name.c_str(), "name", 12345); @@ -224,7 +224,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_track_name) { // Add a single character and verify name truncation ASSERT_EQ(0, lseek(atrace_marker_fd, 0, SEEK_SET)); track_name += '*'; - expected = android::base::StringPrintf("T|%d|", getpid()); + expected = android::base::StringPrintf("G|%d|", getpid()); expected += track_name + "|nam|12345"; atrace_async_for_track_begin_body(track_name.c_str(), "name", 12345); EXPECT_EQ(ATRACE_MESSAGE_LENGTH - 1, lseek(atrace_marker_fd, 0, SEEK_CUR)); @@ -234,7 +234,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_track_name) { } TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_track_name) { - std::string expected = android::base::StringPrintf("T|%d|", getpid()); + std::string expected = android::base::StringPrintf("G|%d|", getpid()); std::string track_name = MakeName(2 * ATRACE_MESSAGE_LENGTH); atrace_async_for_track_begin_body(track_name.c_str(), "name", 12345); @@ -250,7 +250,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_track_name) { TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_name) { const int track_name_size = 11; - std::string expected = android::base::StringPrintf("T|%d|", getpid()); + std::string expected = android::base::StringPrintf("G|%d|", getpid()); std::string name = MakeName(ATRACE_MESSAGE_LENGTH - expected.length() - 1 - track_name_size - 6); atrace_async_for_track_begin_body("track_name", name.c_str(), 12345); @@ -274,7 +274,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_exact_name) { } TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_name) { - std::string expected = android::base::StringPrintf("T|%d|track_name|", getpid()); + std::string expected = android::base::StringPrintf("G|%d|track_name|", getpid()); std::string name = MakeName(2 * ATRACE_MESSAGE_LENGTH); atrace_async_for_track_begin_body("track_name", name.c_str(), 12345); @@ -289,7 +289,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_name) { } TEST_F(TraceDevTest, atrace_async_for_track_begin_body_truncated_both) { - std::string expected = android::base::StringPrintf("T|%d|", getpid()); + std::string expected = android::base::StringPrintf("G|%d|", getpid()); std::string name = MakeName(2 * ATRACE_MESSAGE_LENGTH); std::string track_name = MakeName(2 * ATRACE_MESSAGE_LENGTH); atrace_async_for_track_begin_body(track_name.c_str(), name.c_str(), 12345); @@ -312,13 +312,13 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_normal) { std::string actual; ASSERT_TRUE(android::base::ReadFdToString(atrace_marker_fd, &actual)); - std::string expected = android::base::StringPrintf("U|%d|fake_track|fake_name|12345", getpid()); + std::string expected = android::base::StringPrintf("H|%d|fake_track|fake_name|12345", getpid()); ASSERT_STREQ(expected.c_str(), actual.c_str()); } TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_track_name) { const int name_size = 5; - std::string expected = android::base::StringPrintf("U|%d|", getpid()); + std::string expected = android::base::StringPrintf("H|%d|", getpid()); std::string track_name = MakeName(ATRACE_MESSAGE_LENGTH - expected.length() - 1 - name_size - 6); atrace_async_for_track_end_body(track_name.c_str(), "name", 12345); @@ -334,7 +334,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_track_name) { // Add a single character and verify name truncation ASSERT_EQ(0, lseek(atrace_marker_fd, 0, SEEK_SET)); track_name += '*'; - expected = android::base::StringPrintf("U|%d|", getpid()); + expected = android::base::StringPrintf("H|%d|", getpid()); expected += track_name + "|nam|12345"; atrace_async_for_track_end_body(track_name.c_str(), "name", 12345); EXPECT_EQ(ATRACE_MESSAGE_LENGTH - 1, lseek(atrace_marker_fd, 0, SEEK_CUR)); @@ -344,7 +344,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_track_name) { } TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_track_name) { - std::string expected = android::base::StringPrintf("U|%d|", getpid()); + std::string expected = android::base::StringPrintf("H|%d|", getpid()); std::string track_name = MakeName(2 * ATRACE_MESSAGE_LENGTH); atrace_async_for_track_end_body(track_name.c_str(), "name", 12345); @@ -360,7 +360,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_track_name) { TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_name) { const int track_name_size = 11; - std::string expected = android::base::StringPrintf("U|%d|", getpid()); + std::string expected = android::base::StringPrintf("H|%d|", getpid()); std::string name = MakeName(ATRACE_MESSAGE_LENGTH - expected.length() - 1 - track_name_size - 6); atrace_async_for_track_end_body("track_name", name.c_str(), 12345); @@ -384,7 +384,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_exact_name) { } TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_name) { - std::string expected = android::base::StringPrintf("U|%d|track_name|", getpid()); + std::string expected = android::base::StringPrintf("H|%d|track_name|", getpid()); std::string name = MakeName(2 * ATRACE_MESSAGE_LENGTH); atrace_async_for_track_end_body("track_name", name.c_str(), 12345); @@ -399,7 +399,7 @@ TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_name) { } TEST_F(TraceDevTest, atrace_async_for_track_end_body_truncated_both) { - std::string expected = android::base::StringPrintf("U|%d|", getpid()); + std::string expected = android::base::StringPrintf("H|%d|", getpid()); std::string name = MakeName(2 * ATRACE_MESSAGE_LENGTH); std::string track_name = MakeName(2 * ATRACE_MESSAGE_LENGTH); atrace_async_for_track_end_body(track_name.c_str(), name.c_str(), 12345); diff --git a/trusty/keymaster/TrustyKeymaster.cpp b/trusty/keymaster/TrustyKeymaster.cpp index cdfbd9003..e77940a1f 100644 --- a/trusty/keymaster/TrustyKeymaster.cpp +++ b/trusty/keymaster/TrustyKeymaster.cpp @@ -279,4 +279,10 @@ ConfigureVendorPatchlevelResponse TrustyKeymaster::ConfigureVendorPatchlevel( return response; } +GetRootOfTrustResponse TrustyKeymaster::GetRootOfTrust(const GetRootOfTrustRequest& request) { + GetRootOfTrustResponse response(message_version()); + ForwardCommand(KM_GET_ROOT_OF_TRUST, request, &response); + return response; +} + } // namespace keymaster diff --git a/trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h b/trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h index f80e02f37..9f4f39bf5 100644 --- a/trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h +++ b/trusty/keymaster/include/trusty_keymaster/TrustyKeymaster.h @@ -66,6 +66,7 @@ class TrustyKeymaster { DeviceLockedResponse DeviceLocked(const DeviceLockedRequest& request); ConfigureVendorPatchlevelResponse ConfigureVendorPatchlevel( const ConfigureVendorPatchlevelRequest& request); + GetRootOfTrustResponse GetRootOfTrust(const GetRootOfTrustRequest& request); uint32_t message_version() const { return message_version_; } diff --git a/trusty/keymaster/include/trusty_keymaster/ipc/keymaster_ipc.h b/trusty/keymaster/include/trusty_keymaster/ipc/keymaster_ipc.h index fa475ae90..bf0cb703f 100644 --- a/trusty/keymaster/include/trusty_keymaster/ipc/keymaster_ipc.h +++ b/trusty/keymaster/include/trusty_keymaster/ipc/keymaster_ipc.h @@ -59,6 +59,7 @@ enum keymaster_command : uint32_t { KM_GENERATE_RKP_KEY = (31 << KEYMASTER_REQ_SHIFT), KM_GENERATE_CSR = (32 << KEYMASTER_REQ_SHIFT), KM_CONFIGURE_VENDOR_PATCHLEVEL = (33 << KEYMASTER_REQ_SHIFT), + KM_GET_ROOT_OF_TRUST = (34 << KEYMASTER_REQ_SHIFT), // Bootloader/provisioning calls. KM_SET_BOOT_PARAMS = (0x1000 << KEYMASTER_REQ_SHIFT), diff --git a/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp b/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp index 44780e835..7d58162cc 100644 --- a/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp +++ b/trusty/keymaster/keymint/TrustyKeyMintDevice.cpp @@ -325,9 +325,20 @@ ScopedAStatus TrustyKeyMintDevice::getRootOfTrustChallenge(array<uint8_t, 16>* / return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED); } -ScopedAStatus TrustyKeyMintDevice::getRootOfTrust(const array<uint8_t, 16>& /* challenge */, - vector<uint8_t>* /* rootOfTrust */) { - return kmError2ScopedAStatus(KM_ERROR_UNIMPLEMENTED); +ScopedAStatus TrustyKeyMintDevice::getRootOfTrust(const array<uint8_t, 16>& challenge, + vector<uint8_t>* rootOfTrust) { + if (!rootOfTrust) { + return kmError2ScopedAStatus(KM_ERROR_UNEXPECTED_NULL_POINTER); + } + keymaster::GetRootOfTrustRequest request(impl_->message_version(), + {challenge.begin(), challenge.end()}); + keymaster::GetRootOfTrustResponse response = impl_->GetRootOfTrust(request); + if (response.error != KM_ERROR_OK) { + return kmError2ScopedAStatus(response.error); + } + + *rootOfTrust = std::move(response.rootOfTrust); + return ScopedAStatus::ok(); } ScopedAStatus TrustyKeyMintDevice::sendRootOfTrust(const vector<uint8_t>& /* rootOfTrust */) { |