Commit graph

5544 commits

Author SHA1 Message Date
Shikha Malhotra
8acf8298f9 Merge "Enable ProjectID for the file systems by default." 2022-03-22 16:32:40 +00:00
Eric Biggers
fb486660ca Increase early boot logging to kernel log
Make vold log warnings and errors to the kernel log until both
init_user0 has run and /data is mounted.  Previously it only logged
errors, and not warnings, to the kernel log until /data is mounted.

This is helpful to diagnose failures of init_user0, since adb still
isn't started by that point.

Also, error messages can be misleading without seeing related warning
messages, e.g. the following which is expected on many devices:

    E vold    : keystore2 Keystore generateKey returned service specific error: -67
    W vold    : Failed to generate rollback-resistant key.  This is
                expected if keystore doesn't support rollback
                resistance.  Falling back to non-rollback-resistant key.

Therefore, increase the log level to WARNING and above.

Test: Intentionally broke fscrypt_init_user0(), then verified that the
      error and warning messages appear in the kernel log on Cuttlefish.
Bug: 205314634
Bug: 222540970
Change-Id: Ia751f7c88cbf28caf81e891a518953cc0cee911e
2022-03-22 00:33:52 +00:00
Samiul Islam
656d836566 [automerger skipped] Merge "Create misc_ce and misc_de directories on /mnt/expand" am: fda93c9f31 am: a9c554bd05 am: 15a316dbd2 -s ours
am skip reason: Merged-In I0e73d9ce105abec4b77c378cde58aa7365258f01 with SHA-1 b459591fd1 is already in history

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

Change-Id: I48219587f15278e4a48dc778a4397aeb06542d15
2022-03-21 13:47:03 +00:00
Samiul Islam
15a316dbd2 Merge "Create misc_ce and misc_de directories on /mnt/expand" am: fda93c9f31 am: a9c554bd05
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2030127

Change-Id: I60368dea371d31cf5a7354807822ef566a7da793
2022-03-21 13:11:41 +00:00
Samiul Islam
a9c554bd05 Merge "Create misc_ce and misc_de directories on /mnt/expand" am: fda93c9f31
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2030127

Change-Id: I844d48df7e587693791a17a23cc14d87a358fa5e
2022-03-21 12:37:19 +00:00
Samiul Islam
fda93c9f31 Merge "Create misc_ce and misc_de directories on /mnt/expand" 2022-03-21 12:01:54 +00:00
Eric Biggers
b3ea454002 Remove FDE methods from binder interface
Now that none of these methods are used anymore, we can remove them.
Also remove the related constants.

Bug: 208476087
Change-Id: I1f56c8e05fb3fba09aab4bf5f8609b0f552b8999
2022-03-21 05:11:21 +00:00
Treehugger Robot
d908d2edd4 Merge changes from topic "metadata_encryption_options" am: 10ca7def20 am: 09c6fcafa0 am: 5a91b7151e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2030589

Change-Id: I094284b2d4b5667a845460b2fd05e07e0ec149fe
2022-03-19 04:42:12 +00:00
Treehugger Robot
06505f7abb Merge "Replace an outdated TODO in Keystore::exportKey" am: aadef5cd8a am: 7ff572e24e am: 6101244f82
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2031283

Change-Id: I20bcf6257702d4f9ccbdb735084bdbf91d1dc928
2022-03-19 04:41:58 +00:00
Daeho Jeong
0b5f397e2b vold: do not set gc sleep time with zero dirty segments
When there is not enough dirty segments to reclaim, we don't have to set
gc sleep time.

Test: Run smart idle maint with zero dirty segments
Bug: 202283480
Bug: 181079477
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: If6a9965ecb9b1a91bf5d0dd763d5fa0af63348e0
2022-03-18 21:30:47 -07:00
Treehugger Robot
5a91b7151e Merge changes from topic "metadata_encryption_options" am: 10ca7def20 am: 09c6fcafa0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2030589

Change-Id: I53066586620a318a332936310ddba142fd56386d
2022-03-19 04:30:20 +00:00
Treehugger Robot
6101244f82 Merge "Replace an outdated TODO in Keystore::exportKey" am: aadef5cd8a am: 7ff572e24e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2031283

Change-Id: I7e5da8ef426ea97e733afa7967ba341689ec1424
2022-03-19 04:30:09 +00:00
Treehugger Robot
09c6fcafa0 Merge changes from topic "metadata_encryption_options" am: 10ca7def20
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2030589

Change-Id: I1e42a04fb2b92d2b798d3b4991f4a026f6594c30
2022-03-19 04:15:24 +00:00
Treehugger Robot
10ca7def20 Merge changes from topic "metadata_encryption_options"
* changes:
  Rename FstabEntry::metadata_encryption to metadata_encryption_options
  Fix check for whether metadata encryption is enabled
2022-03-19 04:12:05 +00:00
Treehugger Robot
7ff572e24e Merge "Replace an outdated TODO in Keystore::exportKey" am: aadef5cd8a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2031283

Change-Id: I426731cf85fb49110ba7eac2ea472008495b756f
2022-03-19 04:08:41 +00:00
Treehugger Robot
aadef5cd8a Merge "Replace an outdated TODO in Keystore::exportKey" 2022-03-19 03:53:45 +00:00
Florian Mayer
11d45326d9 Add vold to hwasan-postsubmit
Test: Run tests under HWASan.
Bug: 193568145
Change-Id: I03e7506f932cb42a91261bd1c28f3d7f60dd5f1e
2022-03-18 14:25:02 -07:00
Daeho Jeong
7c788fc3e9 vold: add gc period in setGCUrgentPace
To make gc period changable, added a new gcPeriod parameter to
setGCUrgentPace.

Test: adb shell device_config put storage_native_boot smart_idle_maint_period 10
Bug: 202283480
Bug: 181079477
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I4e44a80ea5b51d9a7cde69d25e129dd0673b271f
2022-03-18 12:56:17 -07:00
Mohammad Samiul Islam
e833630eb7 Create misc_ce and misc_de directories on /mnt/expand
We want to store sdk data on the same volume as app data. Since sdk data
is stored in misc_ce and misc_de directory, we need to ensure they exist
on adopted storage mounted at /mnt/expand/<volume-uuid>.

This CL creates `/mnt/expand/<volume-uuid>/misc_{ce,de}` directories
when disk is mouted and then when user storage is prepared, the sdk root
directory is created.

By having these directories, we can now move the sdk data to other
volume when app data is moved.

Bug: b/222034645
Test: atest SdkSandboxStorageHostTest (see ag/17120883)
Ignore-AOSP-First: End to end test added which exists in internal branch
    only. Will cherry-pick this CL to aosp standalone once it is safely
    merged to internal branch.
Change-Id: I0e73d9ce105abec4b77c378cde58aa7365258f01
Merged-In: I0e73d9ce105abec4b77c378cde58aa7365258f01
(cherry picked from commit b459591fd1)
2022-03-18 11:11:22 +00:00
Eric Biggers
41d7843513 Rename FstabEntry::metadata_encryption to metadata_encryption_options
There have been two bugs where people use !metadata_encryption.empty()
to check whether metadata encryption is enabled.  It should actually be
!metadata_key_dir.empty(), since 'metadata_encryption' is the encryption
options, which can be empty if the defaults are sufficient.

Rename the field in FstabEntry appropriately.

To avoid breaking fstab files, don't rename the flag in the fstab file
itself.  So, now the fstab flags map to FstabEntry fields as follows:

    keydirectory => metadata_key_dir
    metadata_encryption => metadata_encryption_options

Change-Id: I3b5e28c273950bcf13bfd433aaaa49d1e92e177c
2022-03-17 23:21:16 +00:00
Eric Biggers
f14f8627bb Fix check for whether metadata encryption is enabled
metadata_key_dir controls whether metadata encryption is enabled, not
metadata_encryption which is just the encryption options and can be
empty if the default options are sufficient.

Bug: 198405417
Fixes: 156d9d2293 ("Pre-create userdata metadata encryption device.")
Change-Id: I98ee253c7e5e738ee087ec07ed60f4a376ca7cee
2022-03-17 23:17:33 +00:00
Eric Biggers
3aa35ee431 Replace an outdated TODO in Keystore::exportKey
The bug this TODO references has been closed, so replace the TODO with
an explanation of why the code is correct.

Bug: 185811713
Change-Id: I8f4230ab3e290f8ffa8ca25aaa188e8d7156cf8e
2022-03-17 22:39:19 +00:00
Daeho Jeong
3733dc7edf Merge "vold: switch f2fs gc_urgent_high to gc_urgent_mid" am: 119b9ae8a5 am: a1f5053ea0 am: 7e17081e8c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2027903

Change-Id: Ie61999ecf40e10e9c9c7efc2b88b03ece4118399
2022-03-16 22:22:58 +00:00
Daeho Jeong
7e17081e8c Merge "vold: switch f2fs gc_urgent_high to gc_urgent_mid" am: 119b9ae8a5 am: a1f5053ea0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2027903

Change-Id: I2e6b56b633570fa5ecb1b402e8d7f7b12b7e9f60
2022-03-16 22:05:12 +00:00
Daeho Jeong
a1f5053ea0 Merge "vold: switch f2fs gc_urgent_high to gc_urgent_mid" am: 119b9ae8a5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2027903

Change-Id: I8d1583db7acfe8fc8e97392f45ec9c85962f0c37
2022-03-16 21:47:44 +00:00
Daeho Jeong
119b9ae8a5 Merge "vold: switch f2fs gc_urgent_high to gc_urgent_mid" 2022-03-16 21:33:23 +00:00
Daeho Jeong
5e879421a3 vold: switch f2fs gc_urgent_high to gc_urgent_mid
We need to reduce F2FS GC intensity for smart idle maintenance service
not to interfere with other I/O activities.

Test: check smart idle maintenance log every hour
Bug: 202283480
Bug: 181079477
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: Ideb1641a1539a23828bc8b00d9739c8128a984c0
2022-03-15 21:42:55 -07:00
Eric Biggers
b69451c28d [automerger skipped] Merge "Remove HardwareAuthToken parameters from binder interface" am: e7dbc48584 am: d469281f35 am: fd3bca3778 -s ours
am skip reason: Merged-In I6160d30deb138a5366532de84cbf6f02cbc69b8c with SHA-1 5bb9faab49 is already in history

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

Change-Id: I8bf0c2b8fec07db587b29102cb5acacbcd9cb055
2022-03-15 23:05:46 +00:00
Eric Biggers
fd3bca3778 Merge "Remove HardwareAuthToken parameters from binder interface" am: e7dbc48584 am: d469281f35
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021638

Change-Id: I6b449dd42f25d57cfc126f3975e9aac54f922740
2022-03-15 22:41:02 +00:00
Eric Biggers
d469281f35 Merge "Remove HardwareAuthToken parameters from binder interface" am: e7dbc48584
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021638

Change-Id: Ibee6bf73524768d619132261c382c6b96665d913
2022-03-15 22:12:00 +00:00
Eric Biggers
e7dbc48584 Merge "Remove HardwareAuthToken parameters from binder interface" 2022-03-15 21:33:26 +00:00
Treehugger Robot
7e551d8d0c [automerger skipped] Merge "Disable fuse-bpf" am: 1faebba8c9 am: 1dfd477133 am: 3e282df417 -s ours
am skip reason: Merged-In I423d05d24809b097d02ca5845ab16283edc953b0 with SHA-1 1269ae8d68 is already in history

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

Change-Id: Icc0cbcae4a4e14f0f0a40a29379c56d1ce373f79
2022-03-15 17:09:40 +00:00
Treehugger Robot
3e282df417 Merge "Disable fuse-bpf" am: 1faebba8c9 am: 1dfd477133
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2022395

Change-Id: I6d660af532c57c65fae646a58ccff3775e627974
2022-03-15 16:43:55 +00:00
Treehugger Robot
1dfd477133 Merge "Disable fuse-bpf" am: 1faebba8c9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2022395

Change-Id: If6e828f9b2367ba3874faef168cbcd33cae48085
2022-03-15 16:16:06 +00:00
Treehugger Robot
1faebba8c9 Merge "Disable fuse-bpf" 2022-03-15 15:40:11 +00:00
Eric Biggers
90a305232e Remove HardwareAuthToken parameters from binder interface
These are no longer used.

Test: atest com.android.server.locksettings
Bug: 184723544
Change-Id: I6160d30deb138a5366532de84cbf6f02cbc69b8c
(cherry picked from commit 5bb9faab49)
Merged-In: I6160d30deb138a5366532de84cbf6f02cbc69b8c
2022-03-15 01:26:08 +00:00
Paul Lawrence
1269ae8d68 Disable fuse-bpf
ag/17002484 does not disable fuse-bpf as hoped when the device has once
booted with fuse-bpf enabled, since the persistent property persists

Change name of property as read to disable feature regardless of current
state

Bug: 221892618
Ignore-AOSP-First: This change has topic dependencies. aosp/2022395 will
  be merged right after this one.
Test: fuse-bpf is disabled even if persist.sys.fuse.bpf.enable is true
Change-Id: I423d05d24809b097d02ca5845ab16283edc953b0
2022-03-14 13:51:23 +00:00
Paul Lawrence
d88e4682e3 Disable fuse-bpf
ag/17002484 does not disable fuse-bpf as hoped when the device has once
booted with fuse-bpf enabled, since the persistent property persists

Change name of property as read to disable feature regardless of current
state

Bug: 221892618
Test: fuse-bpf is disabled even if persist.sys.fuse.bpf.enable is true
Change-Id: I423d05d24809b097d02ca5845ab16283edc953b0
Merged-In: I423d05d24809b097d02ca5845ab16283edc953b0
2022-03-14 11:12:49 +00:00
Treehugger Robot
67274bc7a3 Merge "vdc: remove FDE commands" am: c1b4ce01f8 am: 1d1c8a541c am: 22deab0815
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021636

Change-Id: I466ef72bb0fae4fa4f10966c4f08982bd2592bb4
2022-03-11 01:10:55 +00:00
Treehugger Robot
22deab0815 Merge "vdc: remove FDE commands" am: c1b4ce01f8 am: 1d1c8a541c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021636

Change-Id: I85e1a9a082b2ea711841dff903dcc97bb19edbed
2022-03-11 00:49:45 +00:00
Treehugger Robot
1d1c8a541c Merge "vdc: remove FDE commands" am: c1b4ce01f8
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021636

Change-Id: I828271995fb646b06beb8601940a074629ee32eb
2022-03-11 00:26:21 +00:00
Treehugger Robot
c1b4ce01f8 Merge "vdc: remove FDE commands" 2022-03-11 00:03:48 +00:00
Treehugger Robot
2e0e0f7878 Merge "Remove unused function UnmountTreeWithPrefix()" am: 536beac4bd am: 5fdc4c764d am: 6036321541
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021355

Change-Id: I152aa95589c7bd1283c9449049ebaf0629eee769
2022-03-10 22:45:21 +00:00
Treehugger Robot
fc0115e14e Merge "Stop using -Wno-missing-field-initializers" am: a10ce5db7d am: afcb70bcef am: 14e5d77786
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021316

Change-Id: I9fa44a0382373fcadc128d6031d9d0c5c52326bd
2022-03-10 22:45:12 +00:00
Treehugger Robot
5e34370230 Merge "Stop using -Wno-unused-variable" am: 8a73bf6710 am: e3a45f74b9 am: 8272eb8819
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021315

Change-Id: I4934bde520993558d4f98fc81861f89647cd14fd
2022-03-10 22:44:50 +00:00
Eric Biggers
b140eba44d vdc: remove FDE commands
Remove the "enablecrypto" and "mountdefaultencrypted" commands, since
they aren't used anymore.  These were specific to FDE, for which support
has been removed.

Bug: 208476087
Change-Id: I2045488034dca46a97e50c5124182375691d09f9
2022-03-10 22:44:22 +00:00
Treehugger Robot
6036321541 Merge "Remove unused function UnmountTreeWithPrefix()" am: 536beac4bd am: 5fdc4c764d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021355

Change-Id: I569d68cd78324ca626763350ee0848c2cd31d8b4
2022-03-10 22:24:35 +00:00
Treehugger Robot
14e5d77786 Merge "Stop using -Wno-missing-field-initializers" am: a10ce5db7d am: afcb70bcef
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021316

Change-Id: Ic50376fbb016b00fc37c9fcf9022c6864009e151
2022-03-10 22:24:18 +00:00
Treehugger Robot
8272eb8819 Merge "Stop using -Wno-unused-variable" am: 8a73bf6710 am: e3a45f74b9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021315

Change-Id: I27c8d91e93f38c87a077f8ccaeb4ce6826457c2b
2022-03-10 22:23:43 +00:00
Treehugger Robot
5fdc4c764d Merge "Remove unused function UnmountTreeWithPrefix()" am: 536beac4bd
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021355

Change-Id: I2715ed537f1a62cf77b8392668df4092dda3221d
2022-03-10 22:00:59 +00:00