779a550826
Revert "Revert "lmkd: set priority of the kill target from the reaper thread""
...
This reverts commit c5e4185a02
2022-10-24 20:25:30 +00:00
0cb4aae3e6
lmkd/tests: handle the case when process exits before reaping starts
...
Current test will fail in the case when the target process exits before
process_mrelease is called. However this is possible and should not be
treated as an invalid case. Add special handling of this case in the
test.
Bug: 254880957
Test: run lmkd_tests until this case happens
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ica5b28fa52a5f42a771fb9516112e58b66291068
2022-10-24 20:24:41 +00:00
aff31f011f
Revert "lmkd: set priority of the kill target from the reaper thread" am: c5e4185a02 am: b4e51e775a am: 97399d18c5
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2264594
Change-Id: I6ed5b62d32dc7669e6c7de97cdc04ad9f66ec203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 23:43:13 +00:00
97399d18c5
Revert "lmkd: set priority of the kill target from the reaper thread" am: c5e4185a02 am: b4e51e775a
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2264594
Change-Id: I5ac7530104675e28b1174796de2969d27bc38a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 23:11:21 +00:00
b4e51e775a
Revert "lmkd: set priority of the kill target from the reaper thread" am: c5e4185a02
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2264594
Change-Id: Ia78dfbca2c98f36b5a3da1bbcb92cf4f9369af25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 22:42:51 +00:00
c5e4185a02
Revert "lmkd: set priority of the kill target from the reaper thread"
...
This reverts commit 208d1af144
2022-10-21 20:54:18 +00:00
05ceae6599
lmkd: set priority of the kill target from the reaper thread am: 208d1af144 am: 3083f8688a am: 754e604c75
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256321
Change-Id: I8ff96740014b6d71fbcc4d792630e84bb65e5080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 17:08:38 +00:00
754e604c75
lmkd: set priority of the kill target from the reaper thread am: 208d1af144 am: 3083f8688a
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256321
Change-Id: I158d6e506ca59d3a8385054b5781d17f47db73c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 16:34:20 +00:00
3083f8688a
lmkd: set priority of the kill target from the reaper thread am: 208d1af144
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256321
Change-Id: I15bcb8c145b564fb418834763bc81a07889d3bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 16:06:14 +00:00
208d1af144
lmkd: set priority of the kill target from the reaper thread
...
Not boosting kill target's priority can cause priority inversion. Boost
its priority from the reaper thread right after sending a SIGKILL to
prevent priority inversion. Also, using normal priority to the victim
processes. Thus, they won't take too much CPU resource which preempt
UI or important processes.
Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I789ec402f038a1b48d25f62f859be69bbddfad16
2022-10-21 02:47:18 +00:00
77a7c78570
lmkd: prevent the main thread from reaping synchronously am: 1c96a31917 am: 1c14dfd364 am: 56bc0d0292
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256322
Change-Id: Ie46ce5d52634b0bcd37c85290d98511c00514947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 02:03:10 +00:00
56bc0d0292
lmkd: prevent the main thread from reaping synchronously am: 1c96a31917 am: 1c14dfd364
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256322
Change-Id: I3b48731d19ffb4f7c09b71b24eb0757675b73d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 01:29:37 +00:00
1c14dfd364
lmkd: prevent the main thread from reaping synchronously am: 1c96a31917
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2256322
Change-Id: Idc81fd8c0e9f9e0a097cddea6682e22a4ce4ea8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 00:58:07 +00:00
1c96a31917
lmkd: prevent the main thread from reaping synchronously
...
lmkd main thread is running at RT priority to prevent it from being
blocked by other processes. However when all reaper threads are busy,
lmkd will kill and reap the memory of the target process from the
context of the main thread and that can cause two issues:
1. lmkd main thread gets blocked for considerable duration.
2. lmkd main and reaper threads might monopolize CPUs.
To prevent these issues, when all reaper threads are busy, lmkd will
send a SIGKILL but will not synchronously reap the memory of the target
process.
Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I351c01229152946969e646b538a2494656c0cc85
2022-10-18 21:44:24 +00:00
7977c5f424
[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: dda11a6d3d -s ours am: 13dc2010de -s ours
...
am skip reason: Merged-In I0c7776aea1518c17f0a29904a44b7fe8f33980ca with SHA-1 a3802f16cfhttps://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/20132576
Change-Id: Ifd91643e4b7123c1a83baa2dc7c0e564efb36017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:13:34 +00:00
5e5729c447
[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: d53b1adb0f -s ours am: 50dc1c4777 -s ours
...
am skip reason: Merged-In I0c7776aea1518c17f0a29904a44b7fe8f33980ca with SHA-1 a3802f16cfhttps://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/20132576
Change-Id: I7610d030d1c545d29bff36c14540a3ba128b6962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 20:10:11 +00:00
13dc2010de
[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master am: dda11a6d3d -s ours
...
am skip reason: Merged-In I0c7776aea1518c17f0a29904a44b7fe8f33980ca with SHA-1 a3802f16cfhttps://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/20132576
Change-Id: If0768c955272951bf3f5bebe71edd464674ca1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:59:35 +00:00
50dc1c4777
[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: d53b1adb0f -s ours
...
am skip reason: Merged-In I0c7776aea1518c17f0a29904a44b7fe8f33980ca with SHA-1 a3802f16cfhttps://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/20132576
Change-Id: I4a026922ff88214816c4ff5b2a3a966f70cac187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 17:56:13 +00:00
dda11a6d3d
Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master
2022-10-11 17:39:53 +00:00
7882afb254
lmkd: remove priority setting for the kill target am: 67c467d4ec am: 7f8da1ec36 am: 14811ac9c0
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2241693
Change-Id: I9a56144d36393c0bc5e6df6bff5ae99551917637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 00:42:24 +00:00
14811ac9c0
lmkd: remove priority setting for the kill target am: 67c467d4ec am: 7f8da1ec36
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2241693
Change-Id: I0274d5765611ccadea2451ea367271e0bd3f6a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 00:09:28 +00:00
7f8da1ec36
lmkd: remove priority setting for the kill target am: 67c467d4ec
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2241693
Change-Id: Ibfb05c983d6bdd5be079f7705330377dbb095472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:41:01 +00:00
9d3206eebb
lmkd: measure free swap as available and easily reclaimable memory am: 495db5c643 am: c6753329a2 am: 775c050f69
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2233052
Change-Id: Ib106565feda85f718a0eedc1c0c908c2e91ed695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 23:13:15 +00:00
775c050f69
lmkd: measure free swap as available and easily reclaimable memory am: 495db5c643 am: c6753329a2
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2233052
Change-Id: Id55391b3d9d6432258eecfc8eeaf21e3214c4d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 22:40:55 +00:00
c6753329a2
lmkd: measure free swap as available and easily reclaimable memory am: 495db5c643
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2233052
Change-Id: I6436a866b2043a35c624c19ac705fe145e8b7e15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 21:56:51 +00:00
67c467d4ec
lmkd: remove priority setting for the kill target
...
Setting cpusets and priorities for the kill target involves fs operations
which can block on kernel internal locks. Doing that from lmkd main thread
context has the danger of blocking lmkd. With the introduction of the
reaper threads the time for the target to exit is not as critical since
its memory is freed by the reaper thread.
To prevent lmkd from being blocked, move setting cpuset for the kill
target into the reaper thread and remove priority setting logic with
heavy use of procfs reads.
Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I5defc6baa4ff1425d9835371b47a64e375ebac10
2022-10-10 17:47:40 +00:00
d53b1adb0f
Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
...
Bug: 248070379
Merged-In: I0c7776aea1518c17f0a29904a44b7fe8f33980ca
Change-Id: I72fdb741d2564e56911d776a7bb446743c8124a3
2022-10-06 12:03:37 -07:00
495db5c643
lmkd: measure free swap as available and easily reclaimable memory
...
In the case of ZRAM, SwapFree does not represent the actual free swap
amount because swap space is taken from the free memory or reclaimed.
Therefore use free memory and easily reclaimable memory as an
approximation of how much free swap system can use. Use SwapFree as
a measure of how much swap space the system will consider using. Min
of those two measurements is used to decide how much usable swap the
system still has.
Bug: 238495258
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ia7b0cc4a744d14c0d6e52603795917cf5824ea15
2022-10-04 12:53:23 -07:00
e5127c6d51
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread am: a3802f16cf am: d8a63ca13d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/20081396
Change-Id: If6716cbcf3154c1bb0de39551b5cd448c466cb61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 01:15:46 +00:00
d8a63ca13d
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread am: a3802f16cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/20081396
Change-Id: Ibd250d0d2ec7a98a91b975f3e272c97ed620fc5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 00:45:05 +00:00
c8433dd1e7
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread am: ba9ea6e3d6 am: d5dbec8d23 am: 02af677a49 am: 6057c60d5b am: 7f8c6edb33
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2235075
Change-Id: I08468b8d71706d50e1f052875eb3717e7cb8bf9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 20:41:36 +00:00
7f8c6edb33
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread am: ba9ea6e3d6 am: d5dbec8d23 am: 02af677a49 am: 6057c60d5b
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2235075
Change-Id: Ia3924dc82ffcd6dee53e22f8dcb6e45d2eee6e83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 20:09:40 +00:00
6057c60d5b
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread am: ba9ea6e3d6 am: d5dbec8d23 am: 02af677a49
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2235075
Change-Id: I166f3e4f03e886d5a6d9c684267ac46ec1f9d698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 19:43:01 +00:00
02af677a49
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread am: ba9ea6e3d6 am: d5dbec8d23
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2235075
Change-Id: I142a550c5c52a2bb62bcc19a3b9d6112f403efac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 18:38:52 +00:00
d5dbec8d23
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread am: ba9ea6e3d6
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2235075
Change-Id: I6c720544601c84096a70f9e06d96a46f8973768b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-29 18:09:27 +00:00
a3802f16cf
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread
...
pid_remove() is not a thread-safe function and can be called only from
the main thread. Calling it from the watchdog_callback() executed in the
context of the watchdog thread can cause a use-after-free failure if the
same record is being used by the main thread. Fix this issue by marking
the process record as invalid instead of destroying it. Later on invalid
records will be cleared in kill_one_process() called from the context of
the main thread.
Fixes: f8727745f9
2022-09-29 17:47:31 +00:00
ba9ea6e3d6
lmkd: Fix UAF caused by calling pid_remove() from the watchdog thread
...
pid_remove() is not a thread-safe function and can be called only from
the main thread. Calling it from the watchdog_callback() executed in the
context of the watchdog thread can cause a use-after-free failure if the
same record is being used by the main thread. Fix this issue by marking
the process record as invalid instead of destroying it. Later on invalid
records will be cleared in kill_one_process() called from the context of
the main thread.
Fixes: f8727745f9
2022-09-27 14:30:34 -07:00
4b48f8da7f
lmkd: Remove process record after it is killed by lmkd watchdog am: 26c9de4e72 am: d49a7e77b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/19748193
Change-Id: I87e2712104f7a3a7291f7cc9d5d9ed961e074034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 20:03:26 +00:00
d49a7e77b3
lmkd: Remove process record after it is killed by lmkd watchdog am: 26c9de4e72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/19748193
Change-Id: I702b7374187ae4916cd6b10110b4bc2573989d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:43:36 +00:00
26c9de4e72
lmkd: Remove process record after it is killed by lmkd watchdog
...
After lmkd watchdog kills a process, its record should be removed.
Bug: 243567425
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I70bb2a432df8088ebc9865fbc36b065738248d19
2022-08-25 20:14:23 +00:00
ad63bab664
lmkd: Remove process record after it is killed by lmkd watchdog am: c555ec6eeb am: 733be36274 am: f3d4403c12 am: 4ccdc36380 am: b1efc95cf3
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2193801
Change-Id: Ife8716531ae2b04ebcacd8d446159ae1352d253a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 18:44:38 +00:00
b1efc95cf3
lmkd: Remove process record after it is killed by lmkd watchdog am: c555ec6eeb am: 733be36274 am: f3d4403c12 am: 4ccdc36380
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2193801
Change-Id: I88f395e6e82df5c849cdf7e378f0e7afcae1b2ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 18:16:13 +00:00
4ccdc36380
lmkd: Remove process record after it is killed by lmkd watchdog am: c555ec6eeb am: 733be36274 am: f3d4403c12
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2193801
Change-Id: I8ae3ffe1e1ea0876f7029aa683e6f31bdaa78240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 17:01:51 +00:00
f3d4403c12
lmkd: Remove process record after it is killed by lmkd watchdog am: c555ec6eeb am: 733be36274
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2193801
Change-Id: I83ffc1bc746010c0fd63e4010a1a43020e42443e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 16:34:25 +00:00
733be36274
lmkd: Remove process record after it is killed by lmkd watchdog am: c555ec6eeb
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2193801
Change-Id: I450caf1f6b317d003bbaeefce35c11f36aa4ba74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 16:06:33 +00:00
c555ec6eeb
lmkd: Remove process record after it is killed by lmkd watchdog
...
After lmkd watchdog kills a process, its record should be removed.
Bug: 243567425
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I70bb2a432df8088ebc9865fbc36b065738248d19
2022-08-23 15:28:53 -07:00
0a924de7bc
Remove kill_one_process tracepoint from lmkd am: b9d0592bba am: f8727745f9 am: 7324be6c63 am: fa8b9285b1 am: 7009c9dcd8
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2175442
Change-Id: I31ac1cce316813380dc51e101f1a668cc1bf6ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 19:57:50 +00:00
7009c9dcd8
Remove kill_one_process tracepoint from lmkd am: b9d0592bba am: f8727745f9 am: 7324be6c63 am: fa8b9285b1
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2175442
Change-Id: I0590fa2a5da3ea726c05f2c63c46754620816760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 19:40:08 +00:00
fa8b9285b1
Remove kill_one_process tracepoint from lmkd am: b9d0592bba am: f8727745f9 am: 7324be6c63
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2175442
Change-Id: I4c4f4bb8136c0e755e3315719ef7190ba9130315
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 19:11:02 +00:00
7324be6c63
Remove kill_one_process tracepoint from lmkd am: b9d0592bba am: f8727745f9
...
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2175442
Change-Id: I267d82e4358bce89aa601fb9f39eb712dce3d9b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 18:46:27 +00:00
Suren Baghdasaryan
Xin Li
Ioannis Ilkos