commit 0195bcdba7100c449ed56688121b06c6d699b4d4
author Wei Wang <wvw@google.com> Mon Sep 13 17:59:05 2021 -0700
committer Wei Wang <wvw@google.com> Mon Sep 13 19:07:26 2021 -0700
tree 1ddeb9fad72422eb188e4c768dc61a9ec2aa2be9
parent 0e64eadc213a9f15ee9d6714830021a674998c06

lmkd: migrate process to FOREGROUND sched group before kill

BG group may have settings such as cpu.shares impacting reclaim
performance. Let us migrate task to foreground sched group similarly to
cpuset group.

Test: Build
Bug: 199797672
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: I75ee9f3486a2c76e65267a98e39edff96a5e1673

lmkd.cpp

diff --git a/lmkd.cpp b/lmkd.cpp
index 4e4490f..eb3f25a 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -40,7 +40,6 @@
 #include <unistd.h>
 
 #include <cutils/properties.h>
-#include <cutils/sched_policy.h>
 #include <cutils/sockets.h>
 #include <liblmkd_utils.h>
 #include <lmkd.h>
@@ -48,6 +47,7 @@
 #include <log/log_event_list.h>
 #include <log/log_time.h>
 #include <private/android_filesystem_config.h>
+#include <processgroup/processgroup.h>
 #include <psi/psi.h>
 #include <system/thread_defs.h>
 
@@ -2008,7 +2008,8 @@
     return maxprocp;
 }
 
-static void set_process_group_and_prio(int pid, SchedPolicy sp, int prio) {
+static void set_process_group_and_prio(int pid, const std::vector<std::string>& profiles,
+                                       int prio) {
     DIR* d;
     char proc_path[PATH_MAX];
     struct dirent* de;
@@ -2035,8 +2036,8 @@
             ALOGW("Unable to raise priority of killing t_pid (%d): errno=%d", t_pid, errno);
         }
 
-        if (set_cpuset_policy(t_pid, sp)) {
-            ALOGW("Failed to set_cpuset_policy on pid(%d) t_pid(%d) to %d", pid, t_pid, (int)sp);
+        if (!SetTaskProfiles(t_pid, profiles)) {
+            ALOGW("Failed to set task_profiles on pid(%d) t_pid(%d)", pid, t_pid);
             continue;
         }
     }
@@ -2207,7 +2208,8 @@
         goto out;
     }
 
-    set_process_group_and_prio(pid, SP_FOREGROUND, ANDROID_PRIORITY_HIGHEST);
+    set_process_group_and_prio(pid, {"CPUSET_SP_BACKGROUND", "SCHED_SP_FOREGROUND"},
+                               ANDROID_PRIORITY_HIGHEST);
 
     last_kill_tm = *tm;