Commit Graph

716 Commits

Author SHA1 Message Date
Suren Baghdasaryan dc60f9717b lmkd: Handle workingset_refault vmstat field change in 5.9 kernel
Linux kernel 5.9 change some vmstat fields including workingset_refault
which affects lmkd operation. Update vmstat parsing to handle both
old (workingset_refault) and new (workingset_refault_file) names for
that field.

Bug: 175617952
Test: lmkd_unit_test
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I8f9b3d027ca96154f07e7252902a5aa04cf05a9f
2020-12-14 13:38:48 -08:00
Suren Baghdasaryan 9f8d3dec72 lmkd: Remove unused workingset_refault parsing from zoneinfo
workingset_refault field in zoneinfo is currently being parsed but
is not used. Instead the same field in vmstat is being used to
capture the number of file-backed workingset refaults. Remove the
unused field parsing code.

Bug: 175617952
Test: lmkd_unit_test
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I79641a833c252cf50ac08c0c7d17c8294236d82d
2020-12-14 13:10:59 -08:00
Xin Li 07acc19c82 Mark ab/6881855 as merged
Bug: 172690556
Change-Id: I3f3d51c5ec32369ba0c31113822118d4bffe4147
2020-11-23 11:33:00 -08:00
Xin Li e6ad9cc974 Skip ab/6749736 in stage.
Merged-In: I21557b59bcb67736b552b7f5fa3b37045851a4dd
Change-Id: I4ba2e0df4785cafd998a73ac73520c5ac06cc700
2020-10-08 17:24:04 -07:00
Sudarshan Rajagopalan b94cc1c4d3 libpsi: Export library to vendor am: c467601098 am: 54c3db5d70 am: 449b0f229f am: c9703e8e18
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1437955

Change-Id: I82b31efaf6b8347019fc934d154493a132cdec0d
2020-09-29 02:22:19 +00:00
Sudarshan Rajagopalan c9703e8e18 libpsi: Export library to vendor am: c467601098 am: 54c3db5d70 am: 449b0f229f
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1437955

Change-Id: I63af4bea59653360e6db2014f7d48b4478e03b48
2020-09-29 01:56:06 +00:00
Sudarshan Rajagopalan 449b0f229f libpsi: Export library to vendor am: c467601098 am: 54c3db5d70
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1437955

Change-Id: I59b45e92823d544f77c7dc207b0c836d2d56280d
2020-09-29 01:39:26 +00:00
Sudarshan Rajagopalan bfacb1cbdc libpsi: Add explicit header files am: 8771e054e8 am: 41dc0274a3 am: 21eb403400 am: 070fa2cc74
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1437956

Change-Id: Ia4fff3569217a00c5aab164c96ce8d617c09f97b
2020-09-29 01:39:06 +00:00
Sudarshan Rajagopalan 54c3db5d70 libpsi: Export library to vendor am: c467601098
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1437955

Change-Id: I71df63d382caf5f06131b1f7950dab1955bb6c4d
2020-09-29 01:21:07 +00:00
Sudarshan Rajagopalan 070fa2cc74 libpsi: Add explicit header files am: 8771e054e8 am: 41dc0274a3 am: 21eb403400
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1437956

Change-Id: I5ea35dba3983dbc8d62c5dae6065139753b7a586
2020-09-29 01:20:24 +00:00
Sudarshan Rajagopalan 21eb403400 libpsi: Add explicit header files am: 8771e054e8 am: 41dc0274a3
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1437956

Change-Id: I70265a45d7aed65c9341b91db8b26968a2de1fe2
2020-09-29 01:04:40 +00:00
Sudarshan Rajagopalan 41dc0274a3 libpsi: Add explicit header files am: 8771e054e8
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1437956

Change-Id: I7c68520392ec9aca5921dac5b372cbf011849800
2020-09-29 00:10:01 +00:00
Sudarshan Rajagopalan c467601098 libpsi: Export library to vendor
Make vendor_available = true so that other modules in vendor image
can leverage this library to init, register and unregister to psi.

Bug: 169346507
Change-Id: I47f7d25984e09d61703e7b2bd6fcb8db9d3814f5
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2020-09-28 14:51:09 -07:00
Sudarshan Rajagopalan 8771e054e8 libpsi: Add explicit header files
The libpsi source code is missing cutils and stdio header files.
Add cutils and stdio header files, and add libcutils_headers to
the header library in Android.bp.

Bug: 169346507
Change-Id: I2d613d5724d3c5f52dd52dcae7024439f2e8d5bb
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
2020-09-28 14:50:15 -07:00
Suren Baghdasaryan fb80cee5c6 [automerger skipped] lmkd: report kill reason, and meminfo details to statsd for each kill am: 140385d3a0 -s ours
am skip reason: Change-Id Ic46aed3c85b880b32ac5ad61b55f90e0d33517c7 with SHA-1 3cc1f13044 is in history

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

Change-Id: Ifde6aafa26f0af2d605a42cbf046d5a598818341
2020-09-16 16:52:06 +00:00
Suren Baghdasaryan 140385d3a0 lmkd: report kill reason, and meminfo details to statsd for each kill
Information like free memory and swap as well as kill reason would be
useful for understanding regressions in the number of lmk kills in the
field.

Bug: 168117803
Test: statsd_testdrive 51, load with lmk_unit_test
Merged-In: Ic46aed3c85b880b32ac5ad61b55f90e0d33517c7
Change-Id: Ic46aed3c85b880b32ac5ad61b55f90e0d33517c7
2020-09-15 11:34:27 -07:00
Suren Baghdasaryan 272c650dd3 lmkd: report kill reason, and meminfo details to statsd for each kill am: 3cc1f13044 am: 595d1c19c7 am: f527dfc9df am: f50a9ebb36
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1424049

Change-Id: I68a21b58828399cebd58552870015974296e1445
2020-09-14 22:40:15 +00:00
Suren Baghdasaryan f50a9ebb36 lmkd: report kill reason, and meminfo details to statsd for each kill am: 3cc1f13044 am: 595d1c19c7 am: f527dfc9df
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1424049

Change-Id: Ic7aee07c12f089aac0c41ee25389331b154d70f6
2020-09-14 21:56:11 +00:00
Suren Baghdasaryan f527dfc9df lmkd: report kill reason, and meminfo details to statsd for each kill am: 3cc1f13044 am: 595d1c19c7
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1424049

Change-Id: I243c0a670ba02cc0762d0ea7f664d91afede2d9a
2020-09-14 21:24:45 +00:00
Suren Baghdasaryan 595d1c19c7 lmkd: report kill reason, and meminfo details to statsd for each kill am: 3cc1f13044
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1424049

Change-Id: Ic70e756c0ac793414c68967a7fe13599da7b0d7d
2020-09-14 17:32:25 +00:00
Suren Baghdasaryan 3cc1f13044 lmkd: report kill reason, and meminfo details to statsd for each kill
Information like free memory and swap as well as kill reason would be
useful for understanding regressions in the number of lmk kills in the
field.

Bug: 168117803
Change-Id: Ic46aed3c85b880b32ac5ad61b55f90e0d33517c7
Test: statsd_testdrive 51, load with lmk_unit_test
2020-09-11 14:24:23 +01:00
Martin Liu bb1a7d9b7a [automerger skipped] lmkd: fix possible long stall state am: d816ab7c54 -s ours
am skip reason: Change-Id I10c65c85b718a656e3d8991bf09948b96da895cb with SHA-1 589b5752ee is in history

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

Change-Id: I0ec6db70a9b5c69cb2fd463409f11f04639fca82
2020-09-08 06:51:00 +00:00
Martin Liu 74129d3d9e [automerger skipped] lmkd: avoid division by zero because of file_base_lru am: 91bf598282 -s ours
am skip reason: Change-Id If19dbbaafe6cd28a9d5b7f8a002f3cd33daab5e7 with SHA-1 c3108416e7 is in history

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

Change-Id: Ied58f07fa22194ca3a89017312140736c64c64f2
2020-09-08 06:50:56 +00:00
Martin Liu 14009f3ba7 [automerger skipped] lmkd: adjust thrashing dection strategy am: 94d99a7bc8 -s ours
am skip reason: Change-Id Ie9f4121ea604179c0ad510cc8430e7a6aec6e6b2 with SHA-1 1f72f5fa4b is in history

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

Change-Id: I6ff41029d3f4f4b153920101012454a513d1c375
2020-09-08 06:50:54 +00:00
Martin Liu 7a57924ce8 Revert "lmkd: Add a margin for watermark when swap free is low" am: cd5f08d8ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/memory/lmkd/+/12445404

Change-Id: I3056e7cf80a12a2245ce15cab325a9a6c75b006d
2020-09-08 06:50:53 +00:00
Martin Liu d816ab7c54 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>
Merged-In: I10c65c85b718a656e3d8991bf09948b96da895cb
Change-Id: I10c65c85b718a656e3d8991bf09948b96da895cb
2020-09-07 10:46:16 +08:00
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 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 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 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 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