Commit graph

3815 commits

Author SHA1 Message Date
Automerger Merge Worker
1c834651ab Merge "Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 7e29904e8c" into rvc-d1-dev-plus-aosp 2020-06-17 17:11:59 +00:00
Nikita Ioffe
5268ad04a7 Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 7e29904e8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: I13fee40e133ae4795b92cf95ff818b77aa4ef5bf
2020-06-17 17:11:55 +00:00
Nikita Ioffe
527576e053 Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 356baaa10a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: Idae0195c2db9192e54d8a31aff8072e82d93f798
2020-06-17 17:11:54 +00:00
Nikita Ioffe
356baaa10a Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: I90e3ab660ddb356bd7c0212e188b997f6bfa07d4
2020-06-17 16:53:30 +00:00
Nikita Ioffe
7e29904e8c Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11837171

Change-Id: I16f0f0b5925c503c66d1d7b14687232b9c30f782
2020-06-17 16:53:01 +00:00
Nikita Ioffe
bcd7d5e7ce Merge "Configure read ahead for fuse mounts" into rvc-dev 2020-06-17 16:37:37 +00:00
Nikita Ioffe
dcee5c1d21 Configure read ahead for fuse mounts
For fuse read ahead can be configured by writing a value to the
/sys/class/bdi/{MAJOR}:{MINOR}/read_ahead_kb file.

There are several different ways of getting {MAJOR}:{MINOR} values of
the filesystem:

* Look at st_dev of stat("/mnt/user/0/emulated").
* Parse /proc/self/mountinfo.

Stat'ing approach is used since it's easier to implement.

Bug: 157982297
Test: atest vold_tests
Test: adb shell cat /proc/self/mountinfo to get MAJOR:MINOR
Test: adb shell cat /sys/class/bdi/{MAJOR}:{MINOR}/read_ahead_kb
Test: created public volume, checked it's read_ahead_kb is also 256
Change-Id: Id0c149c4af1ceabf3afc33b4100563a512b38316
2020-06-17 15:58:25 +01:00
Automerger Merge Worker
7b181d2344 Merge "Add app's own UID to the default ACL. am: 1129b81071 am: 53b6f32850" into rvc-d1-dev-plus-aosp 2020-06-17 07:17:12 +00:00
Martijn Coenen
bbc2c8babc Add app's own UID to the default ACL. am: 1129b81071 am: 53b6f32850
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Ifcd1d4acd9e7e4077e50004d4ed35650e1c6af48
2020-06-17 07:17:08 +00:00
Martijn Coenen
615d7752c1 Add app's own UID to the default ACL. am: 1129b81071 am: 55565a991f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Iaec02373329881afa98db8cae68410fccd5d3e00
2020-06-17 07:16:57 +00:00
Martijn Coenen
53b6f32850 Add app's own UID to the default ACL. am: 1129b81071
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Icbff1ee04a5f79582e92d5fa8ed8913260cc417f
2020-06-17 07:01:58 +00:00
Martijn Coenen
55565a991f Add app's own UID to the default ACL. am: 1129b81071
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/11871333

Change-Id: Icff0c7db7e572aedb6da75c38bdea08c204e087e
2020-06-17 07:01:53 +00:00
Martijn Coenen
1129b81071 Add app's own UID to the default ACL.
On devices without sdcardfs, /Android/data/com.foo and
/Android/obb/com.foo can be written by other processes (eg installers);
in those cases, file ownership may be wrong. To ensure that the original
app always has access to the files contained in this directory, add a
group to the default ACL that matches the UID of the app. Since all apps
have their own UID also as their group ID, this ensures that things keep
working correctly.

Bug: 157530951
Test: atest
android.appsecurity.cts.ExternalStorageHostTest#testExternalStorageUnsharedObb
Change-Id: I829a2a7c7b578a8328643f38681e68796adcd6b2

Change-Id: Ibbc333fb395507363830dfcf5dc6f1cfd55f008d
2020-06-16 15:16:18 +02:00
Treehugger Robot
2af4815188 [automerger skipped] Merge "Record use of metadata encryption in property" am: f20a16575f am: d49f8c9eb7 -s ours am: 3727ec993e -s ours
am skip reason: Change-Id I400873ec207cb63f0407fefc83962bb3a927e294 with SHA-1 94abae03a9 is in history

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

Change-Id: I11151df4da7c1573cc7cb6fe63bb44480b80bf9c
2020-06-02 19:46:48 +00:00
Treehugger Robot
3727ec993e [automerger skipped] Merge "Record use of metadata encryption in property" am: f20a16575f am: d49f8c9eb7 -s ours
am skip reason: Change-Id I400873ec207cb63f0407fefc83962bb3a927e294 with SHA-1 94abae03a9 is in history

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

Change-Id: Idf38f57a2370789e069846b6dc3e4b36cb80d9e4
2020-06-02 19:33:43 +00:00
Treehugger Robot
d49f8c9eb7 Merge "Record use of metadata encryption in property" am: f20a16575f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1322598

Change-Id: I7b102707853ea2556c5a24858ae43ea5c2717616
2020-06-02 19:20:44 +00:00
Treehugger Robot
f20a16575f Merge "Record use of metadata encryption in property" 2020-06-02 19:04:12 +00:00
Paul Crowley
7fbd8d4474 Record use of metadata encryption in property
Bug: 152150018
Test: Cuttlefish with and without keydirectory option
Cherry-Picked-From: 94abae03a9
Merged-In: I400873ec207cb63f0407fefc83962bb3a927e294
Change-Id: I400873ec207cb63f0407fefc83962bb3a927e294
2020-06-02 11:16:55 -07:00
Automerger Merge Worker
f31dd99eae Merge "Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: eaca298077" into rvc-d1-dev-plus-aosp 2020-05-29 16:15:23 +00:00
Martijn Coenen
a2d954fca1 Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: eaca298077
Change-Id: I9fbd99cfd49e720a805ddc8c5d293af941a36ed4
2020-05-29 16:15:19 +00:00
Martijn Coenen
27f2813d4b Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am: 8714d59e29
Change-Id: I1429d8e4b63f4c194c226e538f7595729317d4b1
2020-05-29 16:15:12 +00:00
Martijn Coenen
eaca298077 Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a
Change-Id: I9f3435a686e76f9fbc8b8ec8cae33f5538a94ec5
2020-05-29 16:00:05 +00:00
Martijn Coenen
8714d59e29 Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a
Change-Id: I587b49c9baed58fb87d27e060faf5d3d4ef8d788
2020-05-29 15:59:55 +00:00
Martijn Coenen
cbb69e548a Merge "vold: Support aborting FUSE connections." into rvc-dev 2020-05-29 15:47:05 +00:00
Abhijeet Kaur
74324b51de FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: e2e2b5499b
Change-Id: I66bcb898dd960ced948d9137594539e8545c50c4
2020-05-29 15:19:08 +00:00
Abhijeet Kaur
dfedc945ab FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41 am: 13bfc2465c
Change-Id: Ia7f5210da38ca4340f36957af894baf79a4dc41d
2020-05-29 15:19:00 +00:00
Abhijeet Kaur
e2e2b5499b FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41
Change-Id: I1e26192d3ae181bc3fd9bcb3f7bf56db0f073328
2020-05-29 15:07:04 +00:00
Abhijeet Kaur
13bfc2465c FuseDaemonHostTest is migrated to CTS and renamed. am: de83802e41
Change-Id: Iebe048b3e1dd31a63ed62df8c2010e9e5d5d5e4a
2020-05-29 15:06:57 +00:00
Abhijeet Kaur
de83802e41 FuseDaemonHostTest is migrated to CTS and renamed.
FuseDaemonHostTest is migrated to CTS and renamed to
CtsScopedStorageHostTest.

Bug: 142926859
Test: atest --test-mapping
Change-Id: I24c74e20909ccf8868d1487e1cc93f6f2c0108fc
2020-05-28 18:43:08 +01:00
Martijn Coenen
23c0445355 vold: Support aborting FUSE connections.
This can be done through binder as well as vdc, using 'vdc volume
abort_fuse'.

Bug: 153411204
Test: adb shell vdc volume abort_fuse
Change-Id: I93e46dc1cd361729cc1162c63520cf73152ea409
2020-05-28 16:07:16 +02:00
Daniel Rosenberg
49d964c1c9 Move enabling sdcardfs behind a property am: f36bdddc7e am: 09daf93c62
Change-Id: I6d11fa265c51423fa798c77652a6470ac0bdf88b
2020-05-21 09:01:49 +00:00
Daniel Rosenberg
c8ee3a8cd6 Move enabling sdcardfs behind a property am: f36bdddc7e am: 4835e936fc
Change-Id: I7e37b4ffa8f629f809a25352a7a6c1ef4f789748
2020-05-21 08:46:56 +00:00
Daniel Rosenberg
09daf93c62 Move enabling sdcardfs behind a property am: f36bdddc7e
Change-Id: I6ded03167243e9fc60dc2206b5781a84a0140aa3
2020-05-21 08:41:18 +00:00
Daniel Rosenberg
4835e936fc Move enabling sdcardfs behind a property am: f36bdddc7e
Change-Id: I8bf90ef649975d182787757d73f9e2b46389483f
2020-05-21 08:41:14 +00:00
Treehugger Robot
1399d250be [automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours am: 16cbb5a2c8 -s ours
am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: Iece0b98e72676046f3d16dd9fa2cb22235a3cc25
2020-05-20 07:45:30 +00:00
Treehugger Robot
16cbb5a2c8 [automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours
am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: Id73de89d4b905212935da4286ee50789b47695e6
2020-05-20 07:26:02 +00:00
Treehugger Robot
d625abfda2 Merge "Handle virtio in private fs mapping" am: e471d11d46
Change-Id: If088b875ff4cbca66fe9c6f9224b437edc85dae8
2020-05-20 07:08:04 +00:00
Treehugger Robot
e471d11d46 Merge "Handle virtio in private fs mapping" 2020-05-20 06:32:43 +00:00
Daniel Rosenberg
f36bdddc7e Move enabling sdcardfs behind a property
This allows devices that have sdcardfs enabled in the kernel to not use
it. When external_storage.sdcardfs.enabled=0, sdcardfs will not be
mounted. This is treated as default true to not affect upgrading
devices. It does not use the old ro.sys.sdcardfs as that has been
repurposed over time and no longer can be relied on to turn off
sdcardfs. This is included within emulated_storage.mk

Bug: 155222498
Test: mount|grep "type sdcardfs" should find nothing after boot complete
      if external_storage.sdcardfs.enabled=0
Change-Id: I23d75fb1225aeabbcb1a035ad62fd042b6b3c7b5
2020-05-19 22:11:49 -07:00
Automerger Merge Worker
6e535e3eb2 Merge "Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11" into rvc-d1-dev-plus-aosp 2020-05-20 05:00:18 +00:00
TreeHugger Robot
ce76f757ad Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 9ec7ed5b11
Change-Id: Idce31662195bf1a087a949fc4c4483b98d5d62c7
2020-05-20 04:59:50 +00:00
TreeHugger Robot
43f7db57f6 Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6 am: 34d72f126b
Change-Id: I5c285cd4cc39c93bcf71bc62ccbaafa618a61440
2020-05-20 04:59:48 +00:00
TreeHugger Robot
34d72f126b Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6
Change-Id: I11bc694a26676dd9f8b0fda7f2078a9bc6ed8719
2020-05-20 04:44:11 +00:00
TreeHugger Robot
9ec7ed5b11 Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6
Change-Id: Idfa020f7211187ddc9c530482de9a53d14ef315a
2020-05-20 04:44:06 +00:00
TreeHugger Robot
0d1fcb90d6 Merge "Handle virtio in private fs mapping" into rvc-dev 2020-05-20 04:28:31 +00:00
Alistair Delva
ea97154183 Handle virtio in private fs mapping
When the vold core decides if a device is SD or USB, it checks for MMC
or virtio, however when the filesystem type is decided, it does not
check for virtio, only MMC. This causes virtio SD cards to be formatted
with ext4 unconditionally.

This fix is independently correct, but it incidentally gets adopted
storage working on cuttlefish (and Android Emulator) because f2fs can
support fscrypt and casefolding at the same time; ext4 currently cannot.

Bug: 156286088
Change-Id: I0b41670d5f76b2506dad437917c2276f8e0aaccf
Merged-In: I0b41670d5f76b2506dad437917c2276f8e0aaccf
2020-05-20 00:45:02 +00:00
Alistair Delva
c671731075 Handle virtio in private fs mapping
When the vold core decides if a device is SD or USB, it checks for MMC
or virtio, however when the filesystem type is decided, it does not
check for virtio, only MMC. This causes virtio SD cards to be formatted
with ext4 unconditionally.

This fix is independently correct, but it incidentally gets adopted
storage working on cuttlefish (and Android Emulator) because f2fs can
support fscrypt and casefolding at the same time; ext4 currently cannot.

Bug: 156286088
Change-Id: I0b41670d5f76b2506dad437917c2276f8e0aaccf
2020-05-19 17:42:20 -07:00
Automerger Merge Worker
f2922c3057 Merge "Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56" into rvc-d1-dev-plus-aosp 2020-05-19 23:33:31 +00:00
Paul Crowley
6d944bcc8b Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: 4ca39e4b56
Change-Id: I198643b4e0f8849f51d7c3565a4050549759b06e
2020-05-19 23:33:25 +00:00
Paul Crowley
abf77f1c1c Merge "Record use of metadata encryption in property" into rvc-dev am: 09ff429e2a am: b2c448fa6d
Change-Id: I4c0150be02af8974c7ab7abb0bb7a2afa42eb9ce
2020-05-19 23:33:24 +00:00