Commit graph

5163 commits

Author SHA1 Message Date
Treehugger Robot
d00aa3ec08 Merge "Add timeout for fsck on untrusted media" am: 313e8556a6
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1826726

Change-Id: I9786e6da7d4f3926c7a9f329db73eacec48645d5
2022-01-26 09:14:10 +00:00
Treehugger Robot
313e8556a6 Merge "Add timeout for fsck on untrusted media" 2022-01-26 08:55:08 +00:00
Tao Wu
a6e700b054 Merge "Don't abort fuse connections for virtiofs." am: 09997fe28a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1437953

Change-Id: I25bbea84a3be7d6ae3b74ecfbb076d6520354671
2022-01-19 04:13:37 +00:00
Tao Wu
09997fe28a Merge "Don't abort fuse connections for virtiofs." 2022-01-19 03:57:44 +00:00
Tao Wu
3d98962269 Don't abort fuse connections for virtiofs.
Android should only abort fuse connections for fuse fs. It shouldn't
touch fuse connections for virtiofs.

Bug: 162284193
Test: manual - Restart zygote, no 'Transport endpoint is not connected' error.
Change-Id: Ie3536734531404e98ad1b6594ab3c52e919b22b7
2022-01-18 18:33:52 -08:00
Daeho Jeong
25c4ccbb3b Merge "Add interfaces required by smart idle maintenance service" am: 6845e06ab9 am: c0c12f5706 am: 73876a2c28
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1936286

Change-Id: Ia340061d36de6521795e96e0305f3a7cfe7a1d32
2022-01-13 17:20:04 +00:00
Daeho Jeong
73876a2c28 Merge "Add interfaces required by smart idle maintenance service" am: 6845e06ab9 am: c0c12f5706
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1936286

Change-Id: I3a12512cc122ee472445652518e7454a7fbfb8ef
2022-01-13 17:09:13 +00:00
Daeho Jeong
c0c12f5706 Merge "Add interfaces required by smart idle maintenance service" am: 6845e06ab9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1936286

Change-Id: Ib432dfc545cc95fc0c0063b84343b3899df259b6
2022-01-13 16:53:25 +00:00
Daeho Jeong
6845e06ab9 Merge "Add interfaces required by smart idle maintenance service" 2022-01-13 16:38:04 +00:00
Daeho Jeong
999fceb07c Add interfaces required by smart idle maintenance service
Added interfaces required by smart idle maintenance service in
StorageManagerService, whose goal is to determine when to trigger
filesystem defragmentation while keeping the best user experience
as long as possible, and avoiding hurting UFS lifetime.

Test: check smart idle maintenance log every hour
Bug: 202283480
Bug: 181079477
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I012cfb9b01e5d21ec71700c3c52ac9c096cd1a90
2022-01-12 10:54:37 -08:00
Treehugger Robot
53ae3cb110 Merge "MetadataCrypt: fix timeout due to missing userdata dm device" am: df2bc1025b am: 1b2cac19c8 am: 28d183be21
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1932822

Change-Id: I5c63dfad6008a066c3fb222f5eb3c19fd32f962c
2021-12-24 01:37:21 +00:00
Treehugger Robot
28d183be21 Merge "MetadataCrypt: fix timeout due to missing userdata dm device" am: df2bc1025b am: 1b2cac19c8
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1932822

Change-Id: I4483bf1f085da11bd8220eee51805a37a911f079
2021-12-24 01:09:34 +00:00
Treehugger Robot
1b2cac19c8 Merge "MetadataCrypt: fix timeout due to missing userdata dm device" am: df2bc1025b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1932822

Change-Id: I2f5462c5590d26c43135537f083d3af9e54fe307
2021-12-24 00:57:15 +00:00
Treehugger Robot
df2bc1025b Merge "MetadataCrypt: fix timeout due to missing userdata dm device" 2021-12-24 00:42:51 +00:00
Will McVicker
b910e7e325 MetadataCrypt: fix timeout due to missing userdata dm device
We need to load the partition table before we can wait on the userdata
dm device because the kernel (as of [1] doesn't send the KOBJ_ADD uevent
until after the partition table is loaded. The new flow needs to be:

  CreateDevice() -> ioctl(DM_DEV_CREATE)
  LoadTableAndActivate() -> ioctl(DM_TABLE_LOAD)
  WaitForDevice()

This patch updates create_crypto_blk_dev() to first call
LoadTableAndActivate() before WaitForDevice().

[1] https://lore.kernel.org/all/20210804094147.459763-8-hch@lst.de/

Fixes: 156d9d2293 ("Pre-create userdata metadata encryption device.")
Bug: 210737958
Test: manually test booting raven with android13-5.15
Change-Id: Iab2214a62d44ba7e53b57f2cf0f08ac06c77b4fd
2021-12-23 20:36:44 +00:00
Xin Li
dd850f5d4c [automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65f8 -s ours am: 8f933c71e0 -s ours am: 76ff4f2267 -s ours
am skip reason: Merged-In Id6edfe90aadae4db1b23c5bc0de4981170ba42f2 with SHA-1 344c737ba0 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1921950

Change-Id: I1c13c602c77eac48d8c77490d6088de1d44a4f0d
2021-12-14 21:50:53 +00:00
Xin Li
76ff4f2267 [automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65f8 -s ours am: 8f933c71e0 -s ours
am skip reason: Merged-In Id6edfe90aadae4db1b23c5bc0de4981170ba42f2 with SHA-1 344c737ba0 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1921950

Change-Id: Ib3e921b8916d37ff10d7cf9adfd40ab2981d7a10
2021-12-14 21:23:59 +00:00
Xin Li
8f933c71e0 [automerger skipped] Merge "Merge Android 12 QPR1" am: 235d1d65f8 -s ours
am skip reason: Merged-In Id6edfe90aadae4db1b23c5bc0de4981170ba42f2 with SHA-1 344c737ba0 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1921950

Change-Id: Ica0e7ec4c9d28da3832d587604d0ff5a097050f2
2021-12-14 21:00:09 +00:00
Xin Li
235d1d65f8 Merge "Merge Android 12 QPR1" 2021-12-14 20:25:23 +00:00
Xin Li
721a879cfe Merge Android 12 QPR1
Bug: 210511427
Merged-In: Id6edfe90aadae4db1b23c5bc0de4981170ba42f2
Change-Id: Ic9e9149ae767b55c33b100586dfcb5790c862bbf
2021-12-14 08:39:19 -08:00
Treehugger Robot
c9bb1e5290 Merge "Remove StubVolume disks upon vold reset events" am: e8d0e486a3 am: 344c737ba0 am: 7e3abf6c3e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1902674

Change-Id: I945518919facfb1aec58f297feaedef816062ecc
2021-12-08 09:08:46 +00:00
Treehugger Robot
7e3abf6c3e Merge "Remove StubVolume disks upon vold reset events" am: e8d0e486a3 am: 344c737ba0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1902674

Change-Id: I0c076a1a44b605585feeb5781ed87f755ebdcd68
2021-12-08 08:58:01 +00:00
Treehugger Robot
344c737ba0 Merge "Remove StubVolume disks upon vold reset events" am: e8d0e486a3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1902674

Change-Id: Id6edfe90aadae4db1b23c5bc0de4981170ba42f2
2021-12-08 08:43:32 +00:00
Treehugger Robot
e8d0e486a3 Merge "Remove StubVolume disks upon vold reset events" 2021-12-08 08:25:46 +00:00
Youkichi Hosoi
dfaff1dc15 Remove StubVolume disks upon vold reset events
StubVolumes are managed from outside Android (e.g. from Chrome OS). So,
their disk recreation on vold reset events should also be handled from
outside by 1) listening to reset events, and 2) calling
createStubVolume() for existing StubVolumes on reset events.

Bug: 175281783
Test: m
Test: (Tested in R) Manually induce a vold reset event, and confirm that
Test: 1) vold does not crash, and 2) existing volumes are successfully
Test: mounted again (by calling createStubVolume() for StubVolumes).
Change-Id: I4628eabf809037a547aeef43faedf4dfa57529a6
2021-12-08 09:37:53 +09:00
Treehugger Robot
050a7ed6ec Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7 am: 64a5600c83 am: 190b5fb47a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1906281

Change-Id: I3a986fe14e69b6f94f86962574198d6b3dc358da
2021-12-07 18:47:58 +00:00
Treehugger Robot
190b5fb47a Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7 am: 64a5600c83
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1906281

Change-Id: I136d349b3f29b924f61d7739ded7616dcaa16c72
2021-12-07 18:36:49 +00:00
Treehugger Robot
64a5600c83 Merge "Depend on Keystore2 AIDL via default" am: b9f8c322c7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1906281

Change-Id: I6383e6a45086539103bae5f19369532733d4aec5
2021-12-07 18:21:50 +00:00
Treehugger Robot
b9f8c322c7 Merge "Depend on Keystore2 AIDL via default" 2021-12-07 18:08:13 +00:00
Treehugger Robot
ccd2d0687c Merge "Disable bind mounts for data and obb if FUSE BPF is available" am: b9f8aefbb9 am: f0bde5767c am: be440e1227
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1907695

Change-Id: Ie095a81f8125f0d875c32b66d8f37c86f49764f6
2021-12-02 21:10:33 +00:00
Treehugger Robot
be440e1227 Merge "Disable bind mounts for data and obb if FUSE BPF is available" am: b9f8aefbb9 am: f0bde5767c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1907695

Change-Id: I18dd4137d5140765bd3607e8ca7aa5fd0d403154
2021-12-02 20:50:12 +00:00
Treehugger Robot
f0bde5767c Merge "Disable bind mounts for data and obb if FUSE BPF is available" am: b9f8aefbb9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1907695

Change-Id: I6867f9941c2e98023999b11edf5d0e2f67949840
2021-12-02 20:34:59 +00:00
Treehugger Robot
b9f8aefbb9 Merge "Disable bind mounts for data and obb if FUSE BPF is available" 2021-12-02 19:54:26 +00:00
Alessio Balsini
dd1e91ff58 Disable bind mounts for data and obb if FUSE BPF is available
FUSE BPF aims at achieving comparable performance to bind-mounts, with
the flexibility of FUSE.
Disable data and obb bind-mounts in favor of the FUSE filesystem if the
system implements the feature.

Bug: 202785178
Test: mount | grep obb
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: Ia8b289b84542125831a857b559bb6f93afbee494
2021-12-02 18:35:17 +00:00
David Drysdale
4babbc78d5 Depend on Keystore2 AIDL via default
This allows for easier bumping of the KeyMint/Keystore2 version level.

At the moment this change should have no effect: the same dependency
is used, just reached via a default rather than explicitly.

However, when the Keystore2 version increases in the near future, using
this default should mean that no change is needed here: the default
definition will change to -V2 and this will be referenced here.

Test: TreeHugger
Change-Id: I7cec2cd8fac137e5ac7e95db06e738e94a3cc567
2021-12-01 09:56:48 +00:00
Paul Lawrence
94e2868455 Merge "Add dependency for vold on fuse_media.o" am: e9c951590e am: cca6366ead am: eee31e408b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1894199

Change-Id: Ic6ea313820273c2d5ce7ff8c87846f72616e0e18
2021-11-29 16:58:45 +00:00
Paul Lawrence
eee31e408b Merge "Add dependency for vold on fuse_media.o" am: e9c951590e am: cca6366ead
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1894199

Change-Id: Id43b3546ef41639ba864fb2792af844eff3e6347
2021-11-29 16:45:03 +00:00
Paul Lawrence
cca6366ead Merge "Add dependency for vold on fuse_media.o" am: e9c951590e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1894199

Change-Id: I0578842564cc92860548f895498c7e852e853166
2021-11-29 16:33:03 +00:00
Paul Lawrence
e9c951590e Merge "Add dependency for vold on fuse_media.o" 2021-11-29 16:18:42 +00:00
Treehugger Robot
ef8924f46d Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" am: bddb449182 am: 6e9d37542f am: b43b71a2bc
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1891635

Change-Id: I9425ea87c9c57ba9ac7dcc4376cf86f931557d00
2021-11-26 03:58:30 +00:00
Treehugger Robot
b43b71a2bc Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" am: bddb449182 am: 6e9d37542f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1891635

Change-Id: I5e3410dfe59791b003b6387a64e228b5945a99a5
2021-11-26 03:41:28 +00:00
Treehugger Robot
6e9d37542f Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" am: bddb449182
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1891635

Change-Id: I9b8c755cacecd71598ec48ac5d009a0aa728e3de
2021-11-26 03:23:23 +00:00
Treehugger Robot
bddb449182 Merge "Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}" 2021-11-26 03:02:16 +00:00
Youkichi Hosoi
2991cbe49f Split MOUNT_FLAG_VISIBLE into MOUNT_FLAG_VISIBLE_FOR_{READ, WRITE}
IVold.MOUNT_FLAG_VISIBLE is split into MOUNT_FLAG_VISIBLE_FOR_READ and
MOUNT_FLAG_VISIBLE_FOR_WRITE.
Accordingly, VolumeBase::MountFlags::kVisible is split into
kVisibleForRead and kVisibleForWrite.

Bug: 206019156
Test: m
Change-Id: Ia55673400d9f713f221650e1335a46ba11f6f027
Merged-In: Ia55673400d9f713f221650e1335a46ba11f6f027
2021-11-25 13:04:45 +09:00
Eric Biggers
6221c50e95 Merge "Allow IV_INO_LBLK_32 with virtio storage" am: 660f052858 am: 56e5978547 am: 9fc74e7614
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1899590

Change-Id: Ie08f47b57100d7194c4a2d42e9ebfa81d261b6f6
2021-11-23 19:50:32 +00:00
Eric Biggers
9fc74e7614 Merge "Allow IV_INO_LBLK_32 with virtio storage" am: 660f052858 am: 56e5978547
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1899590

Change-Id: I6817ee46e6dc6ba84dd7fbfc89bccf82819e4eec
2021-11-23 19:33:22 +00:00
Eric Biggers
56e5978547 Merge "Allow IV_INO_LBLK_32 with virtio storage" am: 660f052858
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1899590

Change-Id: Iada10c8ad80a70a039354e8321153c0cad4bd785
2021-11-23 19:10:20 +00:00
Eric Biggers
660f052858 Merge "Allow IV_INO_LBLK_32 with virtio storage" 2021-11-23 18:48:11 +00:00
Eric Biggers
f9c6dfa8fd Allow IV_INO_LBLK_32 with virtio storage
This has to be allowed as a workaround until there is a way for
userspace to check the maximum DUN size directly.

Bug: 207390665
Change-Id: Id5e51720ca963fe80e65dbae1965f777b3cd2ee4
2021-11-22 11:33:39 -08:00
Xin Li
1acd8a9306 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: d756848928 -s ours am: 0c981040de -s ours
am skip reason: Merged-In I026ad515c20a042f87d3ce580c28745e68c0f939 with SHA-1 b6c257d37f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/16279593

Change-Id: I19e0995b13822cae094a9c4b75ccf6d6a5953526
2021-11-18 22:25:11 +00:00