Commit 0ff48aa3 authored by Joseph Qi's avatar Joseph Qi Committed by Chen Ridong
Browse files

psi: using cpuacct_cgrp_id under CONFIG_CGROUP_CPUACCT 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4OF4N



------------------------------------------

Fix the build error if CONFIG_CGROUP_CPUACCT is not enabled.

Fixes: 2dfc29e7 ("sched/psi: Export cgroup psi from cgroupv2 to cgroupv1")
Signed-off-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: default avatarXunlei Pang <xlpang@linux.alibaba.com>
Signed-off-by: default avatarChen Wandun <chenwandun@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarChen Ridong <chenridong@huawei.com>
parent 89d7d78e

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));

	}