Commit Graph

953 Commits

Author SHA1 Message Date
Martin Liu 91bf598282 lmkd: avoid division by zero because of file_base_lru
It seems we have chance that file_base_lru is zero.
Avoid it by adding 1.

Bug: 167660459
Bug: 163134367
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: If19dbbaafe6cd28a9d5b7f8a002f3cd33daab5e7
Change-Id: If19dbbaafe6cd28a9d5b7f8a002f3cd33daab5e7
2020-09-07 10:43:24 +08:00
Martin Liu 94d99a7bc8 lmkd: adjust thrashing dection strategy
When a device is thrashing the file cache, workingset refaults can
grow slowly because of variant reasons. Current thrashing detection
mechanism could reset the thrashing counter frequently as it relies
on presence of reclaim activity, however refaults can keep increasing
even when the device is not actively reclaiming. In addition, the
thrashing counter gets reset when conditions require a kill but lmkd
could not find an eligible process to be killed. This is problematic
because when this happens thrashing is being ignored.

Use a fixed 1 sec periods to aggregate the thrashing counter. Also we
need to keep monitoring thrashing counter while retrying as someone
could release the memory to mitigate the thrashing. If thrashing
counter is greater than the limit at the end of the 1 sec period this
means lmkd failed to find an eligible process to kill. In this case
we store accumulated thrashing in case a new eligible process appears
until accumulated thrashing is less that the limit or we miss an
entire 1 sec window.

Bug: 163134367
Test: heavy loading launch
Signed-off-by: Martin Liu <liumartin@google.com>
Merged-In: Ie9f4121ea604179c0ad510cc8430e7a6aec6e6b2
Change-Id: Ie9f4121ea604179c0ad510cc8430e7a6aec6e6b2
2020-09-07 10:42:51 +08:00
Martin Liu cd5f08d8ee Revert "lmkd: Add a margin for watermark when swap free is low"
This reverts commit 95551f816a.

Reason to revert: don't need this change.
Bug: 163134367

Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I8b209b054b6caec553bce13cd51f931401c1e42a
2020-09-07 10:42:40 +08:00
Martin Liu 50dfb961e5 lmkd: fix possible long stall state am: 589b5752ee am: d65f63c7d4 am: ff015bdf11 am: e51c46d048 am: b7dca7a294
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418830

Change-Id: Id13aa529391bff6cf7f5a1366656e5ca52b7b66a
2020-09-03 17:57:15 +00:00
Martin Liu 237b55a8f0 lmkd: avoid division by zero because of file_base_lru am: c3108416e7 am: b1294d486f am: d2d14448f3 am: 6e9525ad51 am: 1023db6172
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418831

Change-Id: I404cef9f4ed35f8cd0cb622775ce0e7079aaa821
2020-09-03 17:57:08 +00:00
Martin Liu b7dca7a294 lmkd: fix possible long stall state am: 589b5752ee am: d65f63c7d4 am: ff015bdf11 am: e51c46d048
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418830

Change-Id: Ibb6de9f34a31f81838797d02d4fe5b6488cafaf6
2020-09-03 17:18:45 +00:00
Martin Liu 1023db6172 lmkd: avoid division by zero because of file_base_lru am: c3108416e7 am: b1294d486f am: d2d14448f3 am: 6e9525ad51
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418831

Change-Id: I5be5af2eae1504066790dbbacb5e4c562da2d385
2020-09-03 17:18:16 +00:00
Martin Liu e51c46d048 lmkd: fix possible long stall state am: 589b5752ee am: d65f63c7d4 am: ff015bdf11
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418830

Change-Id: I2952fb217bba417e4726079389b6f9cdf3ddfe3f
2020-09-03 17:05:51 +00:00
Martin Liu 6e9525ad51 lmkd: avoid division by zero because of file_base_lru am: c3108416e7 am: b1294d486f am: d2d14448f3
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418831

Change-Id: Ic4287b1fb3ef6f7d0100a8e9ee0764b48ce77503
2020-09-03 17:05:46 +00:00
Martin Liu ff015bdf11 lmkd: fix possible long stall state am: 589b5752ee am: d65f63c7d4
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418830

Change-Id: Ic2598f572c456d3563e54a761806a50da3c26300
2020-09-03 16:52:09 +00:00
Martin Liu d2d14448f3 lmkd: avoid division by zero because of file_base_lru am: c3108416e7 am: b1294d486f
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418831

Change-Id: Ic74cc56e98ff9851cd30dfaa9906781b69834aae
2020-09-03 16:51:58 +00:00
Martin Liu d65f63c7d4 lmkd: fix possible long stall state am: 589b5752ee
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418830

Change-Id: I2386b050dd2d3b51b8db7ab8040c7e54d1aed74d
2020-09-03 16:41:00 +00:00
Martin Liu b1294d486f lmkd: avoid division by zero because of file_base_lru am: c3108416e7
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1418831

Change-Id: I828d0765ce5c1bbb15451c37a49bc0b9fc26795e
2020-09-03 16:40:55 +00:00
Martin Liu 589b5752ee lmkd: fix possible long stall state
If the first PSI event triggers a kill, lmkd won't resume polling
immediately after the process has died. Instead, it will wait until the
next PSI event to resume the polling which is too late when the device
is under memory pressure. This happens if data communication with AMS
happens after previous polling window expired, in which case paused
handler gets reset and polling does not resume after the kill.
Fix this by changing pause handler reset logic.

Bug: 167562248
Test: memory pressure test
Signed-off-by: Martin Liu <liumartin@google.com>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I10c65c85b718a656e3d8991bf09948b96da895cb
2020-09-04 00:04:57 +08:00
Martin Liu c3108416e7 lmkd: avoid division by zero because of file_base_lru
It seems we have chance that file_base_lru is zero.
Avoid it by adding 1.

Bug: 167660459
Test: boot
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: If19dbbaafe6cd28a9d5b7f8a002f3cd33daab5e7
2020-09-04 00:03:49 +08:00
Martin Liu 63fc9417fd lmkd: adjust thrashing dection strategy am: 1f72f5fa4b am: 58f6be8f3c am: c587b2629c am: 21a6082a6a am: 4bbbe5ef20
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1414468

Change-Id: I054efe052555f80b6e7c20507c12037ee0703aab
2020-09-02 22:17:25 +00:00
Martin Liu 4bbbe5ef20 lmkd: adjust thrashing dection strategy am: 1f72f5fa4b am: 58f6be8f3c am: c587b2629c am: 21a6082a6a
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1414468

Change-Id: Ie57a1b9360b27873af9056d1bc286352c2762aa2
2020-09-02 21:35:02 +00:00
Martin Liu 21a6082a6a lmkd: adjust thrashing dection strategy am: 1f72f5fa4b am: 58f6be8f3c am: c587b2629c
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1414468

Change-Id: Ie55859692029d3946bf35a3b9fcfe692d14a25da
2020-09-02 21:06:37 +00:00
Martin Liu c587b2629c lmkd: adjust thrashing dection strategy am: 1f72f5fa4b am: 58f6be8f3c
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1414468

Change-Id: Ia9dab97711dbf1133821c104c18f76cc440623aa
2020-09-02 20:45:51 +00:00
Martin Liu 58f6be8f3c lmkd: adjust thrashing dection strategy am: 1f72f5fa4b
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1414468

Change-Id: If2c66c905e2c5e73a946d9d19fa98a2c07a6fdf4
2020-09-02 20:03:10 +00:00
Martin Liu 1f72f5fa4b lmkd: adjust thrashing dection strategy
When a device is thrashing the file cache, workingset refaults can
grow slowly because of variant reasons. Current thrashing detection
mechanism could reset the thrashing counter frequently as it relies
on presence of reclaim activity, however refaults can keep increasing
even when the device is not actively reclaiming. In addition, the
thrashing counter gets reset when conditions require a kill but lmkd
could not find an eligible process to be killed. This is problematic
because when this happens thrashing is being ignored.

Use a fixed 1 sec periods to aggregate the thrashing counter. Also we
need to keep monitoring thrashing counter while retrying as someone
could release the memory to mitigate the thrashing. If thrashing
counter is greater than the limit at the end of the 1 sec period this
means lmkd failed to find an eligible process to kill. In this case
we store accumulated thrashing in case a new eligible process appears
until accumulated thrashing is less that the limit or we miss an
entire 1 sec window.

Bug: 163134367
Test: heavy loading launch
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: Ie9f4121ea604179c0ad510cc8430e7a6aec6e6b2
2020-08-28 13:04:42 +08:00
Xin Li f97e4d70ab [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 3bf11e828b -s ours am: cf7c2bc357 -s ours am: 9d02029885 -s ours am: 40e1efe466 -s ours
am skip reason: Change-Id I06968623ad7ea99ee61c001e367d3892249ed3a6 with SHA-1 0b8b47057e is in history

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

Change-Id: I29a809cc2fdddf5130946c8d708f668dfdb77ba9
2020-08-27 20:13:39 +00:00
Xin Li 40e1efe466 [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 3bf11e828b -s ours am: cf7c2bc357 -s ours am: 9d02029885 -s ours
am skip reason: Change-Id I06968623ad7ea99ee61c001e367d3892249ed3a6 with SHA-1 0b8b47057e is in history

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

Change-Id: I017ba8c1ee09c39cdc7f47af5344e5b8088adf79
2020-08-27 19:25:43 +00:00
Xin Li 9d02029885 [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 3bf11e828b -s ours am: cf7c2bc357 -s ours
am skip reason: Change-Id I06968623ad7ea99ee61c001e367d3892249ed3a6 with SHA-1 0b8b47057e is in history

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

Change-Id: Id352b7228a9fd5bd3fd6bb83676f481e3cf4eb2b
2020-08-27 19:03:00 +00:00
Xin Li cf7c2bc357 [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 3bf11e828b -s ours
am skip reason: Change-Id I06968623ad7ea99ee61c001e367d3892249ed3a6 with SHA-1 0b8b47057e is in history

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

Change-Id: I09a11542a03147798cf88c1c4740b08bbb3d397c
2020-08-27 18:34:16 +00:00
Xin Li 3bf11e828b Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged
Bug: 166295507
Merged-In: I06968623ad7ea99ee61c001e367d3892249ed3a6
Change-Id: I536b69290d787bf3fa7d060427bbea66d6570699
2020-08-27 09:44:21 -07:00
Martin Liu 8263d07fe3 lmkd: Add a margin for watermark when swap free is low am: 95551f816a am: 07c9ed14e3 am: 4ee5ebb86b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12361021

Change-Id: Ib3c424a8a218fbb31129b0441dbd9f2d1469d3fb
2020-08-14 14:45:51 +00:00
Martin Liu af93ddb1f6 lmkd: Add a margin for watermark when swap free is low am: 95551f816a am: 0b55174ae7 am: 3c5de93553
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12361021

Change-Id: I9f76e821417c3a95fb75ee54e5935fcd68f45020
2020-08-14 14:45:34 +00:00
Martin Liu 4ee5ebb86b lmkd: Add a margin for watermark when swap free is low am: 95551f816a am: 07c9ed14e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12361021

Change-Id: Ida5727f7dc98aa2af0b558af855136fd452d21f8
2020-08-14 14:34:26 +00:00
Martin Liu 3c5de93553 lmkd: Add a margin for watermark when swap free is low am: 95551f816a am: 0b55174ae7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12361021

Change-Id: I94b6183ffc011f72cdf34fba15673e50c8cc9f6b
2020-08-14 14:33:17 +00:00
Martin Liu 07c9ed14e3 lmkd: Add a margin for watermark when swap free is low am: 95551f816a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12361021

Change-Id: Iadbc1b44c4699b9a0a1f74edce25eb5817615f5c
2020-08-14 14:15:32 +00:00
Martin Liu 0b55174ae7 lmkd: Add a margin for watermark when swap free is low am: 95551f816a
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12361021

Change-Id: I241e3dd3ffafded55f303e91b61ed0c6edadc272
2020-08-14 14:14:26 +00:00
Martin Liu 95551f816a lmkd: Add a margin for watermark when swap free is low
When swap is depleted file cache thrashing might result in allocations
quickly pushing memory below low watermark and kswapd quickly pushing
it back above high watermark. In this situation free memory stays above
high watermark most of the time and lmkd during its periodic wake-ups
has low chance of detecting low memory conditions. Add a 15% margin
for high watermark which would allow lmkd to kill if swap is low,some
memory was reclaimed since the last wakeup and free memory is just
above the high watermark limit.

Bug: 163134367
Test: heavy loading launch
Signed-off-by: Martin Liu <liumartin@google.com>
Change-Id: I5694736b04bafcd13c01f4b51e242e2ac4ff55a8
2020-08-14 04:29:48 +00:00
Ioannis Ilkos 3bba4ddc3c Emit swap size in the killed process' statsd atoms am: 279268a07f am: 30240af1f0 am: 4018f3e2d1 am: 6e31b19a94 am: d6bf19a8b2
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1398492

Change-Id: I493e49904bf9b4b07731fb730ffdd7f27ae3baae
2020-08-13 09:23:37 +00:00
Ioannis Ilkos d6bf19a8b2 Emit swap size in the killed process' statsd atoms am: 279268a07f am: 30240af1f0 am: 4018f3e2d1 am: 6e31b19a94
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1398492

Change-Id: I02e5cba798f923e16462606ec0325e226ef52946
2020-08-13 09:05:02 +00:00
Ioannis Ilkos 6e31b19a94 Emit swap size in the killed process' statsd atoms am: 279268a07f am: 30240af1f0 am: 4018f3e2d1
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1398492

Change-Id: I48cb0b10ae6aa65abb7e1ba3ffdcbadb56f269ff
2020-08-13 08:48:40 +00:00
Ioannis Ilkos 4018f3e2d1 Emit swap size in the killed process' statsd atoms am: 279268a07f am: 30240af1f0
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1398492

Change-Id: I0d1856dc7b2b33437ee62a79e8dc49bec06368f1
2020-08-13 08:05:03 +00:00
Ioannis Ilkos 30240af1f0 Emit swap size in the killed process' statsd atoms am: 279268a07f
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1398492

Change-Id: I1a3e6a035e60cd15ff6723ffcdcdc6e01262ccc0
2020-08-13 07:51:07 +00:00
Ioannis Ilkos 279268a07f Emit swap size in the killed process' statsd atoms
Changes:
- We are already reading /proc/pid/status to resolve the tgid. While we
are at it, also parse RSS and swap values.
- Use the RSS and swap values for non memcg builds when creating the
statsd outputs
- Given we already read RSS, remove the separate read of /proc/pid/statm
that used to get tasksize.

Bug: 163116785
Test: manual, out/host/linux-x86/bin/statsd_testdrive 51
Change-Id: I9d98b9ffe8be0b014bb09174ec9532382cae1f38
2020-08-12 20:24:56 +01:00
Suren Baghdasaryan 11e4fe0a57 [automerger skipped] lmkd: Add lmkd wakeup information into killinfo logs am: fa667edb56 am: 2c509d9073 -s ours am: 280b96ad4a -s ours
am skip reason: Change-Id I0356c27515132ff0dd309b59a8bf907acbd67cd8 with SHA-1 fa667edb56 is in history

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

Change-Id: I85fa199df2389cd2e02a541720e8f1106b5c2b78
2020-07-30 02:07:45 +00:00
Suren Baghdasaryan 5764ea6bd3 [automerger skipped] lmkd: Set default kill timeout to limit waits for uninterruptible processes am: dd8c2c181b am: 504a7cafc5 -s ours am: c063938c8d -s ours
am skip reason: Change-Id Ia280dc095df9ca8494278e0a75b976ed93fc04ae with SHA-1 dd8c2c181b is in history

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

Change-Id: I0ab97f1c638e2e284df8dda9172ac5f7a0b245a0
2020-07-30 02:07:43 +00:00
Suren Baghdasaryan 280b96ad4a [automerger skipped] lmkd: Add lmkd wakeup information into killinfo logs am: fa667edb56 am: 2c509d9073 -s ours
am skip reason: Change-Id I0356c27515132ff0dd309b59a8bf907acbd67cd8 with SHA-1 fa667edb56 is in history

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

Change-Id: I9a089a64efd480fa9db148552dc89ef6d14c70cd
2020-07-30 02:03:03 +00:00
Suren Baghdasaryan c063938c8d [automerger skipped] lmkd: Set default kill timeout to limit waits for uninterruptible processes am: dd8c2c181b am: 504a7cafc5 -s ours
am skip reason: Change-Id Ia280dc095df9ca8494278e0a75b976ed93fc04ae with SHA-1 dd8c2c181b is in history

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

Change-Id: I3cbc899106a37001e4e09c6b0223086a43c96e00
2020-07-30 02:03:02 +00:00
Suren Baghdasaryan 243e5d19ed [automerger skipped] lmkd: Add lmkd wakeup information into killinfo logs am: fa667edb56 -s ours am: 5ac19eb471 -s ours am: 19d9d66dc5 -s ours
am skip reason: Change-Id I0356c27515132ff0dd309b59a8bf907acbd67cd8 with SHA-1 d7b4fcb8a5 is in history

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

Change-Id: I8de72dac9497e24681892eb65980f52136003158
2020-07-30 02:00:35 +00:00
Suren Baghdasaryan b8983a9a25 [automerger skipped] lmkd: Set default kill timeout to limit waits for uninterruptible processes am: dd8c2c181b -s ours am: 4a04afd997 -s ours am: d457698550 -s ours
am skip reason: Change-Id Ia280dc095df9ca8494278e0a75b976ed93fc04ae with SHA-1 7d1f4f0047 is in history

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

Change-Id: I4ea7257b23f70ce102e64c8675c383f4c3067471
2020-07-30 02:00:34 +00:00
Suren Baghdasaryan 19d9d66dc5 [automerger skipped] lmkd: Add lmkd wakeup information into killinfo logs am: fa667edb56 -s ours am: 5ac19eb471 -s ours
am skip reason: Change-Id I0356c27515132ff0dd309b59a8bf907acbd67cd8 with SHA-1 d7b4fcb8a5 is in history

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

Change-Id: Ic7c9677be9e1d64d1fa3eff622a8b7fc3d21baf2
2020-07-30 01:50:56 +00:00
Suren Baghdasaryan d457698550 [automerger skipped] lmkd: Set default kill timeout to limit waits for uninterruptible processes am: dd8c2c181b -s ours am: 4a04afd997 -s ours
am skip reason: Change-Id Ia280dc095df9ca8494278e0a75b976ed93fc04ae with SHA-1 7d1f4f0047 is in history

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

Change-Id: Ie74c182c82187afebc3b5a83aea0b501a395826e
2020-07-30 01:50:54 +00:00
Suren Baghdasaryan 2c509d9073 lmkd: Add lmkd wakeup information into killinfo logs am: fa667edb56
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12245884

Change-Id: I0e84d86642df4dc4097f01ab7f6f94ba441f3692
2020-07-30 01:43:30 +00:00
Suren Baghdasaryan 504a7cafc5 lmkd: Set default kill timeout to limit waits for uninterruptible processes am: dd8c2c181b
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12245883

Change-Id: I65c4ef026b2118d09fd3d3cdd2ff5aab2bf66cd2
2020-07-30 01:43:29 +00:00
Suren Baghdasaryan 5ac19eb471 [automerger skipped] lmkd: Add lmkd wakeup information into killinfo logs am: fa667edb56 -s ours
am skip reason: Change-Id I0356c27515132ff0dd309b59a8bf907acbd67cd8 with SHA-1 d7b4fcb8a5 is in history

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

Change-Id: I21557b59bcb67736b552b7f5fa3b37045851a4dd
2020-07-30 01:41:43 +00:00