Commit Graph

1353 Commits

Author SHA1 Message Date
Suren Baghdasaryan 4847bb51f5 lmkd: fix log message reporting the breached watermark am: 236781873f am: e452c6be98
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1619562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32a69fc6bcb77d5adfc426455e945c9bb047f9d5
2021-03-05 19:10:06 +00:00
Suren Baghdasaryan c71ce3fed4 lmkd: choose the heaviest task when killing perceptible processes am: 858e8c6373
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1619563

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib919f6de91c1634dd7c6cff70a23d17ac52b91e7
2021-03-05 18:27:14 +00:00
Suren Baghdasaryan e452c6be98 lmkd: fix log message reporting the breached watermark am: 236781873f
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1619562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e7f62d919466d83d5c3bf085f0b70b6c690cec5
2021-03-05 18:27:10 +00:00
Suren Baghdasaryan 858e8c6373 lmkd: choose the heaviest task when killing perceptible processes
When killing a task at or lower than oom_score_adj PERCEPTIBLE_APP_ADJ
choose the heaviest task among the ones at that level to try minimizing
the number of required kills. Because killing a perceptible app will
affect user experience anyway, it makes sense to choose the one that
will release the most memory and therefore no more kills might be
necessary.

Bug: 181778155
Test: running thrashing.py script
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I775ff774430b6fde4d619ede794825dbae59fd8e
2021-03-05 17:45:30 +00:00
Suren Baghdasaryan 236781873f lmkd: fix log message reporting the breached watermark
Wrong condition causes reporting low watermark breach when min watermark
is breached and visa versa. Fix the condition to make reporting correct.

Bug: 181778155
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I684141c38f961fce99d17cfb3a83706fcd84ea10
2021-03-05 17:45:10 +00:00
Ioannis Ilkos ed7e71b67b Reorder swap field in killinfo am: 282437fbbe am: b26c239bd9 am: 76b91a1a15 am: 47878e1ebb
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1619719

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5487ff58c0cb6e4ae655aa52f19f6520b4636c23
2021-03-05 07:04:14 +00:00
Ioannis Ilkos 95667efce8 Reorder swap field in killinfo am: 282437fbbe am: b26c239bd9 am: 76b91a1a15 am: 47878e1ebb
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1619719

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I525415e8d90d8e1f09a48ee51056b80d52defed7
2021-03-05 07:04:14 +00:00
Ioannis Ilkos 47878e1ebb Reorder swap field in killinfo am: 282437fbbe am: b26c239bd9 am: 76b91a1a15
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1619719

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia04ebf15d391b1b114e720606f04560775027039
2021-03-05 06:22:44 +00:00
Ioannis Ilkos 76b91a1a15 Reorder swap field in killinfo am: 282437fbbe am: b26c239bd9
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1619719

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4923c5e286c873dcfcba276440f6aeb1e819b9a
2021-03-05 05:42:29 +00:00
Ioannis Ilkos b26c239bd9 Reorder swap field in killinfo am: 282437fbbe
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1619719

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fc10cfb4dfcee922cb43a11660538b974b9e2b9
2021-03-05 04:53:55 +00:00
Ioannis Ilkos 282437fbbe Reorder swap field in killinfo
Some tools might parse killinfo entries based on the field order. Move
the newly added swap field to the end to ensure compatibility.

Test: build
Change-Id: Id6dad850beba6835f061da95e84190d00a1b26a0
2021-03-04 17:50:05 +00:00
Ioannis Ilkos c7fb95915f Log killed process swap size am: 4884890305 am: bd6991af02 am: f69765b15a am: 2f24fff28a
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1595271

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic78a67ef3e927dae8d711dc3caa031a6ca272434
2021-02-26 21:59:57 +00:00
Ioannis Ilkos 447a46349d Log killed process swap size am: 4884890305 am: bd6991af02 am: f69765b15a am: 2f24fff28a
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1595271

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9908987837d7f3317a6ba767c6ca9c18528cf07
2021-02-26 21:59:32 +00:00
Ioannis Ilkos 2f24fff28a Log killed process swap size am: 4884890305 am: bd6991af02 am: f69765b15a
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1595271

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56ef58881a886fe25d550ed3944f3bfc46573f08
2021-02-26 21:18:44 +00:00
Ioannis Ilkos f69765b15a Log killed process swap size am: 4884890305 am: bd6991af02
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1595271

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iedf9e57c6cfb1f55665b7e648e9ba5e691017374
2021-02-26 20:29:28 +00:00
Chris Morin 5fa20f25de Replace mentions of "oom_adj" with "oom_score_adj" am: 74b4df95b4 am: 2c432eaf62 am: 8ae13ca324 am: ca2012d0e8
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1607288

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75fa5b82483a095a97b30651aef7f611f35d6045
2021-02-26 19:37:27 +00:00
Chris Morin 5d3d99cdf6 Replace mentions of "oom_adj" with "oom_score_adj" am: 74b4df95b4 am: 2c432eaf62 am: 8ae13ca324 am: ca2012d0e8
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1607288

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5ba330b31a1e2f484203ad4b2474e9f108ebfde
2021-02-26 19:35:59 +00:00
Ioannis Ilkos bd6991af02 Log killed process swap size am: 4884890305
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1595271

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57719767560f040d95508b86719ab4ee92cde599
2021-02-26 19:11:07 +00:00
Chris Morin ca2012d0e8 Replace mentions of "oom_adj" with "oom_score_adj" am: 74b4df95b4 am: 2c432eaf62 am: 8ae13ca324
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1607288

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I553ab21c2e461666414cdd43fe94601e6d3336b2
2021-02-26 18:56:53 +00:00
Chris Morin 8ae13ca324 Replace mentions of "oom_adj" with "oom_score_adj" am: 74b4df95b4 am: 2c432eaf62
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1607288

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f3dc88df88e2166c6e801ab66b7c1b1c095718b
2021-02-26 18:16:15 +00:00
Chris Morin 2c432eaf62 Replace mentions of "oom_adj" with "oom_score_adj" am: 74b4df95b4
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1607288

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25d37095e413f5e62f327f0275ae888ac7a1be41
2021-02-26 17:15:37 +00:00
Ioannis Ilkos 4884890305 Log killed process swap size
We already log the rss size for the process. Given lmkd strategies also consider low swap, it will be beneficial to record the swap size too.

Test: build, manual test
Change-Id: I923f733f7a3aa77fc5968827693b0fc085819174
2021-02-26 17:05:35 +00:00
Chris Morin 74b4df95b4 Replace mentions of "oom_adj" with "oom_score_adj"
Some log messages mention "oom_adj" instead of "oom_score_adj" when
referring to oom_score_adj. This is confusing because "oom_adj" is a
separate value which was supplanted by oom_score_adj, but can still be
used.

Test: trigger memory pressure and view logs
Change-Id: I23825083cecfff6bd32bfb39c6dac1f2b17a72a7
2021-02-26 00:07:16 -08:00
Xin Li 2bbb44e3cd [automerger skipped] Mark ab/7061308 as merged in stage. am: b88ab3d63f -s ours am: 93f513941c -s ours am: 4bad06df3e -s ours
am skip reason: Change-Id Iaf7197de5b8b1632357d239aedc58589dfa01ca8 with SHA-1 019502f8ff is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0871dec7097aff925697b2e93c2a708b18f472a6
2021-02-20 12:01:10 +00:00
Xin Li e88ce23a6e [automerger skipped] Mark ab/7061308 as merged in stage. am: b88ab3d63f -s ours am: 93f513941c -s ours am: 4bad06df3e -s ours
am skip reason: Change-Id Iaf7197de5b8b1632357d239aedc58589dfa01ca8 with SHA-1 019502f8ff is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ddf84acd974db38b561ebf880b988445ba7b2a3
2021-02-20 11:57:34 +00:00
Xin Li 4bad06df3e [automerger skipped] Mark ab/7061308 as merged in stage. am: b88ab3d63f -s ours am: 93f513941c -s ours
am skip reason: Change-Id Iaf7197de5b8b1632357d239aedc58589dfa01ca8 with SHA-1 019502f8ff is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5eaeeb53a9240d39040afbcf102fb7acdd7c7fc
2021-02-20 10:11:15 +00:00
Xin Li 93f513941c [automerger skipped] Mark ab/7061308 as merged in stage. am: b88ab3d63f -s ours
am skip reason: Change-Id Iaf7197de5b8b1632357d239aedc58589dfa01ca8 with SHA-1 019502f8ff is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d3d72caea3176493f55efa85c643e0e12b796ad
2021-02-20 09:30:00 +00:00
Xin Li b88ab3d63f Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: Iaf7197de5b8b1632357d239aedc58589dfa01ca8
Change-Id: Ief78eca564efa0a41297a15c21f7e8e14fe57bdf
2021-02-20 00:24:41 -08:00
Bob Badour 6ccdaa69bf [LSC] Add LOCAL_LICENSE_KINDS to system/memory/lmkd am: 0bc044bc32 am: 04cea7c607 am: bcdf5072a2 am: 1b69602dd5
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1589007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e20c54be5bd0a4c197824ba2cc3f8350556d9fd
2021-02-16 20:11:37 +00:00
Bob Badour 29a42a720f [LSC] Add LOCAL_LICENSE_KINDS to system/memory/lmkd am: 0bc044bc32 am: 04cea7c607 am: bcdf5072a2 am: 1b69602dd5
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1589007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic039630f7c87f10dfd5e44c54a2c0e15fa53c411
2021-02-16 20:08:17 +00:00
Bob Badour 1b69602dd5 [LSC] Add LOCAL_LICENSE_KINDS to system/memory/lmkd am: 0bc044bc32 am: 04cea7c607 am: bcdf5072a2
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1589007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04c7db56eca4a5497bf36e7db7cec5543d608b11
2021-02-16 19:41:23 +00:00
Bob Badour bcdf5072a2 [LSC] Add LOCAL_LICENSE_KINDS to system/memory/lmkd am: 0bc044bc32 am: 04cea7c607
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1589007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebc769459ca7acd508c9d84f7af4895abbc6905c
2021-02-16 18:48:28 +00:00
Bob Badour 04cea7c607 [LSC] Add LOCAL_LICENSE_KINDS to system/memory/lmkd am: 0bc044bc32
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1589007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e0fd1880b7b45a980877b88ac26c53763b8e340
2021-02-16 18:18:47 +00:00
Bob Badour 0bc044bc32 [LSC] Add LOCAL_LICENSE_KINDS to system/memory/lmkd
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  libpsi/Android.bp
  tests/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I5fed190764c763388c50c2fea58c5c421579bd30
2021-02-12 18:10:32 -08:00
Suren Baghdasaryan bf5168f54e lmkd_test: remove memcg creation on non-AndroidGo devices am: d7146e0f54 am: 475a02ffac am: 2db83f29b7
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1556790

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3aec86481552556922a4ef78320c5244ce7d35bf
2021-01-22 20:07:50 +00:00
Suren Baghdasaryan 2db83f29b7 lmkd_test: remove memcg creation on non-AndroidGo devices am: d7146e0f54 am: 475a02ffac
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1556790

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If82deacac7b7ef0a4569042c12e4c72f681085f0
2021-01-22 19:30:48 +00:00
Suren Baghdasaryan 475a02ffac lmkd_test: remove memcg creation on non-AndroidGo devices am: d7146e0f54
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1556790

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb5b2ab44681912dd7f70679f3c350f6b27b0be4
2021-01-22 19:10:26 +00:00
Suren Baghdasaryan d7146e0f54 lmkd_test: remove memcg creation on non-AndroidGo devices
Memory cgroups are disabled on non-AndroidGo devices. Change the test
not to fail due to missing in-kernel memory cgroup support.

Bug: 172296409
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I35d724c23c22e97458976c1cad45fe9d993326f9
2021-01-21 22:37:03 +00:00
Ioannis Ilkos 96bdb5f001 Change lmkd defaults for statsd events am: dab3944256 am: ae7021b38f am: 3236ba21dd
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1555318

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6c8ec936f142c83c709e02e2c8f8aedf78346ad
2021-01-21 01:48:03 +00:00
Ioannis Ilkos 3236ba21dd Change lmkd defaults for statsd events am: dab3944256 am: ae7021b38f
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1555318

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia289cf09f63d9d2cc1830b46664d74fb9809c90c
2021-01-21 01:17:32 +00:00
Ioannis Ilkos ae7021b38f Change lmkd defaults for statsd events am: dab3944256
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1555318

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07d9136c5bb3467f6538b8d91a952d0a32db4fcf
2021-01-21 00:58:30 +00:00
Ioannis Ilkos dab3944256 Change lmkd defaults for statsd events
LMK events are an important platform memory monitoring signal. Enable
them by default.
Changes:
- Compile lmkd with statsd by default
- Signal lmkd by default

Test: build, statsd cts
Bug: 177985094
Change-Id: I070660767db6e3bc8926ff82b64b99c7ee9a0108
2021-01-20 20:08:19 +00:00
Treehugger Robot 1584dac7d7 Merge "lmkd: Add clang format symlink" am: 9fc38629dc am: b7315ea3b6 am: 019502f8ff
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1510010

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide6c926ecc5ec15a0999a2be1aa51eb3f04f10cc
2020-12-30 20:54:19 +00:00
Treehugger Robot 019502f8ff Merge "lmkd: Add clang format symlink" am: 9fc38629dc am: b7315ea3b6
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1510010

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf7197de5b8b1632357d239aedc58589dfa01ca8
2020-12-30 20:18:48 +00:00
Treehugger Robot b7315ea3b6 Merge "lmkd: Add clang format symlink" am: 9fc38629dc
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1510010

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0aabdfd37af4d3d128d592a0dbbcf275ed98663
2020-12-30 19:52:48 +00:00
Treehugger Robot 9fc38629dc Merge "lmkd: Add clang format symlink" 2020-12-30 19:38:28 +00:00
Suren Baghdasaryan 24ede1569c lmkd: Handle workingset_refault vmstat field change in 5.9 kernel am: dc60f9717b am: fcebcf44c3 am: e82fa8c9a0
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1528739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc785198e51164cc0c9fd73a3175ec0480ee0e9e
2020-12-15 02:15:52 +00:00
Suren Baghdasaryan a41843a95a lmkd: Remove unused workingset_refault parsing from zoneinfo am: 9f8d3dec72 am: a723c343d2 am: d689fdd8d4
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1528738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f09e4e6519fb174ff4162fb7c9d596c6b95cbdb
2020-12-15 02:15:51 +00:00
Suren Baghdasaryan e82fa8c9a0 lmkd: Handle workingset_refault vmstat field change in 5.9 kernel am: dc60f9717b am: fcebcf44c3
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1528739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa11e51578b8ce4a96c18680360f51e3b902a0f3
2020-12-15 02:00:59 +00:00
Suren Baghdasaryan d689fdd8d4 lmkd: Remove unused workingset_refault parsing from zoneinfo am: 9f8d3dec72 am: a723c343d2
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/1528738

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic88201a020a6eda7fe905fd4ac1f3df0e89d6b15
2020-12-15 02:00:58 +00:00