Commit Graph

902 Commits

Author SHA1 Message Date
Suren Baghdasaryan fa667edb56 lmkd: Add lmkd wakeup information into killinfo logs
Oftentimes while investigating bugreports it's unclear whether lmkd
was active between kills. To provide visibility into lmkd activity
adding the following fields into killinfo reports:
MsSinceEvent - number of msecs since the last PSI/vmpressure event
MsSincePrevWakeup - number of msecs since the previous wakeup
WakeupsSinceEvent - number of wakeups since the last PSI/vmpressure
event
SkippedWakeups - number of wakeups that were skipped due to an
incomplete kill

Bug: 162034541
Bug: 161955028
Bug: 162297751
Test: lmkd_unit_test
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I0356c27515132ff0dd309b59a8bf907acbd67cd8
(cherry picked from commit d7b4fcb8a5)
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: I0356c27515132ff0dd309b59a8bf907acbd67cd8
2020-07-30 01:33:27 +00:00
Suren Baghdasaryan f423f2f875 [automerger skipped] lmkd: Add property re-initialization support am: c4081918a7 am: 595be9465b -s ours
am skip reason: Change-Id Ic60331f3368f5a7fdfe09ad7d47c7ccf0a497685 with SHA-1 c4081918a7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11412857

Change-Id: I7a0c3504721900d474893f35fa341c4083faef7b
2020-07-28 19:16:49 +00:00
Suren Baghdasaryan dd8c2c181b lmkd: Set default kill timeout to limit waits for uninterruptible processes
When lmkd tries to kill a process in uninterruptible sleep state, it may
need to wait for a long time. To prevent this set the default kill timeout
to 100ms which should work for majority of the devices.

Bug: 160295034
Bug: 161955028
Bug: 162297751
Test: lmkd_unit_test
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ia280dc095df9ca8494278e0a75b976ed93fc04ae
(cherry picked from commit 7d1f4f0047)
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: Ia280dc095df9ca8494278e0a75b976ed93fc04ae
2020-07-28 09:13:44 +00:00
Suren Baghdasaryan 3151fe6f17 lmkd: Add lmkd wakeup information into killinfo logs am: d7b4fcb8a5 am: 403c7fd536 am: 48f7d0e49f am: c7c600c768 am: c2cd36c35c
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1371804

Change-Id: I66f990d47b9cd369744b576c30f351e239a1fba5
2020-07-26 18:34:54 +00:00
Suren Baghdasaryan c2cd36c35c lmkd: Add lmkd wakeup information into killinfo logs am: d7b4fcb8a5 am: 403c7fd536 am: 48f7d0e49f am: c7c600c768
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1371804

Change-Id: Ic747bddb3936cf3f6e58705ea65b238d92402cc6
2020-07-26 18:19:48 +00:00
Suren Baghdasaryan c7c600c768 lmkd: Add lmkd wakeup information into killinfo logs am: d7b4fcb8a5 am: 403c7fd536 am: 48f7d0e49f
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1371804

Change-Id: Ied2bb909d79ae865982795db181824a85bcf887c
2020-07-26 18:06:59 +00:00
Suren Baghdasaryan 48f7d0e49f lmkd: Add lmkd wakeup information into killinfo logs am: d7b4fcb8a5 am: 403c7fd536
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1371804

Change-Id: Ifcca19bbbb6c5d69f44edf20d34af824e9879060
2020-07-26 17:47:07 +00:00
Suren Baghdasaryan 403c7fd536 lmkd: Add lmkd wakeup information into killinfo logs am: d7b4fcb8a5
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1371804

Change-Id: I99560d361860d3c4d1e83f7b8ac219d57824f817
2020-07-26 17:32:08 +00:00
Suren Baghdasaryan d7b4fcb8a5 lmkd: Add lmkd wakeup information into killinfo logs
Oftentimes while investigating bugreports it's unclear whether lmkd
was active between kills. To provide visibility into lmkd activity
adding the following fields into killinfo reports:
MsSinceEvent - number of msecs since the last PSI/vmpressure event
MsSincePrevWakeup - number of msecs since the previous wakeup
WakeupsSinceEvent - number of wakeups since the last PSI/vmpressure
event
SkippedWakeups - number of wakeups that were skipped due to an
incomplete kill

Bug: 162034541
Test: lmkd_unit_test
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I0356c27515132ff0dd309b59a8bf907acbd67cd8
2020-07-24 19:31:03 +00:00
Suren Baghdasaryan 38f168f5cc lmkd: Set default kill timeout to limit waits for uninterruptible processes am: 7d1f4f0047 am: 93060362b5 am: 0b8b47057e am: ec0f9218de am: 6740aa67df
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1358623

Change-Id: Iba7db1865a5fb3848002d6e99a5b199b922cd507
2020-07-11 03:54:51 +00:00
Suren Baghdasaryan 6740aa67df lmkd: Set default kill timeout to limit waits for uninterruptible processes am: 7d1f4f0047 am: 93060362b5 am: 0b8b47057e am: ec0f9218de
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1358623

Change-Id: I790ab7f8d7a6a12310cc80b390ce4fe1f8af1efc
2020-07-11 03:41:10 +00:00
Suren Baghdasaryan ec0f9218de lmkd: Set default kill timeout to limit waits for uninterruptible processes am: 7d1f4f0047 am: 93060362b5 am: 0b8b47057e
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1358623

Change-Id: Ic644942e90748588e194ff05adf2d3f75397444e
2020-07-11 03:30:30 +00:00
Suren Baghdasaryan 0b8b47057e lmkd: Set default kill timeout to limit waits for uninterruptible processes am: 7d1f4f0047 am: 93060362b5
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1358623

Change-Id: I06968623ad7ea99ee61c001e367d3892249ed3a6
2020-07-11 03:18:24 +00:00
Suren Baghdasaryan 93060362b5 lmkd: Set default kill timeout to limit waits for uninterruptible processes am: 7d1f4f0047
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1358623

Change-Id: Iffcb4cbd88d44df216fce44c37ecace082df7d69
2020-07-11 03:07:04 +00:00
Suren Baghdasaryan 7d1f4f0047 lmkd: Set default kill timeout to limit waits for uninterruptible processes
When lmkd tries to kill a process in uninterruptible sleep state, it may
need to wait for a long time. To prevent this set the default kill timeout
to 100ms which should work for majority of the devices.

Bug: 160295034
Test: lmkd_unit_test
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ia280dc095df9ca8494278e0a75b976ed93fc04ae
2020-07-08 11:41:14 -07:00
Martin Liu 877150c6cd [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe -s ours am: 08d786c5bd -s ours am: a8465ae999 -s ours am: bda126b5f8 -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 dfc73bc2fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I5d4b53062770bc56060abb17a3f5e68434895dc0
2020-06-02 21:52:13 +00:00
Martin Liu 35eec701fa [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e -s ours am: f9db70b71b -s ours am: 27300cc414 -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 dfc73bc2fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I9f8f53c5e87a48f2859393ee861da18461547d65
2020-06-02 21:50:55 +00:00
Martin Liu 0501464fff [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e am: 8087e1104c -s ours am: ff1290ee03 -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 3185c2d096 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I1f257666b59fc4fc8e50067303a81bffa6127021
2020-06-02 21:49:34 +00:00
Martin Liu bda126b5f8 [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe -s ours am: 08d786c5bd -s ours am: a8465ae999 -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 dfc73bc2fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I095cd94b20056722e6ca315e0808da046bdf655c
2020-06-02 21:24:13 +00:00
Martin Liu 27300cc414 [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e -s ours am: f9db70b71b -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 dfc73bc2fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Ib9274ae6500e8d51cc3d29c561080bae1b1ac6df
2020-06-02 21:23:44 +00:00
Martin Liu ff1290ee03 [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e am: 8087e1104c -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 3185c2d096 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Iea4f1212460c052817dbfdeba770fc2d60dd3c7a
2020-06-02 21:23:15 +00:00
Martin Liu a8465ae999 [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe -s ours am: 08d786c5bd -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 dfc73bc2fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I01c65d9d30e12efd461b7dba263dc4194924c611
2020-06-02 21:12:09 +00:00
Martin Liu f9db70b71b [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 3185c2d096 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Ib5b7c1a7267883095bba6f2f5dae064037b4f962
2020-06-02 21:11:19 +00:00
Martin Liu 8087e1104c lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe am: 62f4f4262e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I3213442a2628581dedb0ccf753c70643d55acce0
2020-06-02 21:11:17 +00:00
Martin Liu f6dc513ad7 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: I4fc231e488289620dd00a37d1f19de9460a15af8
2020-06-02 21:01:39 +00:00
Martin Liu 08d786c5bd [automerger skipped] lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe -s ours
am skip reason: Change-Id Ifc09c2a1fe7e21faa096988f471644f63951d81c with SHA-1 3185c2d096 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Ied978dbd309a8876ed7a090120927b6818a70b80
2020-06-02 20:55:41 +00:00
Martin Liu 62f4f4262e lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: dfc73bc2fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/11699841

Change-Id: Iee2254c3047d939a82bbaf7de9e350ea1df4ea20
2020-06-02 20:55:29 +00:00
Martin Liu 8c1d793f38 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096 am: ff6ad5cd06 am: 3a2aeaba0e am: 6f4f82ffef am: 57974b3394
Original change: undetermined

Change-Id: I4e3eaa73a8ae26c337692d4a02d048bc84e5616b
2020-06-02 18:22:01 +00:00
Martin Liu 57974b3394 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096 am: ff6ad5cd06 am: 3a2aeaba0e am: 6f4f82ffef
Original change: undetermined

Change-Id: I50f3861733a5e0386c460eac46f8c20ca653d35d
2020-06-02 18:06:32 +00:00
Martin Liu 6f4f82ffef lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096 am: ff6ad5cd06 am: 3a2aeaba0e
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1321895

Change-Id: I7349628a326f0f8e6672462e604c0bf3e81c496c
2020-06-02 17:52:48 +00:00
Martin Liu 3a2aeaba0e lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096 am: ff6ad5cd06
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1321895

Change-Id: I1533fc059bb1683e5bf9441a7b30e5e24e6f1f83
2020-06-02 17:27:00 +00:00
Martin Liu ff6ad5cd06 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark am: 3185c2d096
Original change: undetermined

Change-Id: I1cb82bf5ff5da1dd29876354a54b2dd963088b37
2020-06-02 17:09:23 +00:00
Martin Liu dfc73bc2fe lmkd: Fix do not kill perceptible apps due to low swap if above min wmark
Fix code logic to obey our intetion of not killing perceptible apps
due to low swap if above min wmark.

Bug: 155709603
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: Ifc09c2a1fe7e21faa096988f471644f63951d81c
Change-Id: Ifc09c2a1fe7e21faa096988f471644f63951d81c
2020-06-02 23:47:01 +08:00
Martin Liu 3185c2d096 lmkd: Fix do not kill perceptible apps due to low swap if above min wmark
Fix code logic to obey our intetion of not killing perceptible apps
due to low swap if above min wmark.

Bug: 155709603
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: Ifc09c2a1fe7e21faa096988f471644f63951d81c
Change-Id: Ifc09c2a1fe7e21faa096988f471644f63951d81c
2020-06-02 23:43:49 +08:00
Automerger Merge Worker 1fcf17fdbc Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours am: 5b4b3716e4 -s ours" into rvc-d1-dev-plus-aosp am: 3e6ee0722c -s ours am: 49260e5a62 -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 7afa463978 is in history

Change-Id: I1b005fde459a343c969687d362762552df01a0a4
2020-05-21 01:13:57 +00:00
Automerger Merge Worker e673628202 Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a am: 0a55215fbe -s ours" into rvc-qpr-dev-plus-aosp am: f2ed66473c -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 7afa463978 is in history

Change-Id: I6d2dad57529d372a44f458dd943dd92a79f6ca71
2020-05-21 01:13:18 +00:00
Suren Baghdasaryan 12a610746a [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a -s ours am: 4afbef0f6c -s ours am: 7ebdd10ae6 -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: I0d08e176645605fdbd67a957f46c0ca09782cf88
2020-05-21 01:12:46 +00:00
Automerger Merge Worker 49260e5a62 Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours am: 5b4b3716e4 -s ours" into rvc-d1-dev-plus-aosp am: 3e6ee0722c -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 7afa463978 is in history

Change-Id: Ic3a7b5b625680827593e81ff0971141f697f42a1
2020-05-21 00:46:28 +00:00
Automerger Merge Worker f2ed66473c Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a am: 0a55215fbe -s ours" into rvc-qpr-dev-plus-aosp 2020-05-21 00:46:14 +00:00
Suren Baghdasaryan 008e891d43 [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a am: 0a55215fbe -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: I4dfc6fb05c99c903dbf0a303e6c146289f9530b9
2020-05-21 00:46:06 +00:00
Suren Baghdasaryan 7ebdd10ae6 [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a -s ours am: 4afbef0f6c -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: Ibee74a42a7d9b5be5f288ba627f0914b21afe420
2020-05-21 00:46:03 +00:00
Automerger Merge Worker 3e6ee0722c Merge "[automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours am: 5b4b3716e4 -s ours" into rvc-d1-dev-plus-aosp 2020-05-21 00:36:14 +00:00
Suren Baghdasaryan c08f3f09b7 [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours am: 5b4b3716e4 -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: I991c035d1cf12e59b5975450b399a85d0af239ab
2020-05-21 00:36:10 +00:00
Suren Baghdasaryan 4afbef0f6c [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: I742875df19599c98274531e9d986f3a827529da5
2020-05-21 00:36:08 +00:00
Suren Baghdasaryan 0a55215fbe lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 am: 747c846a5a
Change-Id: I546012e24b96df68eb303e3c940d2b8fc596c62b
2020-05-21 00:35:46 +00:00
Suren Baghdasaryan b286ce5376 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978
Change-Id: I871c772f96666925014c61649c1d7a529cae9028
2020-05-21 00:10:05 +00:00
Suren Baghdasaryan 747c846a5a lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978
Change-Id: Ib75f23cdd2fc21a32c8e2f6c303ad59ca531b026
2020-05-21 00:09:51 +00:00
Suren Baghdasaryan 5b4b3716e4 [automerger skipped] lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 7afa463978 -s ours
am skip reason: Change-Id I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1 with SHA-1 48135c4cba is in history

Change-Id: Ia2bbfb9829b21d0214279edc7c245b5437d31593
2020-05-21 00:09:43 +00:00
Suren Baghdasaryan c21b5cca26 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba am: d6d8a3dc55 am: c9e47704a9 am: 5d843e85e4 am: 442b9d0f39
Change-Id: I3bd2b0c20ee9251eac8e1d48c4b20a84f85a3461
2020-05-20 22:16:44 +00:00
Suren Baghdasaryan e194c4504a [automerger skipped] lmkd: Set the default free swap threshold to 10% for all devices am: fb1f592602 am: 5132481e15 -s ours am: 16657a940d -s ours am: 7263dd1a1c -s ours am: 1907d65f3a -s ours
am skip reason: Change-Id I443486763c034ed0603ea52b81c060c3969af9a5 with SHA-1 c2b228e498 is in history

Change-Id: Ic82d75428cc38eb863e8b2b15ea5d4f1c23674aa
2020-05-20 22:16:43 +00:00