Commit graph

67245 commits

Author SHA1 Message Date
Jaegeuk Kim
17f22fa10a Merge "fastboot: add casefold/projid/compress options" am: 0a71c0e38c am: dfcebcd845 am: 02af9b99e0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1489380

Change-Id: Iff6a4eafd5c156b3cb0419e9ac6b0a0b6943298d
2020-11-10 09:19:04 +00:00
Jaegeuk Kim
02af9b99e0 Merge "fastboot: add casefold/projid/compress options" am: 0a71c0e38c am: dfcebcd845
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1489380

Change-Id: I6672d19f078fc789f66f0a7528e5656239bba5a7
2020-11-10 08:39:24 +00:00
Jaegeuk Kim
dfcebcd845 Merge "fastboot: add casefold/projid/compress options" am: 0a71c0e38c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1489380

Change-Id: I62ba5acab1a8ad1361793edc1e080d500f61a90c
2020-11-10 08:24:53 +00:00
Jaegeuk Kim
0a71c0e38c Merge "fastboot: add casefold/projid/compress options" 2020-11-10 08:08:17 +00:00
Kiyoung Kim
e58dcb2453 Merge "List up libraries with system dependency in the configuration file" am: f81058343d am: ef6affe07f am: 084efbaf2d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468962

Change-Id: I7289f42e990d33348643e8fd26200d09d430fe2d
2020-11-10 07:12:02 +00:00
Kiyoung Kim
084efbaf2d Merge "List up libraries with system dependency in the configuration file" am: f81058343d am: ef6affe07f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468962

Change-Id: Id496d6fb0afbccdf3ad2ad8e59662dc1749d8180
2020-11-10 06:51:05 +00:00
Kiyoung Kim
ef6affe07f Merge "List up libraries with system dependency in the configuration file" am: f81058343d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1468962

Change-Id: I81e17fc8373b1b66568dc5af985aac7afc004ea1
2020-11-10 06:08:52 +00:00
Kiyoung Kim
f81058343d Merge "List up libraries with system dependency in the configuration file" 2020-11-10 05:49:35 +00:00
Akilesh Kailash
4319b411cf Merge "libsnapshot:snapuserd: Read the cow_operation in reverse order" am: 3e64e2ba25 am: 6dce4c47c5 am: d78a7e9cce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490700

Change-Id: I16c6f0ec747be90e9eed80b2a77ad5df9a35abf5
2020-11-10 04:50:18 +00:00
Akilesh Kailash
d78a7e9cce Merge "libsnapshot:snapuserd: Read the cow_operation in reverse order" am: 3e64e2ba25 am: 6dce4c47c5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490700

Change-Id: I4036dbc95c1a9dbbbb0a03a98cb7946860770a89
2020-11-10 04:23:05 +00:00
Akilesh Kailash
6dce4c47c5 Merge "libsnapshot:snapuserd: Read the cow_operation in reverse order" am: 3e64e2ba25
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490700

Change-Id: I8f84cdeba459c6b7cd0957b22cdd75ea4cc2b0df
2020-11-10 04:06:54 +00:00
Akilesh Kailash
3e64e2ba25 Merge "libsnapshot:snapuserd: Read the cow_operation in reverse order" 2020-11-10 03:51:05 +00:00
Akilesh Kailash
d08195691b libsnapshot:snapuserd: Read the cow_operation in reverse order
This is required for merge IO path. During merge process,
kernel scans the metadata page from backwards when merge
is initiated. Since, merge ordering should follow our internal
COW format, read the COW operations from backwards and populate the metadata.

Additionally, Kernel can merge successive operations if the two chunk IDs
are contiguous. This can be problematic when there is a crash
during merge; specifically when the merge operation has dependency.
These dependencies can only happen during copy operations of the
overlapping regions. To avoid this problem, we make sure that
copy operations are merged individually.

Test: cow_snapuserd_test
Bug: 168311203

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ic9c52b323ce58af897cfa343bf9277c8f1f022e3
2020-11-10 02:12:07 +00:00
Akilesh Kailash
30fffb3045 Merge "libsnapshot:snapuserd: Fix cow_snapuserd_test." am: bcf87898d7 am: e1417e79ac am: 10b48fedfe
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1485141

Change-Id: I4c6005d152eda46ff137a854c56fa8913e9d0aa3
2020-11-09 23:58:52 +00:00
Akilesh Kailash
10b48fedfe Merge "libsnapshot:snapuserd: Fix cow_snapuserd_test." am: bcf87898d7 am: e1417e79ac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1485141

Change-Id: I3a14e34b4af7f9d3ac20c718d9519e1f4b552065
2020-11-09 23:40:10 +00:00
Akilesh Kailash
e1417e79ac Merge "libsnapshot:snapuserd: Fix cow_snapuserd_test." am: bcf87898d7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1485141

Change-Id: I0db76914ec98c5aa682137f79256838688c5987c
2020-11-09 23:28:23 +00:00
Akilesh Kailash
bcf87898d7 Merge "libsnapshot:snapuserd: Fix cow_snapuserd_test." 2020-11-09 21:28:44 +00:00
Jaegeuk Kim
638d05e84e fastboot: add casefold/projid/compress options
fastboot -w --fs-options=casefold
fastboot -w --fs-options=casefold,projid
fastboot format:f2fs --fs-options=casefold
fastboot format:f2fs --fs-options=casefold,projid
fastboot format:f2fs --fs-options=casefold,projid,compress

Bug: 172514669
Bug: 160198145
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: If3fad004fdd25dd754432ce98934b4ae6c8a8706
2020-11-09 10:04:30 -08:00
Nikita Ioffe
dbb97ad9d7 Merge "Don't SIGABORT if device-mapper doesn't generate uevent for DeleteDevice" am: f389e419ac am: 23439421b9 am: cc61d142dc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490525

Change-Id: I4bc99009f46b9951900ac7e73e4a4893b844d7fa
2020-11-09 14:28:50 +00:00
Nikita Ioffe
cc61d142dc Merge "Don't SIGABORT if device-mapper doesn't generate uevent for DeleteDevice" am: f389e419ac am: 23439421b9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490525

Change-Id: If742268fefd825c7a65d4eb65cc16234133d6a95
2020-11-09 14:17:16 +00:00
Nikita Ioffe
23439421b9 Merge "Don't SIGABORT if device-mapper doesn't generate uevent for DeleteDevice" am: f389e419ac
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490525

Change-Id: Iba7ced1aafe4781df4746caf1ec697b1268da701
2020-11-09 13:46:40 +00:00
Nikita Ioffe
f389e419ac Merge "Don't SIGABORT if device-mapper doesn't generate uevent for DeleteDevice" 2020-11-09 13:27:12 +00:00
David Anderson
c8a216ef73 Merge "libsnapshot: Fix broken iterator in CompressedSnapshotReader." am: 3d152c926b am: 147cc59aee am: 89684a7ef9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490702

Change-Id: Ief0cf2bdded64f0dd66a383ce3d30fdd2ffa4d38
2020-11-07 02:50:46 +00:00
David Anderson
89684a7ef9 Merge "libsnapshot: Fix broken iterator in CompressedSnapshotReader." am: 3d152c926b am: 147cc59aee
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490702

Change-Id: I91412402f5fd743e98f550723b4d380577804958
2020-11-07 02:38:07 +00:00
David Anderson
147cc59aee Merge "libsnapshot: Fix broken iterator in CompressedSnapshotReader." am: 3d152c926b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490702

Change-Id: I40a181cf3ade90366dd663975f9b8991c259d817
2020-11-07 02:26:29 +00:00
David Anderson
3d152c926b Merge "libsnapshot: Fix broken iterator in CompressedSnapshotReader." 2020-11-07 01:32:06 +00:00
Daniel Rosenberg
6a3870b1c3 Merge "libsnapshot: Remove Initialize(fd, APPEND)" am: d021544d04 am: 495d2d357e am: 11dc5bc75a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1487939

Change-Id: Ie0c2526ae3923d79dde2e5fb61b189e1f320dfe2
2020-11-06 23:24:39 +00:00
Treehugger Robot
57fe6292f0 Merge "first_stage_init: run first_stage.sh regardless of console presence" am: f7c47f81ba am: b1a6977bad am: db67cbe2e6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1483693

Change-Id: I839b386eeb0c21295e99c40b2e6ba6e489bb4fd5
2020-11-06 23:24:12 +00:00
Daniel Rosenberg
11dc5bc75a Merge "libsnapshot: Remove Initialize(fd, APPEND)" am: d021544d04 am: 495d2d357e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1487939

Change-Id: I73688630e8a79d9957a6dafdd1141c8c4afc575e
2020-11-06 23:13:52 +00:00
Treehugger Robot
db67cbe2e6 Merge "first_stage_init: run first_stage.sh regardless of console presence" am: f7c47f81ba am: b1a6977bad
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1483693

Change-Id: Iea4a29a3214c4945ad21365d57a75f586584c95a
2020-11-06 23:12:52 +00:00
David Anderson
4137dee0e5 libsnapshot: Fix broken iterator in CompressedSnapshotReader.
Bug: NA
Test: apply full OTA with VABC
Change-Id: I9173ac1c6fb601a6f9e0bfb935d7908e0f234f0f
2020-11-06 15:10:41 -08:00
Daniel Rosenberg
495d2d357e Merge "libsnapshot: Remove Initialize(fd, APPEND)" am: d021544d04
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1487939

Change-Id: I72b89164f46f4dfc93988d9840c7f7c82544cfc6
2020-11-06 22:58:09 +00:00
Treehugger Robot
b1a6977bad Merge "first_stage_init: run first_stage.sh regardless of console presence" am: f7c47f81ba
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1483693

Change-Id: I93126b29effe0da58e0c1d18f7d30c2c7c7fd566
2020-11-06 22:56:05 +00:00
Nikita Ioffe
3b39a9ef6a Don't SIGABORT if device-mapper doesn't generate uevent for DeleteDevice
It looks like in some rare scenarios device-mapper won't create an
uevent while handling DM_DEV_REMOVE ioctl.

Since failure to generate uevent will result in ueventd not cleaning up
/dev paths in user space, it should be ok to just fail DeleteDevice call
without aborting the entire process.

Test: presubmit
Bug: 171266986
Change-Id: Iece28e6e02c35ac4bf33b9be74dfe1bbbb466bd4
2020-11-06 22:38:23 +00:00
Daniel Rosenberg
d021544d04 Merge "libsnapshot: Remove Initialize(fd, APPEND)" 2020-11-06 22:16:43 +00:00
Akilesh Kailash
17b5a4433e libsnapshot:snapuserd: Fix cow_snapuserd_test.
This will test the IO operation
between dm-snapshot/dm-user/snapuserd daemon. This test was broken
after cow format and daemon related changes.

Test: cow_snapuserd_test

Bug: 168311203
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I3e5f435332957a2549fd029c84efe13efb98b909
2020-11-06 22:10:10 +00:00
Treehugger Robot
f7c47f81ba Merge "first_stage_init: run first_stage.sh regardless of console presence" 2020-11-06 21:33:03 +00:00
David Anderson
5bd7ca51c0 Merge changes I0b9ce272,I2bb3e55b am: f54cc3bbfd am: 754aa5a139 am: f1cd70e59c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490280

Change-Id: Ia0aa754623825ea2487e210cec61b8c7291fb260
2020-11-06 19:40:02 +00:00
Treehugger Robot
98e2098e4f Merge "init: log 'updatable process' clarification" am: 674339d9f9 am: 792402ddd1 am: 0ef7849fa7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490282

Change-Id: Iab51e9020bb41696a1e137a8feb6b41336a59e33
2020-11-06 19:39:38 +00:00
David Anderson
f1cd70e59c Merge changes I0b9ce272,I2bb3e55b am: f54cc3bbfd am: 754aa5a139
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490280

Change-Id: Ib7bbc6d8c44881662b0968ceaf82e9f0e81e54ad
2020-11-06 19:29:45 +00:00
Treehugger Robot
0ef7849fa7 Merge "init: log 'updatable process' clarification" am: 674339d9f9 am: 792402ddd1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490282

Change-Id: I538224d53f30ff3f14f67e4dca29e4ff51322ba8
2020-11-06 19:29:32 +00:00
Treehugger Robot
55e3ef8e66 Merge "Use default dsu slot name when host is Android Q" am: 3b767c431a am: 498d65f71e am: 6de62e2c26
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490246

Change-Id: Ifdf404b1f9d1fc17c5f327ef93c20eab9649c853
2020-11-06 19:20:33 +00:00
David Anderson
754aa5a139 Merge changes I0b9ce272,I2bb3e55b am: f54cc3bbfd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490280

Change-Id: I39d7bb4adebf3e7a0749b13283d817f77cc2cf4e
2020-11-06 19:12:35 +00:00
Treehugger Robot
792402ddd1 Merge "init: log 'updatable process' clarification" am: 674339d9f9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490282

Change-Id: I2376d72aafc8e0bf7dafa3053a784ff29c21cd28
2020-11-06 19:12:11 +00:00
David Anderson
f54cc3bbfd Merge changes I0b9ce272,I2bb3e55b
* changes:
  libsnapshot: Ignore non-data ops in snapshot_reader.
  libsnapshot: Round compressed COW sizes to the nearest block.
2020-11-06 19:05:42 +00:00
Treehugger Robot
6de62e2c26 Merge "Use default dsu slot name when host is Android Q" am: 3b767c431a am: 498d65f71e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490246

Change-Id: I6de53ccbbf7cdd5b6fb2b6191c6c219157d7058b
2020-11-06 19:04:56 +00:00
Treehugger Robot
674339d9f9 Merge "init: log 'updatable process' clarification" 2020-11-06 18:58:58 +00:00
Treehugger Robot
498d65f71e Merge "Use default dsu slot name when host is Android Q" am: 3b767c431a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1490246

Change-Id: I2e57466b4e8b444d324af4930d83400eb094e5f0
2020-11-06 17:38:37 +00:00
Treehugger Robot
3b767c431a Merge "Use default dsu slot name when host is Android Q" 2020-11-06 17:06:12 +00:00
Steven Moreland
abc5f8830e init: log 'updatable process' clarification
-> process with updatable components

Fixes: 172605179
Test: N/A
Change-Id: I0f9353fe65cea623e1d2292f0163cc545bfc909d
2020-11-06 17:01:51 +00:00