Commit graph

5753 commits

Author SHA1 Message Date
Eric Biggers
2b9a70103b Merge "Set correct SELinux labels on new user directories" am: ff12485899 am: 855a86f6e7 am: 4792b2ff3a am: 844620ed8e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2086313

Change-Id: Ibcd6b8c81e7ad86923f3c340d7af5c60d33d2498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:17:52 +00:00
Eric Biggers
844620ed8e Merge "Set correct SELinux labels on new user directories" am: ff12485899 am: 855a86f6e7 am: 4792b2ff3a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2086313

Change-Id: I5dfb47519402a0c60999d2ee16b9f3d14821da62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:32:43 +00:00
Eric Biggers
4792b2ff3a Merge "Set correct SELinux labels on new user directories" am: ff12485899 am: 855a86f6e7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2086313

Change-Id: I966c9dabd925b058e53dfcafac5564b270856329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:47:52 +00:00
Eric Biggers
855a86f6e7 Merge "Set correct SELinux labels on new user directories" am: ff12485899
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2086313

Change-Id: Iecee4b11b0b89a2d4c5657e099daf0ce2525382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:18:59 +00:00
Eric Biggers
ff12485899 Merge "Set correct SELinux labels on new user directories" 2022-05-09 14:45:11 +00:00
Eric Biggers
39704e777a Set correct SELinux labels on new user directories
Make vold explicitly set the appropriate fscreate SELinux context when
creating per-user subdirectories such as /data/user/$userId.  This is
needed for these subdirectories to get the correct SELinux labels after
the sepolicy change https://r.android.com/2078213 changes their parent
directories to have different labels.

Note: the helper function being changed is also used for some other
directories, such as subdirectories of /data/misc/vold.  But this is
fine since they still get the same labels as before.

Test: see https://r.android.com/2078213
Bug: 156305599
Change-Id: Id61c2d985144007059c563cec91b1355176e915c
2022-05-04 22:17:54 +00:00
Eric Biggers
661aec02f2 Merge "Enforce that internal storage is prepared first" am: 1093934040 am: 4f4e999ec0 am: 7f925c79be am: 27c39e5a9c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2085659

Change-Id: I7fd0d64e8705035ce061f0f204c4f53a9708275e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:33:06 +00:00
Eric Biggers
27c39e5a9c Merge "Enforce that internal storage is prepared first" am: 1093934040 am: 4f4e999ec0 am: 7f925c79be
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2085659

Change-Id: Idecae496287dbd22fa6e0c065314aebbd5e07f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:24:50 +00:00
Eric Biggers
7f925c79be Merge "Enforce that internal storage is prepared first" am: 1093934040 am: 4f4e999ec0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2085659

Change-Id: Iabd7700ed3eb10439b7f9d92cfb006ae6b280558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:12:39 +00:00
Eric Biggers
4f4e999ec0 Merge "Enforce that internal storage is prepared first" am: 1093934040
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2085659

Change-Id: I30eaba96a192c2ce32aa16c60ffe1ac39194d639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 19:54:18 +00:00
Eric Biggers
c193c3fbb8 Enforce that internal storage is prepared first
Before doing anything else in fscrypt_prepare_user_storage(), error out
if adoptable storage is being prepared before internal storage.  Without
this explicit check, making this mistake results in a sequence of weird
errors that is hard to trace back to the actual problem.

Bug: 231387956
Change-Id: Ib26cc1bd46ffa2578f6f0156dfacc5496dae3178
(cherry picked from commit c66c2e306d)
Merged-In: Ib26cc1bd46ffa2578f6f0156dfacc5496dae3178
2022-05-04 19:01:45 +00:00
Eric Biggers
1093934040 Merge "Enforce that internal storage is prepared first" 2022-05-04 18:56:17 +00:00
Eric Biggers
c66c2e306d Enforce that internal storage is prepared first
Before doing anything else in fscrypt_prepare_user_storage(), error out
if adoptable storage is being prepared before internal storage.  Without
this explicit check, making this mistake results in a sequence of weird
errors that is hard to trace back to the actual problem.

Bug: 231387956
Change-Id: Ib26cc1bd46ffa2578f6f0156dfacc5496dae3178
2022-05-04 06:47:44 +00:00
Chih-hung Hsieh
1f6ff59ae4 Merge "Use tidy_checks_as_errors not -warnings-as-errors" am: 56ee1a0ca7 am: 39b2e0423b am: 4858522869 am: 6aba3d31e4
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2078678

Change-Id: I060fde72dfe5b517f0cbb1a0a4225c7fe2b6326d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 23:02:54 +00:00
Chih-hung Hsieh
6aba3d31e4 Merge "Use tidy_checks_as_errors not -warnings-as-errors" am: 56ee1a0ca7 am: 39b2e0423b am: 4858522869
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2078678

Change-Id: Ie50301218bf00eb937b445ede9442a4a45a498ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:39:14 +00:00
Chih-hung Hsieh
4858522869 Merge "Use tidy_checks_as_errors not -warnings-as-errors" am: 56ee1a0ca7 am: 39b2e0423b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2078678

Change-Id: I1fb02daed88158f4b1b4d0f7f4125b12c21400a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 22:10:48 +00:00
Chih-hung Hsieh
39b2e0423b Merge "Use tidy_checks_as_errors not -warnings-as-errors" am: 56ee1a0ca7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2078678

Change-Id: I343bac88d299cc3382143b89a37e95a3dd18a5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 21:31:50 +00:00
Chih-hung Hsieh
56ee1a0ca7 Merge "Use tidy_checks_as_errors not -warnings-as-errors" 2022-04-29 00:15:40 +00:00
Chih-Hung Hsieh
1ab55a5060 Use tidy_checks_as_errors not -warnings-as-errors
The flag -warnings-as-errors embedded in tidy_flags
is difficult to process and error-prone.
They should be replaced with the new tidy_checks_as_errors list.

Bug: 229801437
Test: make tidy-system-vold
Change-Id: I801e73dce5f08fe1ca5bc49de633706ad2cdf986
2022-04-27 15:54:25 -07:00
Alix Espino
10027c5c03 Merge "Deleted clang property in Android.bp files" am: df7ac92d33 am: 42c961198f am: cf6eb0e5e7 am: e07afb81e2 am: 3a424cfc9a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2066564

Change-Id: Ifbaa384fe71520d3e9099fdd2ddc1788da5096b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:42:22 +00:00
Alix Espino
3a424cfc9a Merge "Deleted clang property in Android.bp files" am: df7ac92d33 am: 42c961198f am: cf6eb0e5e7 am: e07afb81e2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2066564

Change-Id: Icf37540ba5f6d37b6eafef14473d1746f6700cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 22:23:29 +00:00
Alix Espino
e07afb81e2 Merge "Deleted clang property in Android.bp files" am: df7ac92d33 am: 42c961198f am: cf6eb0e5e7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2066564

Change-Id: I9e1928a7aaf6c549e553bb480aaec605c5495aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:54:31 +00:00
Alix Espino
cf6eb0e5e7 Merge "Deleted clang property in Android.bp files" am: df7ac92d33 am: 42c961198f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2066564

Change-Id: Ifb57301330cd2bec3c0cfed95e0e60206573b022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:38:24 +00:00
Alix Espino
42c961198f Merge "Deleted clang property in Android.bp files" am: df7ac92d33
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2066564

Change-Id: I1ca5175a4409124414c70f158e6df4b994b17d36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:18:53 +00:00
Alix Espino
df7ac92d33 Merge "Deleted clang property in Android.bp files" 2022-04-20 20:58:30 +00:00
Alix
347786970f Deleted clang property in Android.bp files
Deleted deprecated clang property in Android.bp files using bpmodify.

Bug: 208980553
Test: treehugger
Change-Id: Ia20c730fefe4ebb2268780260f5756dcf687ccc5
2022-04-18 04:00:10 +00:00
Daeho Jeong
5891d7e486 Merge changes from topic "change_period" am: c0de6d8184 am: 3d81e0ba06 am: aa259e7ee0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2043104

Change-Id: I93577a23c99808054e77e41948f5c0fb704c6dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:19:24 +00:00
Daeho Jeong
9a1a2af25d vold: do not set gc sleep time with zero dirty segments am: 0b5f397e2b am: f605ac329b am: 529d797f58
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2033123

Change-Id: I04825446e3a9c4b65d66ec345bfa6d5a4d3b3aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:19:22 +00:00
Daeho Jeong
065986be23 vold: add gc period in setGCUrgentPace am: 7c788fc3e9 am: 81ba5bcf1c am: a644d5c642
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2032446

Change-Id: Iea633da99a06911d93c52c77949758b1ec78849b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:19:21 +00:00
Daeho Jeong
aa259e7ee0 Merge changes from topic "change_period" am: c0de6d8184 am: 3d81e0ba06
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2043104

Change-Id: I473b88c8b3b1e8dd6ee80fe56f513269fd997a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 23:10:14 +00:00
Daeho Jeong
529d797f58 vold: do not set gc sleep time with zero dirty segments am: 0b5f397e2b am: f605ac329b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2033123

Change-Id: I8c2ba8b86059a78b65094aa013e249c80f901a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 23:10:12 +00:00
Daeho Jeong
a644d5c642 vold: add gc period in setGCUrgentPace am: 7c788fc3e9 am: 81ba5bcf1c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2032446

Change-Id: I2ec34972e89ecf6872dece12b0ab05bc9a07511c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 23:10:11 +00:00
Daeho Jeong
3d81e0ba06 Merge changes from topic "change_period" am: c0de6d8184
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2043104

Change-Id: I5f33ee1baa66c6278139ca9e17a7ef4c5836e674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 22:47:20 +00:00
Daeho Jeong
f605ac329b vold: do not set gc sleep time with zero dirty segments am: 0b5f397e2b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2033123

Change-Id: I30d462858c6b3acc8e7aebc9bed55deb4716db14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 22:47:19 +00:00
Daeho Jeong
81ba5bcf1c vold: add gc period in setGCUrgentPace am: 7c788fc3e9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2032446

Change-Id: I691c355f6eb91f83af0b4bbdade10bd67ceb62a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 22:47:17 +00:00
Daeho Jeong
c0de6d8184 Merge changes from topic "change_period"
* changes:
  vold: remove overprovision area from free segments
  vold: do not set gc sleep time with zero dirty segments
  vold: add gc period in setGCUrgentPace
2022-03-25 22:26:12 +00:00
Daeho Jeong
3ccdeb3fbb vold: remove overprovision area from free segments
overprovision space and reserved area should be subtracted when we
calculate free segments count in GC for data blocks.

Test: check Vold setGCUrgentPace log
Bug: 202283480
Bug: 181079477
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I7b749588ff794ff0429e17a787d83bcc19af0ec1
2022-03-25 10:06:13 -07:00
Treehugger Robot
c709bd40e9 Merge "Add vold to hwasan-postsubmit" am: 203ad70aa2 am: 3b35b2fcc5 am: eb22f77c92
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2032447

Change-Id: I1cc403c744d5b6dc6698af90d5fc9af48c799624
2022-03-24 11:13:44 +00:00
Treehugger Robot
eb22f77c92 Merge "Add vold to hwasan-postsubmit" am: 203ad70aa2 am: 3b35b2fcc5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2032447

Change-Id: I8eb7cf3fb00ba28afbe0d075d2104d8f06aeffc2
2022-03-24 10:58:40 +00:00
Treehugger Robot
3b35b2fcc5 Merge "Add vold to hwasan-postsubmit" am: 203ad70aa2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2032447

Change-Id: I046fd17ddeaeee61cdc107c57e00a70739bd0232
2022-03-24 10:21:04 +00:00
Treehugger Robot
203ad70aa2 Merge "Add vold to hwasan-postsubmit" 2022-03-24 09:56:09 +00:00
TreeHugger Robot
2abc603e3d Merge "FUSE-BPF: use both ro and persist properties" into tm-dev 2022-03-24 07:28:55 +00:00
Treehugger Robot
f4dd7c8877 Merge "Use make_f2fs -g android by default" am: fa9165f07b am: eb51baf132 am: 7f635c0bb1
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2037166

Change-Id: I92481ef22189435b0f5ef70992bbd718d752892e
2022-03-23 21:57:14 +00:00
Treehugger Robot
7f635c0bb1 Merge "Use make_f2fs -g android by default" am: fa9165f07b am: eb51baf132
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2037166

Change-Id: Ie4b8fa23a8804261ef7c182296fe96262cc16c4a
2022-03-23 21:16:34 +00:00
Treehugger Robot
eb51baf132 Merge "Use make_f2fs -g android by default" am: fa9165f07b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2037166

Change-Id: I0760bc2019fa5f5ce88b549092f984fd60c59ed7
2022-03-23 20:56:37 +00:00
Treehugger Robot
fa9165f07b Merge "Use make_f2fs -g android by default" 2022-03-23 20:33:51 +00:00
Alessio Balsini
583ae3e55d FUSE-BPF: use both ro and persist properties
persist.sys.fuse.bpf.enable and ro.fuse.bpf.enabled are both used to
decide if FUSE-BPF must be enabled or not.
- ro.fuse.bpf.enabled is a read-only property that is set in the device
  makefile and would allow dogfooding devices to turn the feature
  on/off.
- persist.sys.fuse.bpf.enable is a system property that overrides
  ro.fuse.bpf.enabled and can only be set manually during the
  development to simplify the testing of FUSE-BPF, mostly to compare if
  those tests that are failing with FUSE-BPF were failing also without
  the feature.

Bug: 202785178
Test: adb logcat | grep "FuseDaemon" | grep BPF
Ignore-AOSP-First: FUSE-BPF is not available in AOSP
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: I23f9d27172907f6c72c73bea22e4a7e0ac643888
2022-03-23 19:57:28 +00:00
Jaegeuk Kim
2b8957dce6 Use make_f2fs -g android by default
It enables encrypt, proejct_quota, verity by default.

Bug: 225401790
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I6c6dc81b8e62b20b0107d40a9ed5b645cdafbda1
2022-03-22 17:54:40 -07:00
Eric Biggers
16b7a74bcf Merge "Increase early boot logging to kernel log" am: d420cae64e am: 576df715e8 am: 4d18a98dfd
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2035283

Change-Id: I33a17e93189bd156cdbe98aecb67929f7c8f65ee
2022-03-22 18:05:41 +00:00
Eric Biggers
117e3648da Merge "Remove FDE methods from binder interface" am: 66d13bd28c am: 3d380e1f12 am: 3fd082a2a5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2030592

Change-Id: Id7449b7ee055e93b02fb95cda813f78410415464
2022-03-22 18:04:27 +00:00