From 556740ef0479659411bfc87175c8087c177b180d Mon Sep 17 00:00:00 2001 From: Kameron Lutes Date: Wed, 15 Mar 2023 16:36:55 +0900 Subject: [PATCH] lmkd: Send Actual OOM Score to lmkd_free_memory_before_kill_hook Previously the min_oom score of the candidate search was sent to lmkd_free_memory_before_kill_hook. This is incorrect as the hook expects the actual oom score of the process. Bug: b/273670531 Test: cq Change-Id: Id72c8b39f9c745a8f20fde15266857cb2d2222bf --- lmkd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lmkd.cpp b/lmkd.cpp index d25545f..fcb06fe 100644 --- a/lmkd.cpp +++ b/lmkd.cpp @@ -2348,7 +2348,7 @@ static int kill_one_process(struct proc* procp, int min_oom_score, struct kill_i snprintf(desc, sizeof(desc), "lmk,%d,%d,%d,%d,%d", pid, ki ? (int)ki->kill_reason : -1, procp->oomadj, min_oom_score, ki ? ki->max_thrashing : -1); - result = lmkd_free_memory_before_kill_hook(procp, rss_kb / page_k, min_oom_score, + result = lmkd_free_memory_before_kill_hook(procp, rss_kb / page_k, procp->oomadj, ki ? (int)ki->kill_reason : -1); if (result > 0) { /*