Commit graph

4128 commits

Author SHA1 Message Date
Akilesh Kailash
69996fc407 Merge "Move snapuserd_test to postsubmit" into main am: dff0420523 am: 381334f136
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3366139

Change-Id: I81a89c96bea104cd2977172ea3aa409fbe78dfce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-20 02:27:19 +00:00
Akilesh Kailash
6028880ac0 Move snapuserd_test to postsubmit
Bug: 338329603
Test: Build
Change-Id: Ibee6be732078ea7e11fe7348772837b9b2699fbf
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-19 10:27:20 -08:00
Treehugger Robot
33be42e92c Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into main am: a7ce1a5975 am: 6e61d69779
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3363449

Change-Id: I70a27a736e4d35d15e8fe4de6a9ddbb9881766b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-19 05:50:03 +00:00
Treehugger Robot
a7ce1a5975 Merge "snapuserd: Use GTEST_SKIP in snapuserd_test." into main 2024-11-19 05:01:23 +00:00
David Anderson
668ffc395d snapuserd: Use GTEST_SKIP in snapuserd_test.
The test harness treats an early exit as a failure, so use GTEST_SKIP()
instead.

Bug: 379242140
Test: vts_snapuserd_test
Change-Id: I25351bb7ebf65e6c56865662d297feb4a1f635b3
2024-11-18 19:24:29 -08:00
Treehugger Robot
7f1d0b2fa6 Merge "Fix typo of snapuserd_verify.h" into main am: a747b7560a am: ab934a214e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3359022

Change-Id: I31b584d1a7469eda7225e03ec253858f80672d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-18 21:34:57 +00:00
Aeric
28b2556e90 Fix typo of snapuserd_verify.h
"advisible" should be "advisable"
"fucntionality" should be "functionality"

Bug: 379603290
Test: build pass
Change-Id: I6c95f2b186f479ba51df8603ce87c0522e91bf64
2024-11-18 17:32:55 +08:00
Treehugger Robot
94560a2cfa Merge "snapuserd: Change error message to verbose" into main am: 664f16c830 am: a11317c047
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3353119

Change-Id: I066e28cfef9813a54fc442722bfe08fc01cf64f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 20:35:10 +00:00
Treehugger Robot
0acdc4c73c Merge "Revert^5 "Set block device as RO/RW before mount"" into main am: 07f977220e am: 99a59649ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3335053

Change-Id: I137bffa07a7d490d9bb0b2aebe544b58f9d94364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 20:34:56 +00:00
Treehugger Robot
664f16c830 Merge "snapuserd: Change error message to verbose" into main 2024-11-15 19:42:17 +00:00
Treehugger Robot
07f977220e Merge "Revert^5 "Set block device as RO/RW before mount"" into main 2024-11-15 19:30:21 +00:00
Elliott Hughes
c0719ec88a Merge "Stop explicitly adding bionic subdirectories to the include path." into main am: d68632becc am: d2c67b3673
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3352958

Change-Id: I1fd45e0c2f6977fc4dfda7e2f26a7d4499447b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 18:10:36 +00:00
Akilesh Kailash
d02b74411b snapuserd: Change error message to verbose
These error logs gets printed even when I/O gracefully
terminates which might be confusing.

Bug: 377819507
Test: Build
Change-Id: I93d4ec2203566e75195215babc0042370be43ccb
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-15 09:54:44 -08:00
Elliott Hughes
d68632becc Merge "Stop explicitly adding bionic subdirectories to the include path." into main 2024-11-15 17:08:09 +00:00
Treehugger Robot
761191a94a Merge "Fix failure in CowTest#InvalidMergeOrderTest." into main am: 243850ca5f am: 9591fb4e65
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3353378

Change-Id: I7f4bf9a39203f0aa235df620ce7bee1322467262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-14 20:35:30 +00:00
David Anderson
9d06208826 Fix failure in CowTest#InvalidMergeOrderTest.
This is failing on hwasan builds due to a typo in the test method. The
actual writer logic is unaffected.

Bug: 377298650
Test: valgrind cow_api_test
Change-Id: I5c3f32ae57bf90b9fd29c7446bf34bdcb004328c
2024-11-14 10:41:07 -08:00
Elliott Hughes
a4e852d032 Stop explicitly adding bionic subdirectories to the include path.
Change-Id: I9961fa6ac957d8613f93fa33731da797f9ba8615
2024-11-14 18:14:26 +00:00
Akilesh Kailash
97a6cb2690 Merge "Revert "Move snapuserd_test to presubmit-large group"" into main am: 71ebf1a20d am: 31cf9ae62a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3348365

Change-Id: I035989562b6a62be2196566256e666c70124959e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 21:51:50 +00:00
Priyanka Advani (xWF)
1b5a7addd9 Revert "Move snapuserd_test to presubmit-large group"
This reverts commit ac810ad718.

Reason for revert: Droidmonitor created revert due to b/378924658. Will be verifying ABTD before submission.

Change-Id: Icb08a969ba13d863832a90d224f96fe60af9de4b
2024-11-13 20:12:45 +00:00
Treehugger Robot
e5515db691 Merge "Move snapuserd_test to presubmit-large group" into main am: 846b34f7f4 am: 6e856de4c6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3345631

Change-Id: I9b11cf8efec0e5f8b993fc4017106a29547854e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 19:06:27 +00:00
Akilesh Kailash
ac810ad718 Move snapuserd_test to presubmit-large group
Bug: 338329603
Test: Build
Change-Id: I20d722a797093e40eb653a418a1963acf8c4292b
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-13 04:34:34 +00:00
Hung Nguyen
1aa78079e5 Merge "Increase zram size percentage limit" into main am: fb954abea6 am: f278c9ce19
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343241

Change-Id: Ia6bb1c5bbd26eda03030158667526c83b66fc63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-08 06:07:35 +00:00
Hung Nguyen
fb954abea6 Merge "Increase zram size percentage limit" into main 2024-11-08 05:09:37 +00:00
Treehugger Robot
9bd2249e15 Merge "Increase the test timeout" into main am: 308bcbea8e am: 1d4ac1eed6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342095

Change-Id: Id03cbd8cc126e57f9ab9fe78ef825ec235c9c820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07 23:58:38 +00:00
Hung Nguyen
ce6f7330ad Increase zram size percentage limit
To allow experimenting with zram size larger than device memory size.

Bug: 368286978
Test: atest CtsFsMgrTestCases

Change-Id: I47a4a4e6af39571d13e4622d110c92936008127e
2024-11-07 15:16:17 -08:00
Akilesh Kailash
e5a2af34b3 Increase the test timeout
Bug: 338329603
Test: Build success
Change-Id: I97008dbe112d87ef2f4bff5605beb41cc4b1fac7
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-07 13:43:13 -08:00
Doug Anderson
596c78d733 Merge changes I819eb60a,I48a52aa0,Iab04742c into main am: 5d5906fb02 am: f4b2620436
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3315748

Change-Id: I482612ba7a5b98006af78012ac45f096c5ef6d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-06 17:33:18 +00:00
Doug Anderson
5d5906fb02 Merge changes I819eb60a,I48a52aa0,Iab04742c into main
* changes:
  init: Reorder GetBlockDeviceSymlinks() so FindDmDevice() is first
  init: Add partition_uuid to Uevent
  fs_mgr: Add getter for androidboot.boot_part_uuid
2024-11-06 16:40:33 +00:00
Treehugger Robot
92815c706a Merge "snapuserd: typecast cow_op->new_block to uint64_t" into main am: 41e9d7d3a2 am: 4ebe585454
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3337165

Change-Id: I05b95de82a17224229250590a6e82d61284f9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-06 11:12:12 +00:00
Treehugger Robot
41e9d7d3a2 Merge "snapuserd: typecast cow_op->new_block to uint64_t" into main 2024-11-06 10:15:46 +00:00
Akilesh Kailash
01af5431f7 snapuserd: typecast cow_op->new_block to uint64_t
On 32-bit devices, cow_op->new_block * BLOCK_SZ can overflow.

Bug: 376978542
Test: snapuserd_test on 32-bit device
1: Initiate merge on partition > 4GB.
2: Verify no overflow.

Change-Id: I4efc24891e0b330505ddf59b7db7716f054cf9c4
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-05 22:22:12 -08:00
Douglas Anderson
519d3f8b36 fs_mgr: Add getter for androidboot.boot_part_uuid
In order to make booting from some media types (like USB) more robust,
the bootloader will be extended to support passing the partition UUID
that it loaded the kernel from. It can pass this via kernel
commandline or via bootconfig. Add a way to get this.

Bug: 316324155
Test: Use the getter in a future change

Change-Id: Iab04742c0f2666db18dc48bcaaa2869eba405748
2024-11-05 15:55:25 -08:00
Kelvin Zhang
1de3ab9013 Revert^5 "Set block device as RO/RW before mount"
This reverts commit 5fd1be1a5a.

Reason for revert: b/377081806

Change-Id: I9c5761f6193979795e4350c9c7f89f18b9a868fd
2024-11-05 18:04:32 +00:00
Treehugger Robot
829e94415d Merge "libsnapuserd: Handle empty response from server" into main am: 71707037b1 am: 4d8631f849
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3329574

Change-Id: I8ad5d689cba44b7bdd1cd0024eb08dc56859c993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-04 18:57:24 +00:00
Treehugger Robot
71707037b1 Merge "libsnapuserd: Handle empty response from server" into main 2024-11-04 17:26:04 +00:00
Akilesh Kailash
454167f5bd libsnapuserd: Handle empty response from server
If server disconnects, then handle the empty response.

Bug: 377068272
Test: Full OTA
Change-Id: Ic48204c457ef924ba9a3c1ae84a3317fb1ccda04
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-02 23:43:22 -07:00
Treehugger Robot
d40fe62139 Merge "libsnapshot: Update libprocessgroup dependencies" into main am: 0aaec875e8 am: 8e770a9edd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3327650

Change-Id: I8f65a5ded4fc6b87954f7b115c81298728a08a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-01 23:18:24 +00:00
Treehugger Robot
0aaec875e8 Merge "libsnapshot: Update libprocessgroup dependencies" into main 2024-11-01 22:38:52 +00:00
Treehugger Robot
e416139f13 Merge "Revert^4 "Set block device as RO/RW before mount"" into main am: 65ebd83d9c am: 2652beda2f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3217778

Change-Id: Ifa8c6c1af5a46c62511e6a801209007c20c4bda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-01 21:17:04 +00:00
T.J. Mercier
b1f0c1bfda libsnapshot: Update libprocessgroup dependencies
Bug: 349105928
Change-Id: I0a795c185ae453b86e0373e6786bd77a0d265b01
2024-11-01 21:16:08 +00:00
Treehugger Robot
65ebd83d9c Merge "Revert^4 "Set block device as RO/RW before mount"" into main 2024-11-01 20:38:40 +00:00
Treehugger Robot
b6ed2dc5a8 Merge "libsnapshot: Add script to test snapshot updates" into main am: 6fb316bb44 am: ce19232805
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3323164

Change-Id: I85423f34255dd8c0879cf27fe86f7869abe5c6f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-31 19:06:41 +00:00
Akilesh Kailash
a5560db8cc libsnapshot: Add script to test snapshot updates
$time ./system/core/fs_mgr/libsnapshot/apply-update.sh --update-static-partitions

Update completed

real	1m19.850s
user	0m10.319s
sys	0m7.448s

Dynamic parition update only:

$time ./system/core/fs_mgr/libsnapshot/apply-update.sh

Update completed

real	0m19.032s
user	0m10.480s
sys	0m7.462s

Bug: 329255363
Test: apply-update.sh

Change-Id: I2af4fe022e35b2b813ff83e2084d22295b3057dc
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-10-31 10:00:22 -07:00
Kelvin Zhang
5fd1be1a5a Revert^4 "Set block device as RO/RW before mount"
This reverts commit 1df3536b95.

Previous land got reverted because of selinux denial, which is
already taken care of in aosp/3314877

Reason for revert: b/349507086

Change-Id: Id642b4d8726c72f324e369d8506c78eacea331e3
2024-10-30 17:05:03 +00:00
Treehugger Robot
c6bf9d9b6e Merge "fs_mgr: avoid std::vector<const T>" into main am: d5c75fd591 am: a26cb93702
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3316006

Change-Id: Ie265d50f373776203eb1546066c0a82969623f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-30 03:22:54 +00:00
Treehugger Robot
d5c75fd591 Merge "fs_mgr: avoid std::vector<const T>" into main 2024-10-30 02:28:04 +00:00
Treehugger Robot
766c0e53f4 Merge "Fix overlayfs on page cf page agnostic builds." into main am: 0edd0412f9 am: 4028fa121b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3323914

Change-Id: I0b43b24b73a8b9414d3c442229a2865798db76e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-29 16:43:28 +00:00
Treehugger Robot
0edd0412f9 Merge "Fix overlayfs on page cf page agnostic builds." into main 2024-10-29 15:58:42 +00:00
David Anderson
dea6f7c2a5 Fix overlayfs on page cf page agnostic builds.
Hardcode 4096 block size for f2fs on x86/64.

Bug: 375531898
Test: adb_remount_test.sh
Change-Id: I9b55f7caf1b77f235168664be2f310bb3bb0d179
2024-10-28 19:50:08 -07:00
Daeho Jeong
f2ea403856 Merge "support f2fs device aliasing feature" into main am: d7b46e396d am: 2f0861a251
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3315995

Change-Id: Ib667b0b0fb949c8b48b72237961c77495d298298
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-28 17:43:14 +00:00