Unverified Commit 8219f83f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9380 psi: using cpuacct_cgrp_id under CONFIG_CGROUP_CPUACCT 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KFMKOS225NVO3MU273D3SEZYHVSIUHVI/ 
*** BLURB HERE ***

Joseph Qi (1):
  psi: using cpuacct_cgrp_id under CONFIG_CGROUP_CPUACCT


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I4OF4N 
 
Link:https://gitee.com/openeuler/kernel/pulls/9380

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 6f400523 0ff48aa3

kernel/sched/psi.c

+4 −0
Original line number Diff line number Diff line
@@ -1114,12 +1114,16 @@ static inline struct psi_group *task_psi_group(struct task_struct *task) 
#ifdef CONFIG_CGROUPS

	if (static_branch_likely(&psi_cgroups_enabled)) {

		if (task_is_in_psi_v1()) {

#if defined(CONFIG_CGROUP_CPUACCT)

			struct cgroup *cgroup;



			rcu_read_lock();

			cgroup = task_cgroup(task, cpuacct_cgrp_id);

			rcu_read_unlock();

			return cgroup_psi(cgroup);

#else

			return &psi_system;

#endif

		}

		return cgroup_psi(task_dfl_cgroup(task));

	}