git.osdn.net Git - android-x86/system-vold.git/log

OSDN Git Service

(root) / android-x86 / system-vold.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Xin Li [Tue, 1 Sep 2020 21:46:46 +0000 (21:46 +0000)]

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734 -s ours am: f13d17f2b8 -s ours

am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61 is in history

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

Change-Id: I81c76af55e45dde815acb9138570e6ca627597a3

commit | commitdiff | tree

Xin Li [Tue, 1 Sep 2020 20:37:11 +0000 (20:37 +0000)]

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 24ae202734 -s ours

am skip reason: Change-Id Id417587a550b0f4abf5a6a3e4b4535011b21f627 with SHA-1 dd8b695c61 is in history

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

Change-Id: Id0bdc9b0190233ed0384b52a5844597b337833e1

commit | commitdiff | tree

Jeongik Cha [Fri, 28 Aug 2020 01:49:42 +0000 (01:49 +0000)]

Add '-unstable' to solve ODR violation am: 44b2f954be

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

Change-Id: I9f3d00625a59390efdb926cde389729a71be7fa7

commit | commitdiff | tree

Xin Li [Thu, 27 Aug 2020 17:17:42 +0000 (10:17 -0700)]

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: Id417587a550b0f4abf5a6a3e4b4535011b21f627
Change-Id: Ibb5e8cf5f36dad408cf047dd0498aba24249b695

commit | commitdiff | tree

Jeongik Cha [Fri, 14 Aug 2020 14:51:36 +0000 (23:51 +0900)]

Add '-unstable' to solve ODR violation

The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem

Bug: 146436251
Test: m nothing
Change-Id: Id3c4bbc9149ba7c3e0a0d728026f02f60cb17424

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 11:28:19 +0000 (11:28 +0000)]

Merge "Add maco@ to vold OWNERS." am: 157a08bb92 am: 3d1b6ac7c0 am: abd6f5a165

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

Change-Id: I857784ab0f24771c96ad0ecf48ddec659c650f9c

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 11:13:35 +0000 (11:13 +0000)]

Merge "Add maco@ to vold OWNERS." am: 157a08bb92 am: 3d1b6ac7c0

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

Change-Id: I02184aa11a783fb3201812d2a8f64faca981cbc2

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 10:56:15 +0000 (10:56 +0000)]

Merge "Add maco@ to vold OWNERS." am: 157a08bb92

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

Change-Id: I0d0a8048465e190105f03dfe76fbf5c8393a4198

commit | commitdiff | tree

Treehugger Robot [Tue, 11 Aug 2020 10:34:17 +0000 (10:34 +0000)]

Merge "Add maco@ to vold OWNERS."

commit | commitdiff | tree

Martijn Coenen [Tue, 11 Aug 2020 07:13:27 +0000 (09:13 +0200)]

Add maco@ to vold OWNERS.

Bug: N/A
Test: N/A
Change-Id: Ib00991eccbd33e719a64d55da932f7f2bfab7b71

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 23:25:45 +0000 (23:25 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6 am: 124f3575be

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

Change-Id: I09a23c705c2fe0bc01c321f38c3eadb7bd1e44da

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 23:10:18 +0000 (23:10 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129 am: c6f47996d6

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

Change-Id: I14257e5e427795e8871de5df94696e49766566a6

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 22:53:51 +0000 (22:53 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level" am: ee1a70c129

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

Change-Id: Iacb41f3dba6c2a57943f766b749d87efe6f4e4b3

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 22:35:21 +0000 (22:35 +0000)]

Merge "vold: use __ANDROID_API_Q__ instead of pre_gki_level"

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:46:37 +0000 (18:46 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1 am: 5acfc3e8d5 am: d1a7e750e2

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

Change-Id: Ib38c9b7459b1dcd4c8b00334bcf4375d81d590fe

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 17:55:56 +0000 (10:55 -0700)]

vold: use __ANDROID_API_Q__ instead of pre_gki_level

The name "pre_gki_level" is causing some confusion because not all
devices launching with Android R are subject to the GKI requirement.
(See b/161563110#comment11.) E.g., devices that use a 4.14-based kernel
are exempt from GKI. However, the encryption requirements still apply.

Just use __ANDROID_API_Q__ directly instead.

No change in behavior.

Change-Id: Id02ae1140845ac1ae7cf78be4e57fe34da028abf

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:22:03 +0000 (18:22 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1 am: 5acfc3e8d5

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

Change-Id: I28615b8a9a656804b8ebacff0876e2acb1a64c1f

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 18:04:57 +0000 (18:04 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1

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

Change-Id: I29e6eab9571d4556883594049f4abc33d9ffa674

commit | commitdiff | tree

Eric Biggers [Mon, 10 Aug 2020 17:52:39 +0000 (17:52 +0000)]

Merge "EncryptInPlace: ensure that backup superblocks get encrypted"

commit | commitdiff | tree

Will Shiu [Wed, 29 Jul 2020 09:03:17 +0000 (17:03 +0800)]

EncryptInPlace: ensure that backup superblocks get encrypted

Block groups with EXT4_BG_BLOCK_UNINIT still have backup superblocks
(and backup block group descriptors). Fix EncryptInPlace to encrypt
these backup superblocks rather than leave them unencrypted.

Previously leaving the backup superblocks unencrypted didn't cause any
problems, but due to system/core commit 72abd7b246f7 ("Try to recover
corrupted ext4 /data with backup superblock") it is causing problems.

Bug: 162479411
Bug: 161871210
Change-Id: Ic090bf4e88193b289b04c5254ddf661ef40b037e

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 19:20:28 +0000 (19:20 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591 am: dd8b695c61

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

Change-Id: I876aaf6bba933c964a3573d8053cc60829b3a5fa

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 19:02:45 +0000 (19:02 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b am: bb92ff6591

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

Change-Id: Id417587a550b0f4abf5a6a3e4b4535011b21f627

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 18:38:05 +0000 (18:38 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__" am: 5de675c93b

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

Change-Id: Ibb6947f1fad7a31cf2a42c3604c76fcf45a7082a

commit | commitdiff | tree

Treehugger Robot [Fri, 17 Jul 2020 18:24:51 +0000 (18:24 +0000)]

Merge "vold: restore -D__ANDROID_DEBUGGABLE__"

commit | commitdiff | tree

Mark Salyzyn [Fri, 17 Jul 2020 15:17:50 +0000 (08:17 -0700)]

vold: restore -D__ANDROID_DEBUGGABLE__

Regression introduced by
commit 7ebcc2bcfde2cf6713e2975224034b06ba0943d8
("Revert "[Vold] Conditional dependency to ARC++ ObbVolume"")
errantly removed the product_variables support for
-D__ANDROID_DEBUGGABLE__ when built for userdebug builds.

Restore stanza.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 161454607
Test: adb-remount-test no longer reports a problem
Change-Id: Ia7e55d1174fa7fac2d934d4aac06d15e8be388af

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:03:01 +0000 (02:03 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900 am: d0b2751e8f

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

Change-Id: Id61233aba34e8c67a2ab3860c4259eaeaefdab15

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 02:02:39 +0000 (02:02 +0000)]

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03 am: 6b36554b38

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

Change-Id: I18cbddc92985f88d95dca71b05b9d07919134af9

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:50:24 +0000 (01:50 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5 am: 350b5ae900

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

Change-Id: Ia7fca6e61c58317002271c8338bb01a12e8223a5

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:50:07 +0000 (01:50 +0000)]

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9 am: 83a3eecc03

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

Change-Id: Iffa50e4c549469de6425134369e609856f1d7813

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:38:51 +0000 (01:38 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()" am: 256b23b1c5

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

Change-Id: I94b778955b2ee5cd8c462050e94c39ce05c96179

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:38:44 +0000 (01:38 +0000)]

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9

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

Change-Id: If47e4ced3b37e44772d802fb8ebe2d9ad51c03e2

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:20:43 +0000 (01:20 +0000)]

Merge "KeyUtil: use static local variable in isFsKeyringSupported()"

commit | commitdiff | tree

Eric Biggers [Fri, 17 Jul 2020 01:19:39 +0000 (01:19 +0000)]

Merge "vold: drop local fscrypt UAPI definitions"

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 23:31:00 +0000 (16:31 -0700)]

vold: drop local fscrypt UAPI definitions

Now that Bionic's copy of <linux/fscrypt.h> has been updated, there's no
need for vold to carry its own fscrypt_uapi.h.

Test: build
Change-Id: I61581ac74f7cf77bc8a835e64d96553a9d0c517a

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 21:29:59 +0000 (14:29 -0700)]

KeyUtil: use static local variable in isFsKeyringSupported()

Use C++'s built-in mechanism for one-time initialization rather than
implement it ourselves in a way that isn't thread-safe.

(It doesn't *actually* need to be thread-safe, since all callers of this
run under ACQUIRE_CRYPT_LOCK. But that's not easy to verify.)

Test: booted Cuttlefish and checked log for the one-time message
"Detected support for FS_IOC_ADD_ENCRYPTION_KEY"
Change-Id: I6ca5b143ca305fa95144e388efc9657e3507bf05

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 21:16:12 +0000 (21:16 +0000)]

Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0 am: 4cd238b900

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

Change-Id: I862a51b219b0151c24d009921fa6cd509afa18b0

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 21:00:33 +0000 (21:00 +0000)]

Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0

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

Change-Id: I23b9a01632b61a92896ae83e2152fa047dd85c48

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 20:45:57 +0000 (20:45 +0000)]

Merge "vold: remove checkEncryption" am: 2d9777bfbf

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

Change-Id: I4ffa4a351292c18dce51247d926ffe7efdbd5bea

commit | commitdiff | tree

Eric Biggers [Thu, 16 Jul 2020 20:30:35 +0000 (20:30 +0000)]

Merge "vold: remove checkEncryption"

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 12:16:19 +0000 (12:16 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3 am: 9afa4c65d8

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

Change-Id: Idf5736b15c3d1cd2d2dc994e7c5298605d45412a

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 12:03:40 +0000 (12:03 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3 am: 11757842a3

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

Change-Id: Iec0c1190443f1366a0f105bb3eba3967635ff544

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 11:51:01 +0000 (11:51 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume"" am: 6e6fc6b8d3

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

Change-Id: I6fb0ca30c54791549923099c1acf74667e06ae5b

commit | commitdiff | tree

Treehugger Robot [Thu, 16 Jul 2020 11:04:04 +0000 (11:04 +0000)]

Merge "Revert "[Vold] Conditional dependency to ARC++ ObbVolume""

commit | commitdiff | tree

Eric Biggers [Wed, 15 Jul 2020 18:06:02 +0000 (11:06 -0700)]

vold: remove checkEncryption

The testing-only "checkEncryption" command has been replaced with
VtsKernelEncryptionTest [1]. In particular, the metadata encryption
documentation [2] no longer mentions checkEncryption but rather
recommends running VtsKernelEncryptionTest. Also, checkEncryption
hasn't really been maintained, and it has some known bugs; it's unclear
that many people ever really used it.

So, just remove it.

[1] https://android.googlesource.com/platform/test/vts-testcase/kernel/+/refs/heads/master/encryption/
[2] https://source.android.com/security/encryption/metadata#tests

Bug: 155037012
Change-Id: I258829c60768fd11aafdf2faad956cecc1ae9826

commit | commitdiff | tree

Satoshi Niwa [Mon, 1 Jun 2020 12:03:36 +0000 (21:03 +0900)]

Revert "[Vold] Conditional dependency to ARC++ ObbVolume"

This reverts commit aedae617fec702add64201534a2f514fa31c5965.

Reason for revert: ArcObbVolume is not needed by ARCVM R and above.

Bug: 157885448
Test: trybot
Change-Id: I16395ac8b6902cedea263f51e306b297d719043f

commit | commitdiff | tree

Automerger Merge Worker [Wed, 8 Jul 2020 00:37:31 +0000 (00:37 +0000)]

Merge "[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a -s ours am: 09b9cae24d -s ours" into rvc-d1-dev-plus-aosp

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:37:22 +0000 (00:37 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a -s ours am: 09b9cae24d -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 eb566d0a7c is in history

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

Change-Id: I7d8f6f3fd29595721ee7dfbd7a2fcabf69bc041f

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:37:21 +0000 (00:37 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a am: 65aa48c810 -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 eb566d0a7c is in history

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

Change-Id: Ifce40a4998e3fd5a116df5ed8b3ac3433eb6b83e

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:23:19 +0000 (00:23 +0000)]

vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a

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

Change-Id: Ib8656b4dbd8b39a594147aace686a3fcbd3bd0d4

commit | commitdiff | tree

Eric Biggers [Wed, 8 Jul 2020 00:22:58 +0000 (00:22 +0000)]

[automerger skipped] vold: only allow emmc_optimized on eMMC storage am: 006eed8e3a -s ours

am skip reason: Change-Id Ie27b80658db53b1a4207b3cbb4e309d05130812e with SHA-1 eb566d0a7c is in history

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

Change-Id: Id8c90f1833a171c12936a5f4aa2bf80574f5cb64

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 17:59:57 +0000 (17:59 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage" am: 428ae6e90a am: 7a1c4ccb96 am: 09f789e227

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

Change-Id: I277065540c289ff3a7633ebd7b0326da2da4e5a4

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 17:37:34 +0000 (17:37 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage" am: 428ae6e90a am: 7a1c4ccb96

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

Change-Id: Ie124c2cec8e4235ae999463d5c03615880e0c01e

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 17:24:35 +0000 (17:24 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage" am: 428ae6e90a

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

Change-Id: I95f471e6a2a96929b1ff854cac195b68e86309f3

commit | commitdiff | tree

Eric Biggers [Mon, 6 Jul 2020 20:46:38 +0000 (13:46 -0700)]

vold: only allow emmc_optimized on eMMC storage

The emmc_optimized encryption flag is specifically designed for the
limitations of inline encryption hardware that follows the eMMC
standard.  It isn't appropriate to use on other types of storage.
So, make vold enforce that it's not used on other types of storage.

Bug: 160639344
Test:
  - Enabled emmc_optimized on Cuttlefish and verified it no longer boots
  - Using a modified version of this change, verified that
    IsEmmcStorage() works as expected on various devices including
    Cuttlefish, Cuttlefish booted in GSI image mode, a device with eMMC
    storage, and a device with UFS storage.
  - Verified that VtsKernelEncryptionTest still passes
Change-Id: Ie27b80658db53b1a4207b3cbb4e309d05130812e
Merged-In: Ie27b80658db53b1a4207b3cbb4e309d05130812e

commit | commitdiff | tree

Eric Biggers [Tue, 7 Jul 2020 17:07:58 +0000 (17:07 +0000)]

Merge "vold: only allow emmc_optimized on eMMC storage"

commit | commitdiff | tree

Eric Biggers [Mon, 6 Jul 2020 20:46:38 +0000 (13:46 -0700)]

vold: only allow emmc_optimized on eMMC storage

The emmc_optimized encryption flag is specifically designed for the
limitations of inline encryption hardware that follows the eMMC
standard.  It isn't appropriate to use on other types of storage.
So, make vold enforce that it's not used on other types of storage.

Bug: 160639344
Test:
  - Enabled emmc_optimized on Cuttlefish and verified it no longer boots
  - Using a modified version of this change, verified that
    IsEmmcStorage() works as expected on various devices including
    Cuttlefish, Cuttlefish booted in GSI image mode, a device with eMMC
    storage, and a device with UFS storage.
  - Verified that VtsKernelEncryptionTest still passes
Change-Id: Ie27b80658db53b1a4207b3cbb4e309d05130812e

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 10:16:24 +0000 (10:16 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: bb8a543e43

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

Change-Id: I3ea6c81e33206ef2010af0d91456b0f78437c0ba

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 10:16:07 +0000 (10:16 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1 am: 5ed648d098

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

Change-Id: I98b748487dc4d517da2008dc0299f14b505273fa

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 09:57:21 +0000 (09:57 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1

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

Change-Id: I5cd116bfb01b0fe98dfdcd7d4b8005819ccfeb11

commit | commitdiff | tree

Martijn Coenen [Tue, 30 Jun 2020 09:57:17 +0000 (09:57 +0000)]

Configure backing device max_ratio for FUSE filesystems. am: a485006ab1

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

Change-Id: I13d40a73f02bec902fe94ca64d825dffb7c8790a

commit | commitdiff | tree

Martijn Coenen [Mon, 29 Jun 2020 09:53:34 +0000 (11:53 +0200)]

Configure backing device max_ratio for FUSE filesystems.

By default FUSE filesystems have a max_ratio of 1%, meaning only 1% of
dirty pages on the system can belong to a FUSE filesystem before we
start writing back pages (and throttling, if writeback can't keep up).
This limit is useful for untrusted filesystems, but in our case, we
trust the FUSE filesystem. Since FUSE writes result in writes to the
lower filesystem, FUSE should take at most 50%. Let's start with
changing max_ratio to 40%, to avoid needless throttling.

Bug: 159254170
Bug: 159770752
Test: inspect /sys/class/bdi manually after boot
Change-Id: I467e3770fc4afba0a08fa480c0b86aa054c8b875

commit | commitdiff | tree

Zim [Mon, 22 Jun 2020 17:08:58 +0000 (17:08 +0000)]

Unmount public volume if FUSE mount fails am: f71707916f am: 0f9690e391

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

Change-Id: Ib1ac130a2a4cb24c4154a43c6f989b32defb474f

commit | commitdiff | tree

Zim [Mon, 22 Jun 2020 17:07:12 +0000 (17:07 +0000)]

Unmount public volume if FUSE mount fails am: f71707916f am: c1f45db6e1

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

Change-Id: Ia2a497e993ed5302f527840ed0b74fec58e994a1

commit | commitdiff | tree

Zim [Mon, 22 Jun 2020 16:54:44 +0000 (16:54 +0000)]

Unmount public volume if FUSE mount fails am: f71707916f

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

Change-Id: Ia3c372428ad1098785f422befac0ba833d56d6a7

commit | commitdiff | tree

Zim [Mon, 22 Jun 2020 16:53:26 +0000 (16:53 +0000)]

Unmount public volume if FUSE mount fails am: f71707916f

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

Change-Id: Ie390d39ede3dbd63012b0c5acdbcac57e0143145

commit | commitdiff | tree

Zim [Wed, 17 Jun 2020 13:56:10 +0000 (14:56 +0100)]

Unmount public volume if FUSE mount fails

Sometimes, during early boot, a public volume may be created before
the user is unlocked and the mount may fail. This mount failure does
not revert the lower fs mounts (sdcardfs and vfat). Subsequent
mount attempts will then fail because we'd attempt to mount vfat on
already mounted /mnt/media_rw/<volname>

Bug: 158489548
Test: Resilient to an artificial sleep in
StorageManagerService#completeUnlockUser to
delay user unlock longer than public volume mount

Change-Id: I9a1574596434a2eb6b2553c0c9220c2118c7e4fd

commit | commitdiff | tree

David Anderson [Fri, 19 Jun 2020 20:33:50 +0000 (20:33 +0000)]

[automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 -s ours am: f1353b9ec4 -s ours

am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 7e07c53aab is in history

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

Change-Id: Ibef61ff852185c8a35fdf071f40b01b60dc371fe

commit | commitdiff | tree

David Anderson [Fri, 19 Jun 2020 20:33:37 +0000 (20:33 +0000)]

[automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 am: 9f054be265 -s ours

am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 23850d30f6 is in history

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

Change-Id: I8107dbfcea17dde5dccedb8b2abb2f8c5223c31d

commit | commitdiff | tree

David Anderson [Fri, 19 Jun 2020 20:21:48 +0000 (20:21 +0000)]

[automerger skipped] Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025 -s ours

am skip reason: Change-Id I33a691da3b99343acfc1e8ddf68a14504c3bfbe1 with SHA-1 23850d30f6 is in history

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

Change-Id: I324e156e155f361491f963518f69a956ac23dd7f

commit | commitdiff | tree

David Anderson [Fri, 19 Jun 2020 20:21:40 +0000 (20:21 +0000)]

Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev am: f87198e025

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

Change-Id: I9169d3e70a48b2efb3884869c412519fb1393d02

commit | commitdiff | tree

David Anderson [Fri, 19 Jun 2020 20:04:54 +0000 (20:04 +0000)]

Merge "Add an isCheckpointing() binder call for adb remount." into rvc-dev

commit | commitdiff | tree

David Anderson [Thu, 11 Jun 2020 06:51:17 +0000 (23:51 -0700)]

Add an isCheckpointing() binder call for adb remount.

This is needed so "adb remount" can avoid writing to /data during a
checkpoint.

Bug: 157540389
Test: manual test
Change-Id: I33a691da3b99343acfc1e8ddf68a14504c3bfbe1
Merged-In: I33a691da3b99343acfc1e8ddf68a14504c3bfbe1

commit | commitdiff | tree

TreeHugger Robot [Thu, 18 Jun 2020 22:52:49 +0000 (22:52 +0000)]

[automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df am: 3c9703d0a0 -s ours

am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 67f9044ab5 is in history

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

Change-Id: Id88e6555c441c9c88a54d5b835ea7f531cf51716

commit | commitdiff | tree

TreeHugger Robot [Thu, 18 Jun 2020 22:36:32 +0000 (22:36 +0000)]

[automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df -s ours am: c6e83ca68d -s ours

am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 3fe931109c is in history

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

Change-Id: I8fbea2c9dce8055fea94dc9dabe0cce2bdd6b5c4

commit | commitdiff | tree

Paul Lawrence [Thu, 18 Jun 2020 22:36:21 +0000 (22:36 +0000)]

Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928 am: 53f1d07339 am: ebc8801fb3

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

Change-Id: Iab701b88377b966aef876d9349dae42341ea0c83

commit | commitdiff | tree

TreeHugger Robot [Thu, 18 Jun 2020 22:36:16 +0000 (22:36 +0000)]

[automerger skipped] Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df -s ours

am skip reason: Change-Id Ic15fadc67d306463dd0b554f679306d8f9081451 with SHA-1 3fe931109c is in history

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

Change-Id: I4559e77b9ea60cf49f4824dc93a6a6141b9fb94b

commit | commitdiff | tree

David Anderson [Thu, 18 Jun 2020 22:36:07 +0000 (22:36 +0000)]

Merge "Add an isCheckpointing() binder call for adb remount." am: b50480bb96 am: 60e41b7084 am: 026ae1a9ac

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

Change-Id: I4739db7174b247defd39291aad8915dfefc1d1cc

commit | commitdiff | tree

TreeHugger Robot [Thu, 18 Jun 2020 22:35:32 +0000 (22:35 +0000)]

Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev am: 14d4e7c7df

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

Change-Id: I9e69b6817d8a3b34e053b86c9c33c3f7f466ec71

commit | commitdiff | tree

TreeHugger Robot [Thu, 18 Jun 2020 22:22:58 +0000 (22:22 +0000)]

Merge "Don't call block checkpoint functions above dm-default-key" into rvc-dev

commit | commitdiff | tree

Paul Lawrence [Thu, 18 Jun 2020 22:16:14 +0000 (22:16 +0000)]

Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928 am: 53f1d07339

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

Change-Id: I54fdd3098c52dcb53cee0956f4dd1e43e09f5800

commit | commitdiff | tree

David Anderson [Thu, 18 Jun 2020 22:15:56 +0000 (22:15 +0000)]

Merge "Add an isCheckpointing() binder call for adb remount." am: b50480bb96 am: 60e41b7084

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

Change-Id: I0aa0536cfd33f189525115efa07e49930f53b79a

commit | commitdiff | tree

Paul Lawrence [Thu, 18 Jun 2020 22:00:47 +0000 (22:00 +0000)]

Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928

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

Change-Id: Ifa48af749baa5d50c7459dbb5bda1573d847b622

commit | commitdiff | tree

David Anderson [Thu, 18 Jun 2020 22:00:37 +0000 (22:00 +0000)]

Merge "Add an isCheckpointing() binder call for adb remount." am: b50480bb96

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

Change-Id: I14674da2b3cf86c09179b94e28e76fec30378e12

commit | commitdiff | tree

Paul Lawrence [Fri, 12 Jun 2020 15:12:48 +0000 (08:12 -0700)]

Don't call block checkpoint functions above dm-default-key

Bug: 156225476
Test: Build for f2fs and ext4 device, make sure checkpoints roll back
and commit

Merged-In: Ic15fadc67d306463dd0b554f679306d8f9081451
Change-Id: Ic15fadc67d306463dd0b554f679306d8f9081451

commit | commitdiff | tree

Paul Lawrence [Thu, 18 Jun 2020 21:56:10 +0000 (21:56 +0000)]

Merge "Don't call block checkpoint functions above dm-default-key"

commit | commitdiff | tree

David Anderson [Thu, 18 Jun 2020 21:45:21 +0000 (21:45 +0000)]

Merge "Add an isCheckpointing() binder call for adb remount."

commit | commitdiff | tree

Automerger Merge Worker [Wed, 17 Jun 2020 17:11:59 +0000 (17:11 +0000)]

Merge "Merge "Configure read ahead for fuse mounts" into rvc-dev am: bcd7d5e7ce am: 7e29904e8c" into rvc-d1-dev-plus-aosp

commit | commitdiff | tree

Nikita Ioffe [Wed, 17 Jun 2020 17:11:55 +0000 (17:11 +0000)]

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

commit | commitdiff | tree

Nikita Ioffe [Wed, 17 Jun 2020 17:11:54 +0000 (17:11 +0000)]

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

commit | commitdiff | tree

Nikita Ioffe [Wed, 17 Jun 2020 16:53:30 +0000 (16:53 +0000)]

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

commit | commitdiff | tree

Nikita Ioffe [Wed, 17 Jun 2020 16:53:01 +0000 (16:53 +0000)]

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

commit | commitdiff | tree

Nikita Ioffe [Wed, 17 Jun 2020 16:37:37 +0000 (16:37 +0000)]

Merge "Configure read ahead for fuse mounts" into rvc-dev

commit | commitdiff | tree

Nikita Ioffe [Fri, 12 Jun 2020 11:59:45 +0000 (12:59 +0100)]

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

commit | commitdiff | tree

Automerger Merge Worker [Wed, 17 Jun 2020 07:17:12 +0000 (07:17 +0000)]

Merge "Add app's own UID to the default ACL. am: 1129b81071 am: 53b6f32850" into rvc-d1-dev-plus-aosp

commit | commitdiff | tree

Martijn Coenen [Wed, 17 Jun 2020 07:17:08 +0000 (07:17 +0000)]

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

commit | commitdiff | tree

Martijn Coenen [Wed, 17 Jun 2020 07:16:57 +0000 (07:16 +0000)]

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

commit | commitdiff | tree

Martijn Coenen [Wed, 17 Jun 2020 07:01:58 +0000 (07:01 +0000)]

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

commit | commitdiff | tree

Martijn Coenen [Wed, 17 Jun 2020 07:01:53 +0000 (07:01 +0000)]

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

commit | commitdiff | tree

Martijn Coenen [Tue, 16 Jun 2020 12:58:52 +0000 (14:58 +0200)]

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

commit | commitdiff | tree

Paul Lawrence [Fri, 12 Jun 2020 15:12:48 +0000 (08:12 -0700)]

Don't call block checkpoint functions above dm-default-key

Bug: 156225476
Test: Build for f2fs and ext4 device, make sure checkpoints roll back
and commit

Change-Id: Ic15fadc67d306463dd0b554f679306d8f9081451

system/vold

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.