Commit Graph

782 Commits

Author SHA1 Message Date
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 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 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 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 442b9d0f39 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba am: d6d8a3dc55 am: c9e47704a9 am: 5d843e85e4
Change-Id: Iee45beb3b537d8485a387946d6f66ec34750fdfa
2020-05-20 21:54:49 +00:00
Suren Baghdasaryan 1907d65f3a [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 skip reason: Change-Id I443486763c034ed0603ea52b81c060c3969af9a5 with SHA-1 c2b228e498 is in history

Change-Id: I094b6de4d5d04b24e7ae6c8a6ee6fca511fe15a7
2020-05-20 21:54:48 +00:00
Suren Baghdasaryan 70b93485e3 [automerger skipped] lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8 am: d9ba0c99ae -s ours am: e58fd35c27 -s ours am: 6e7368e80c -s ours
am skip reason: Change-Id If187654b8001ce843ec6085ccd2042d75a986dae with SHA-1 0e589f61ba is in history

Change-Id: I75e2dbd29d1854038c930e6692edc7d95e8149ec
2020-05-20 21:54:46 +00:00
Suren Baghdasaryan 5d843e85e4 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba am: d6d8a3dc55 am: c9e47704a9
Change-Id: Ie06f0ad716299660380a13fedfc878194afcc32f
2020-05-20 21:38:13 +00:00
Suren Baghdasaryan 7263dd1a1c [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 skip reason: Change-Id I443486763c034ed0603ea52b81c060c3969af9a5 with SHA-1 c2b228e498 is in history

Change-Id: I16423e56f3e6fb693b5fa285b03a94763fe90990
2020-05-20 21:38:13 +00:00
Suren Baghdasaryan 6e7368e80c [automerger skipped] lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8 am: d9ba0c99ae -s ours am: e58fd35c27 -s ours
am skip reason: Change-Id If187654b8001ce843ec6085ccd2042d75a986dae with SHA-1 0e589f61ba is in history

Change-Id: I465380f7a63d085ab082582d6a0cf2a3a2527e77
2020-05-20 21:38:12 +00:00
Suren Baghdasaryan c9e47704a9 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba am: d6d8a3dc55
Change-Id: I8d6a9376c361279c9833b19afdaac5a83d8a9f2a
2020-05-20 21:25:29 +00:00
Suren Baghdasaryan 16657a940d [automerger skipped] lmkd: Set the default free swap threshold to 10% for all devices am: fb1f592602 am: 5132481e15 -s ours
am skip reason: Change-Id I443486763c034ed0603ea52b81c060c3969af9a5 with SHA-1 c2b228e498 is in history

Change-Id: I320b9b413fddfcc2ddd5dfbe2a3683dc5e5abae9
2020-05-20 21:25:27 +00:00
Suren Baghdasaryan e58fd35c27 [automerger skipped] lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8 am: d9ba0c99ae -s ours
am skip reason: Change-Id If187654b8001ce843ec6085ccd2042d75a986dae with SHA-1 0e589f61ba is in history

Change-Id: I007c16b6a8bc5de7a906b8ab4424d42212f5b3ce
2020-05-20 21:25:25 +00:00
Suren Baghdasaryan d6d8a3dc55 lmkd: Do not kill perceptible apps due to low swap if above min wmark am: 48135c4cba
Change-Id: I3ba7b9a0cab86a185cfc3c6d9f23d5ad677a0251
2020-05-20 20:59:14 +00:00
Suren Baghdasaryan 5132481e15 lmkd: Set the default free swap threshold to 10% for all devices am: fb1f592602
Change-Id: I52ada975e99ccf8d26091afbc8953ee40c491fd5
2020-05-20 20:59:13 +00:00
Suren Baghdasaryan d9ba0c99ae lmkd: Fix min_score_adj to exclude killing foreground processes am: 5c039b53d8
Change-Id: Iebe3f5c02c882cc47e5fb25cd14bff4ee9667482
2020-05-20 20:59:11 +00:00
Suren Baghdasaryan 7afa463978 lmkd: Do not kill perceptible apps due to low swap if above min wmark
Prevent kills of perceptible apps due to swap shortages unless system
free memory is below the min watermark. This prevents kills of important
apps when the system is recovering from the memory pressure.

Bug: 155709603
Test: memory stress test with multiple foreground apps
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Merged-In: I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1
Change-Id: I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1
2020-05-20 20:48:06 +00:00
Suren Baghdasaryan b2dabba6a7 lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: deee65f222 am: 181ec2d13d
Change-Id: Id0067a07d68e58ec060c85fc17eab2ed0faa8143
2020-05-20 19:30:02 +00:00
Suren Baghdasaryan e26720e460 lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 025396b2c2 am: 95b5673a5d
Change-Id: I41532b8ac4f46d884b4c02ca111aaf19b0efbf72
2020-05-20 19:29:37 +00:00
Suren Baghdasaryan e7f5cc3236 lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: b0027daa8a am: 7f2ddf5ff0
Change-Id: I8b51e11c8d04f79e9dbf04e4e18bdd9738d4fcbe
2020-05-20 19:29:31 +00:00
Automerger Merge Worker c06ec0dda1 Merge "lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 3125ebc794 am: 4ad5bad680" into rvc-qpr-dev-plus-aosp 2020-05-20 19:28:05 +00:00
Suren Baghdasaryan 4b3f883545 lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: b0027daa8a am: 10be4c368e
Change-Id: Iac5ec8a8bc5795a65f3677c8e75d622d5e203404
2020-05-20 19:28:00 +00:00
Suren Baghdasaryan d8ea75515b lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 3125ebc794 am: 4ad5bad680
Change-Id: I320e7252e9552dbcf6eceaa7922cee84c9ff2132
2020-05-20 19:28:00 +00:00
Suren Baghdasaryan 0a6313b062 lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 3125ebc794 am: 0b210fe185
Change-Id: I1ee3a825afe27d569a6394ee8ce3bfb0a6da6ac5
2020-05-20 19:27:40 +00:00
Suren Baghdasaryan 48135c4cba lmkd: Do not kill perceptible apps due to low swap if above min wmark
Prevent kills of perceptible apps due to swap shortages unless system
free memory is below the min watermark. This prevents kills of important
apps when the system is recovering from the memory pressure.

Bug: 155709603
Test: memory stress test with multiple foreground apps
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I6beb4b55f8b4f7bc22818b5a7bdfa3adc6cd31c1
2020-05-20 12:22:07 -07:00
Suren Baghdasaryan fb1f592602 lmkd: Set the default free swap threshold to 10% for all devices
Lower the min swap threshold to 10% for all devices to limit kills while
swap still has enough space.

Bug: 155709603
Test: memory stress test with multiple foreground apps
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Merged-In: I443486763c034ed0603ea52b81c060c3969af9a5
Change-Id: I443486763c034ed0603ea52b81c060c3969af9a5
2020-05-20 12:21:34 -07:00
Suren Baghdasaryan 5c039b53d8 lmkd: Fix min_score_adj to exclude killing foreground processes
In the cases when foreground processes should not be killed
min_score_adjust should be set above PERCEPTIBLE_APP_ADJ to prevent such
kills.

Bug: 155709603
Test: memory stress test with multiple foreground apps
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Merged-In: If187654b8001ce843ec6085ccd2042d75a986dae
Change-Id: If187654b8001ce843ec6085ccd2042d75a986dae
2020-05-20 12:21:10 -07:00
Suren Baghdasaryan 181ec2d13d lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: deee65f222
Change-Id: I70e72054d67ec0cdf01df87cff2453d5ae4e7746
2020-05-20 19:17:34 +00:00
Suren Baghdasaryan 95b5673a5d lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 025396b2c2
Change-Id: I58c0ee0f8e1a4f9176749720bf6199912db20b49
2020-05-20 19:17:00 +00:00
Suren Baghdasaryan 7f2ddf5ff0 lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: b0027daa8a
Change-Id: If41581e301554ecf24b97a89bb174303326a5c99
2020-05-20 19:16:25 +00:00
Suren Baghdasaryan 4ad5bad680 lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 3125ebc794
Change-Id: I5ae3a21e6cc9f61806a66ab995e101f16674cee7
2020-05-20 19:16:06 +00:00
Suren Baghdasaryan 10be4c368e lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498 am: b0027daa8a
Change-Id: I6e2a4793cf262628a6788d5c0ecae1b30919ec61
2020-05-20 19:16:03 +00:00
Suren Baghdasaryan 0b210fe185 lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba am: 3125ebc794
Change-Id: I2c718dfb23f06010ce56c7bb9f8fdc346523494e
2020-05-20 19:15:57 +00:00
Suren Baghdasaryan deee65f222 lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498
Change-Id: Ie1d59e0bd1b840a3cb6644682e69ae3a33b7206e
2020-05-20 18:59:54 +00:00
Suren Baghdasaryan 025396b2c2 lmkd: Fix min_score_adj to exclude killing foreground processes am: 0e589f61ba
Change-Id: I06966970b96007f50689aa0b100cd11ef1f610a5
2020-05-20 18:59:49 +00:00
Suren Baghdasaryan b0027daa8a lmkd: Set the default free swap threshold to 10% for all devices am: c2b228e498
Change-Id: I750cb3aa52c7341374ed692040d9ff88b5ae907c
2020-05-20 18:59:48 +00:00