Commit b266165b authored by Juri Lelli's avatar Juri Lelli Committed by sanglipeng
Browse files

sched/cpuset: Keep track of SCHED_DEADLINE task in cpusets 

stable inclusion
from stable-v5.10.193
commit 5ac05ce5684315d0e71194a63febaf33921c3268
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9399M

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=5ac05ce5684315d0e71194a63febaf33921c3268



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

commit 6c24849f upstream.

Qais reported that iterating over all tasks when rebuilding root domains
for finding out which ones are DEADLINE and need their bandwidth
correctly restored on such root domains can be a costly operation (10+
ms delays on suspend-resume).

To fix the problem keep track of the number of DEADLINE tasks belonging
to each cpuset and then use this information (followup patch) to only
perform the above iteration if DEADLINE tasks are actually present in
the cpuset for which a corresponding root domain is being rebuilt.

Reported-by: default avatarQais Yousef (Google) <qyousef@layalina.io>
Link: https://lore.kernel.org/lkml/20230206221428.2125324-1-qyousef@layalina.io/


Signed-off-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Reviewed-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
[ Fix conflicts in kernel/cgroup/cpuset.c and kernel/sched/deadline.c
  due to pulling new fields and functions. Remove new code and match the
  patch diff. ]
Signed-off-by: default avatarQais Yousef (Google) <qyousef@layalina.io>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>

Conflicts:
	kernel/cgroup/cpuset.c
parent ca615618

include/linux/cpuset.h

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ extern void cpuset_init_smp(void); 
extern void cpuset_force_rebuild(void);

extern void cpuset_update_active_cpus(void);

extern void cpuset_wait_for_hotplug(void);

extern void inc_dl_tasks_cs(struct task_struct *task);

extern void dec_dl_tasks_cs(struct task_struct *task);

extern void cpuset_lock(void);

extern void cpuset_unlock(void);

extern void cpuset_cpus_allowed(struct task_struct *p, struct cpumask *mask);
@@ -178,6 +180,8 @@ static inline void cpuset_update_active_cpus(void) 


static inline void cpuset_wait_for_hotplug(void) { }



static inline void inc_dl_tasks_cs(struct task_struct *task) { }

static inline void dec_dl_tasks_cs(struct task_struct *task) { }

static inline void cpuset_lock(void) { }

static inline void cpuset_unlock(void) { }

kernel/cgroup/cgroup.c

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <linux/file.h>

#include <linux/fs_parser.h>

#include <linux/sched/cputime.h>

#include <linux/sched/deadline.h>

#include <linux/psi.h>

#include <linux/dynamic_hugetlb.h>

#include <net/sock.h>
@@ -6586,6 +6587,9 @@ void cgroup_exit(struct task_struct *tsk) 
	list_add_tail(&tsk->cg_list, &cset->dying_tasks);

	cset->nr_tasks--;



	if (dl_task(tsk))

		dec_dl_tasks_cs(tsk);



	WARN_ON_ONCE(cgroup_task_frozen(tsk));

	if (unlikely(cgroup_task_freeze(tsk)))

		cgroup_update_frozen(task_dfl_cgroup(tsk));

kernel/cgroup/cpuset.c

+25 −0
Original line number Diff line number Diff line
@@ -166,6 +166,12 @@ struct cpuset { 
	int use_parent_ecpus;

	int child_ecpus_count;



	/*

	 * number of SCHED_DEADLINE tasks attached to this cpuset, so that we

	 * know when to rebuild associated root domain bandwidth information.

	 */

	int nr_deadline_tasks;



	KABI_RESERVE(1)

	KABI_RESERVE(2)

	KABI_RESERVE(3)
@@ -218,6 +224,20 @@ static inline struct cpuset *parent_cs(struct cpuset *cs) 
	return css_cs(cs->css.parent);

}



void inc_dl_tasks_cs(struct task_struct *p)

{

	struct cpuset *cs = task_cs(p);



	cs->nr_deadline_tasks++;

}



void dec_dl_tasks_cs(struct task_struct *p)

{

	struct cpuset *cs = task_cs(p);



	cs->nr_deadline_tasks--;

}



/* bits in struct cpuset flags field */

typedef enum {

	CS_ONLINE,
@@ -2280,6 +2300,11 @@ static int cpuset_can_attach(struct cgroup_taskset *tset) 
		ret = security_task_setscheduler(task);

		if (ret)

			goto out_unlock;



		if (dl_task(task)) {

			cs->nr_deadline_tasks++;

			cpuset_attach_old_cs->nr_deadline_tasks--;

		}

	}



	/*

kernel/sched/deadline.c

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 */

#include "sched.h"

#include "pelt.h"

#include <linux/cpuset.h>



struct dl_bandwidth def_dl_bandwidth;
@@ -2413,6 +2414,12 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p) 
	if (task_on_rq_queued(p) && p->dl.dl_runtime)

		task_non_contending(p);



	/*

	 * In case a task is setscheduled out from SCHED_DEADLINE we need to

	 * keep track of that on its cpuset (for correct bandwidth tracking).

	 */

	dec_dl_tasks_cs(p);



	if (!task_on_rq_queued(p)) {

		/*

		 * Inactive timer is armed. However, p is leaving DEADLINE and
@@ -2453,6 +2460,12 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p) 
	if (hrtimer_try_to_cancel(&p->dl.inactive_timer) == 1)

		put_task_struct(p);



	/*

	 * In case a task is setscheduled to SCHED_DEADLINE we need to keep

	 * track of that on its cpuset (for correct bandwidth tracking).

	 */

	inc_dl_tasks_cs(p);



	/* If p is not queued we will update its parameters at next wakeup. */

	if (!task_on_rq_queued(p)) {

		add_rq_bw(&p->dl, &rq->dl);