tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: cgroup: Add vendor hook for cpuset.

Browse Source 
This hook allows us to capture information when a process is forked so
that we can stat and set some key task's CPU affinity in the ko module
later. This patch, along with aosp/2548175, is necessary for our
affinity settings.

Bug: 425550656
Bug: 339371220
Bug: 183674818

Signed-off-by: lijianzhong <lijianzhong@xiaomi.com>
Change-Id: Ib93e05e5f6c338c5f7ada56bfebdd705f87f1f66
(cherry picked from commit a188361628461c58a4dfc72869d9acb1dfa2542f)
(cherry picked from commit 02992f5b8d68424ba34e1f905c3bde3b72aade88)
This commit is contained in:
lijianzhong
2021-03-23 20:31:45 +08:00
committed by Treehugger Robot
parent 478166f75c
commit 5111c39916
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/android/vendor_hooks.c
+1
View File
@@ -567,3 +567,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_pr_set_vma_name_bypass);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mem_cgroup_charge); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mem_cgroup_charge);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_filemap_add_folio); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_filemap_add_folio);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_node); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_shrink_node);
EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpuset_fork);
include/trace/hooks/cgroup.h
+4
View File
@@ -19,6 +19,10 @@ DECLARE_HOOK(android_vh_cgroup_attach,
TP_PROTO(struct cgroup_subsys *ss, struct cgroup_taskset *tset), TP_PROTO(struct cgroup_subsys *ss, struct cgroup_taskset *tset),
TP_ARGS(ss, tset)); TP_ARGS(ss, tset));
DECLARE_RESTRICTED_HOOK(android_rvh_cpuset_fork,
TP_PROTO(struct task_struct *p, bool *inherit_cpus),
TP_ARGS(p, inherit_cpus), 1);
DECLARE_RESTRICTED_HOOK(android_rvh_cpu_cgroup_attach, DECLARE_RESTRICTED_HOOK(android_rvh_cpu_cgroup_attach,
TP_PROTO(struct cgroup_taskset *tset), TP_PROTO(struct cgroup_taskset *tset),
TP_ARGS(tset), 1); TP_ARGS(tset), 1);
kernel/cgroup/cpuset.c
+6 -4
View File
@@ -43,6 +43,8 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <trace/hooks/sched.h> #include <trace/hooks/sched.h>
#include <trace/hooks/cgroup.h>
DEFINE_STATIC_KEY_FALSE(cpusets_pre_enable_key); DEFINE_STATIC_KEY_FALSE(cpusets_pre_enable_key);
DEFINE_STATIC_KEY_FALSE(cpusets_enabled_key); DEFINE_STATIC_KEY_FALSE(cpusets_enabled_key);
@@ -3614,18 +3616,18 @@ static void cpuset_cancel_fork(struct task_struct *task, struct css_set *cset)
static void cpuset_fork(struct task_struct *task) static void cpuset_fork(struct task_struct *task)
{ {
struct cpuset *cs; struct cpuset *cs;
bool same_cs; bool same_cs, inherit_cpus = false;
rcu_read_lock(); rcu_read_lock();
cs = task_cs(task); cs = task_cs(task);
same_cs = (cs == task_cs(current)); same_cs = (cs == task_cs(current));
rcu_read_unlock(); rcu_read_unlock();
if (same_cs) { if (same_cs) {
if (cs == &top_cpuset) if (cs == &top_cpuset)
return; return;
trace_android_rvh_cpuset_fork(task, &inherit_cpus);
set_cpus_allowed_ptr(task, current->cpus_ptr); if (!inherit_cpus)
set_cpus_allowed_ptr(task, current->cpus_ptr);
task->mems_allowed = current->mems_allowed; task->mems_allowed = current->mems_allowed;
return; return;
} }