Commit graph

5814 commits

Author SHA1 Message Date
Ken Chen
0093f6ae04 Rename fuse_media.o to fuseMedia.o
Underscore character may cause bpf prog/map naming collision. For
example, x.o with map y_z and x_y.o with map z both result in x_y_z
prog/map name, which should be prevented during compile-time.

aosp/2147825 will prohibit underscore character in bpf source name
(source name derives the obj name). Existing bpf modules with underscore
characters in source name need to be updated accordingly.

Bug: 236706995
Test: build
Change-Id: Ie6ea47560b1d44de0a0d9d124e17616fee6b0922
2022-07-12 05:38:39 +00:00
Daeho Jeong
d71c649e27 Merge "Make minimum gc sleep time tunnable" am: a5d927ba6a am: fc5cdcf04a am: 861b6f454d am: 2c4fabe16e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132536

Change-Id: Ice77ce4c208916b58898625ce750778421f42550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 20:00:39 +00:00
Daeho Jeong
2c4fabe16e Merge "Make minimum gc sleep time tunnable" am: a5d927ba6a am: fc5cdcf04a am: 861b6f454d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132536

Change-Id: I0441fe849a864bc45c2c07a10480f6ed0841dca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 19:36:34 +00:00
Daeho Jeong
861b6f454d Merge "Make minimum gc sleep time tunnable" am: a5d927ba6a am: fc5cdcf04a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132536

Change-Id: I8f5c730caaf8b7f8350a522c001a0a21e99ba8ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 19:18:48 +00:00
Daeho Jeong
fc5cdcf04a Merge "Make minimum gc sleep time tunnable" am: a5d927ba6a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132536

Change-Id: I3fc545927eeed476f75e5a72b373d5f6e4a92829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 19:01:06 +00:00
Daeho Jeong
a5d927ba6a Merge "Make minimum gc sleep time tunnable" 2022-07-07 18:39:46 +00:00
Daeho Jeong
37cf9d79ab Introduce target dirty segment ratio tunable parameter
We introduce a new parameter of target dirty segment ratio,
which can be used to set a target dirty / (dirty + free) segments
ratio. For example, if we set this as 80%, GC sleep time will be
calculated to achieve this ratio in a GC period.

Test: check smart idle maint log of StorageManagerService
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I73f2bcf4bdb810164c174bd0d2518b15d577d5d5
2022-07-04 21:23:46 +00:00
Xin Li
c7cafff525 [automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: f0521e8b09 -s ours am: 7a8cec1250 -s ours am: 66fd19132e -s ours
am skip reason: Merged-In Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be with SHA-1 d96b2ac076 is already in history

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

Change-Id: I4d70f362bf9063dafdf7e92431bacf5b25c332ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:07:32 +00:00
Xin Li
2e307b04f5 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b730112c98 -s ours am: 9ec575c7aa -s ours am: dc2318e64e -s ours
am skip reason: Merged-In Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be with SHA-1 d96b2ac076 is already in history

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

Change-Id: I0a95e02432a9ceb10b5b60e121e3ecad3c6638df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:02:25 +00:00
Xin Li
66fd19132e [automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: f0521e8b09 -s ours am: 7a8cec1250 -s ours
am skip reason: Merged-In Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be with SHA-1 d96b2ac076 is already in history

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

Change-Id: I045afc2977508a74238685f5714cd4ee75965a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 23:01:49 +00:00
Xin Li
dc2318e64e [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b730112c98 -s ours am: 9ec575c7aa -s ours
am skip reason: Merged-In Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be with SHA-1 d96b2ac076 is already in history

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

Change-Id: Id4a47070667562cf5edd809bad7d4e4bdddaa201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:56:42 +00:00
Xin Li
7a8cec1250 [automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: f0521e8b09 -s ours
am skip reason: Merged-In Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be with SHA-1 d96b2ac076 is already in history

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

Change-Id: I1f76d98e3ebc21118b472e6cb049080a8b774221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:18:17 +00:00
Xin Li
9ec575c7aa [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b730112c98 -s ours
am skip reason: Merged-In Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be with SHA-1 d96b2ac076 is already in history

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

Change-Id: Idb5861b570ce701ea4595397d14c5fab0ba0d28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:13:11 +00:00
Xin Li
f0521e8b09 Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master 2022-06-29 21:22:02 +00:00
Treehugger Robot
03c98c20b5 Merge "Convert vold to new BootControl client" am: 6083e0196b am: de2d1b6cc7 am: 25ff2c3c9c am: 2a30e7cd1d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132797

Change-Id: I6eddb1993df9a051888929d0ce6ae6d6854a461a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 19:55:14 +00:00
Treehugger Robot
2a30e7cd1d Merge "Convert vold to new BootControl client" am: 6083e0196b am: de2d1b6cc7 am: 25ff2c3c9c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132797

Change-Id: I26359384aac7413b651ce48878b97e3da97b896d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 19:31:34 +00:00
Treehugger Robot
25ff2c3c9c Merge "Convert vold to new BootControl client" am: 6083e0196b am: de2d1b6cc7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132797

Change-Id: I246836f0bff37c1dbcf6925409fc5b2def4f2689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 18:57:27 +00:00
Treehugger Robot
de2d1b6cc7 Merge "Convert vold to new BootControl client" am: 6083e0196b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132797

Change-Id: I97d3bcacc85ba0295ccadd216a3db8cabf0cc3a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 18:38:33 +00:00
Treehugger Robot
6083e0196b Merge "Convert vold to new BootControl client" 2022-06-29 18:03:39 +00:00
Xin Li
b730112c98 Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be
Change-Id: I521a37a205961186baeeebc82668055fe19c2091
2022-06-27 23:40:18 +00:00
Daeho Jeong
3fd33ece35 Make minimum gc sleep time tunnable
Test: check smart idle maint log of StorageManagerService
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I5a70e4ec2ca895551b6446a9dfd4bb5003a3fbd0
2022-06-23 16:20:45 -07:00
Kelvin Zhang
dec03ab380 Convert vold to new BootControl client
Test: th
Bug: 227536004
Change-Id: Ia2f8b51d6d3175999b2434454f0ee4e14bde934e
2022-06-22 15:14:55 -07:00
Eric Biggers
fb8e45d1bf Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: d99898496f am: e51736136a am: 9d2e149521 am: ba25d3a31b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2128492

Change-Id: I01ce0fc7845aaf293535b2a12b71cd383b23c74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:52:04 +00:00
Eric Biggers
ba25d3a31b Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: d99898496f am: e51736136a am: 9d2e149521
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2128492

Change-Id: I29768034feababeb54ec8aa9357f31a6701b74a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:34:31 +00:00
Eric Biggers
9d2e149521 Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: d99898496f am: e51736136a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2128492

Change-Id: Ic0ef4032bd5596c53f3c7c148928208f62b29300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:07:49 +00:00
Eric Biggers
e51736136a Merge "Rename fscrypt_is_native() to IsFbeEnabled()" am: d99898496f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2128492

Change-Id: I9d329a1da16d949f0f73d69dd943547a3f849fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:47:33 +00:00
Eric Biggers
d99898496f Merge "Rename fscrypt_is_native() to IsFbeEnabled()" 2022-06-22 18:24:38 +00:00
Automerger Merge Worker
b6622cefc8 Merge "Use sysfs control for storage device GC am: d96b2ac076 am: 7f6de29a04" into tm-d1-dev-plus-aosp am: 0b378ca4dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074

Change-Id: Ifc8ca694e581a68f2703211ccf8ce17286b3b70b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:16:28 +00:00
Daeho Jeong
182a3efc8a Use sysfs control for storage device GC am: d96b2ac076 am: 1403a82079 am: e5d7108512
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074

Change-Id: I9486f0118033b687f0649c0176edd4731d82faf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:16:19 +00:00
Daeho Jeong
88565ae67e Use sysfs control for storage device GC am: d96b2ac076 am: 1403a82079 am: ff23bb4b4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074

Change-Id: I621dd57b6d57db9f62832dff8aa8576d12cc7b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 22:15:51 +00:00
Automerger Merge Worker
0b378ca4dc Merge "Use sysfs control for storage device GC am: d96b2ac076 am: 7f6de29a04" into tm-d1-dev-plus-aosp 2022-06-21 21:51:47 +00:00
Daeho Jeong
77c2494428 Use sysfs control for storage device GC am: d96b2ac076 am: 7f6de29a04
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074

Change-Id: I33616bdb3e41357f8337a8c95135fe1a373164d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:51:44 +00:00
Daeho Jeong
ff23bb4b4f Use sysfs control for storage device GC am: d96b2ac076 am: 1403a82079
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074

Change-Id: I2f7c0e3e2001d467b12ed2b11a0209a1ff3cc788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:51:43 +00:00
Daeho Jeong
e5d7108512 Use sysfs control for storage device GC am: d96b2ac076 am: 1403a82079
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074

Change-Id: I7a6483d63e3f4239582dbe1925b67d93814810dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:51:43 +00:00
Daeho Jeong
1403a82079 Use sysfs control for storage device GC am: d96b2ac076
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074

Change-Id: I0e6b3725ebeb937a7046c492e4b699cfb2d24b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:34:16 +00:00
Daeho Jeong
7f6de29a04 Use sysfs control for storage device GC am: d96b2ac076
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/18972074

Change-Id: I97bcf7e649090234866db71dd7454e2cd8af0b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:32:45 +00:00
Daeho Jeong
d96b2ac076 Use sysfs control for storage device GC
Sometimes, waiting for the HAL makes infinite calls to HAL and ending
up with power consuming issues. While tracking the root cause, we will
temporally turn off HAL for storage device GC.

Bug: 235470321
Test: run "sm idle-maint run"
Ignore-AOSP-First: This is a temporal fix for Android TM devices.
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: Ieb371b7fdebfe938206a45547bb24dfbf2c2e7be
2022-06-17 23:31:35 +00:00
Eric Biggers
a6957c0f7a Rename fscrypt_is_native() to IsFbeEnabled()
Now that emulated FBE is no longer supported, there is no longer any
distinction between native FBE and emulated FBE.  There is just FBE.

Referring to FBE as "fscrypt" is also poor practice, as fscrypt (the
Linux kernel support for filesystem-level encryption) is just one part
of FBE, the Android feature.

Therefore, rename fscrypt_is_native() to IsFbeEnabled().

Bug: 232458753
Change-Id: Idf4cb25d37bc3e81836fcc5a1d96f79ccfa443b7
2022-06-15 18:52:18 +00:00
Eric Biggers
1127e14727 Merge "Remove obsolete support for emulated FBE" am: 7b04dba53e am: 2e4373b415 am: a7c591bb75 am: f81cd24706
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101774

Change-Id: Id7ad77d18e97929005b2bb85f47a0d6c3020334f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 20:03:37 +00:00
Eric Biggers
f81cd24706 Merge "Remove obsolete support for emulated FBE" am: 7b04dba53e am: 2e4373b415 am: a7c591bb75
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101774

Change-Id: Ib5f6e6580a7f31db83b447e940ca8044d3c889fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 19:56:02 +00:00
Eric Biggers
a7c591bb75 Merge "Remove obsolete support for emulated FBE" am: 7b04dba53e am: 2e4373b415
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101774

Change-Id: I9595487eb191397c30a795989b2f3ede636b4b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 19:52:48 +00:00
Eric Biggers
2e4373b415 Merge "Remove obsolete support for emulated FBE" am: 7b04dba53e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2101774

Change-Id: Ia4a90c62bf8e974aa51c19791668b6706d84d087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 18:59:35 +00:00
Eric Biggers
7b04dba53e Merge "Remove obsolete support for emulated FBE" 2022-06-09 18:42:00 +00:00
Jaegeuk Kim
1ae4f36006 Merge "Support zoned device with dm-default-key" am: bb97be3d82 am: 43c03c3fe7 am: 08c3cbdf93 am: 94f349081b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2116417

Change-Id: Iee6681c8ad419d9ca6e45713eb170cf194499d6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 16:18:15 +00:00
Jaegeuk Kim
94f349081b Merge "Support zoned device with dm-default-key" am: bb97be3d82 am: 43c03c3fe7 am: 08c3cbdf93
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2116417

Change-Id: I046f27a9435b5c48bacb6438c02b3c59913d3301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 16:01:56 +00:00
Jaegeuk Kim
08c3cbdf93 Merge "Support zoned device with dm-default-key" am: bb97be3d82 am: 43c03c3fe7
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2116417

Change-Id: Ib67668826bf1f6c89cde82bde67bb1e103395e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 15:27:49 +00:00
Jaegeuk Kim
43c03c3fe7 Merge "Support zoned device with dm-default-key" am: bb97be3d82
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2116417

Change-Id: I6d01a22e9e2b4770be90797e4f94199058de2144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 15:09:58 +00:00
Jaegeuk Kim
bb97be3d82 Merge "Support zoned device with dm-default-key" 2022-06-09 14:53:25 +00:00
Jaegeuk Kim
f6151b434c Support zoned device with dm-default-key
Note that, encrypt_inplace cannot support zoned device, since it
doesn't support in-place updates. And, dm-default-key will have
a different key.

Bug: 172378121
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I34cb1e747e0f3faa07c5a4bfeded11fb789a033c
2022-06-07 18:43:54 -07:00
Daeho Jeong
53eac5bdf6 [automerger skipped] Merge "vold: fix the range of stopped state of idleMaint" into tm-dev am: baee102002 am: cf75222aef am: d5e2ea0859 -s ours
am skip reason: Merged-In I785c8aeebd8fcf58c34d9be9968d99634d0b420a with SHA-1 7667d64ab8 is already in history

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

Change-Id: I7d3fcad83f6dab0aca48719495e5e803fc3faa19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 23:02:35 +00:00