Commit graph

64959 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Yo Chiang
b445a01263 Use default dsu slot name when host is Android Q
DSU slotting support is added in Android R, so
android::gsi::GetActiveDsu() is guaranteed to fail if DSU guest system
is S and host is Q.
In that case, just assume the the DSU slot to be "dsu".

Bug: 172541102
Bug: 168571434
Test: Boot GSI S on Q pixel with DSU
Change-Id: I96e191907ce2fedf8c22b7887e930a7c455eb593
2020-11-06 09:00:41 +00:00
David Anderson
6404d11a20 libsnapshot: Ignore non-data ops in snapshot_reader.
Certain ops (label, footer) do not have actual block mappings, so ignore
these.

Bug: NA
Test: apply OTA with VABC
Change-Id: I0b9ce27239553d8126c17767f35c2651df951ea0
2020-11-06 00:50:35 -08:00
David Anderson
14ae4d1dee libsnapshot: Round compressed COW sizes to the nearest block.
This is needed to create and stack device-mapper devices. The kernel
complains (or rejects) the table otherwise.

Bug: N/A
Test: manual test
Change-Id: I2bb3e55b7d999522c4c990b4ab7c46bcb78553a8
2020-11-06 00:50:34 -08:00
Daniel Rosenberg
dd6cb0d236 libsnapshot: Remove Initialize(fd, APPEND)
All cases where we want to append are done via label, so we can remove
the far more complicated open mode for append. Since this only leaves
open, we can remove the mode entirely.

Bug: 172026020
Test: cow_api_test
Change-Id: Ibe305e56b434da25952a129764398f606ca58aff
2020-11-05 18:38:58 -08:00
David Anderson
61484f03ce Merge "libsnapshot: Add an open /dev/null mode for CowWriter." am: 56850e12e3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1488476

Change-Id: I0048a52c875b877b93bca24f533e8e0222f7ad89
2020-11-05 08:14:51 +00:00
David Anderson
56850e12e3 Merge "libsnapshot: Add an open /dev/null mode for CowWriter." 2020-11-05 07:37:43 +00:00
David Anderson
1b9ab3f544 libsnapshot: Add an open /dev/null mode for CowWriter.
This will be used by payload_generator to estimate the COW size without
using extra storage space.

Bug: 168554689
Test: cow_api_test, ota_from_target_files
Change-Id: I095c809e7d81eff5321b86f4c6bdfb6e9467e84e
2020-11-04 20:38:50 -08:00
Treehugger Robot
e8704b1ddb Merge "libsnapshot: Only sync after labels" am: f2609b2b0f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1480663

Change-Id: I1f6146f5949f9965735aee0d2bbf1c794c7916b8
2020-11-05 04:08:18 +00:00
Treehugger Robot
f2609b2b0f Merge "libsnapshot: Only sync after labels" 2020-11-05 03:52:04 +00:00
David Anderson
3c75ccfd50 Merge "libsnapshot: Use the COW size from the update manifest." am: c497a1c63c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1482764

Change-Id: I67f3804c6794477145f12a6c49b6c6513091f2af
2020-11-04 20:32:22 +00:00
David Anderson
c497a1c63c Merge "libsnapshot: Use the COW size from the update manifest." 2020-11-04 20:20:14 +00:00
Treehugger Robot
6eef59ca58 Merge "Fix unused function error for user build" am: fded8e696c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1487337

Change-Id: I5ad8046a960c938b2e57bfe6f4e321a1acd1dcc8
2020-11-04 11:21:59 +00:00
Treehugger Robot
fded8e696c Merge "Fix unused function error for user build" 2020-11-04 10:47:35 +00:00
Yo Chiang
cc86e967c7 Fix unused function error for user build
```
system/core/fs_mgr/fs_mgr_overlayfs.cpp:83:6: error: unused function
'fs_mgr_is_dsu_running' [-Werror,-Wunused-function]
```

Bug: 172405271
Bug: 165925766
Test: build aosp_bonito-user, no warning/error
Change-Id: I3206e5bd13658ab0b7f5826e8e1c206c8df65684
2020-11-04 07:02:47 +00:00
Rick Yiu
43622aea3c Merge "libprocessgroup: Support write to file feature" am: b4a3f080e6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1474116

Change-Id: I5fa613c73603071bc561a4ac980c8ac300efe844
2020-11-04 05:27:55 +00:00
Treehugger Robot
a80dc0d4e2 Merge changes I669a03a6,Ibb774d6d am: f6d42d45c5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1484983

Change-Id: I6a84a6f5bda3018766def14edbf9536da3859256
2020-11-04 05:27:28 +00:00
Rick Yiu
b4a3f080e6 Merge "libprocessgroup: Support write to file feature" 2020-11-04 04:54:42 +00:00
Treehugger Robot
f6d42d45c5 Merge changes I669a03a6,Ibb774d6d
* changes:
  libsnapshot: Fix footer values and verification
  libsnapshot: Fix some minor formatting bugs
2020-11-04 04:50:42 +00:00
Yo Chiang
7d485cec05 Merge changes from topic "dsu-overlayfs" am: 65f4f4359d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1476596

Change-Id: I4d6acf0e9b2edffd14275caa0c4cad634931cd2d
2020-11-04 03:46:58 +00:00
Yo Chiang
db7bf1c9a1 Enable overlayFS on DSU system am: 0267bf0e96
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1469563

Change-Id: Ide20f97ea0d42a71de86e15092156cd5a6b70ce0
2020-11-04 03:46:52 +00:00
Yo Chiang
7358c52efb Merge "adb-remount-test.sh: Make devt errors warnings instead" am: 497bca09c7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1473230

Change-Id: Iaab4e86d0fe8101285743c74d3104bc86231dd24
2020-11-04 03:46:49 +00:00
Yo Chiang
fa48a7bac2 Merge "TransformFstabForDsu() skips handling special devices" am: 5ab4400db1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1469562

Change-Id: I00bcd137caa1be54d5ed0b5f774056a52554b1e2
2020-11-04 03:46:37 +00:00