Commit 5dcad506 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-6.3-fixes' into for-6.4 

To receive 292fd843 ("cgroup/cpuset: Fix partition root's cpuset.cpus
update bug") in preparation for further cpuset updates.
parents 8e464522 292fd843

kernel/cgroup/cpuset.c

+10 −2
Original line number Diff line number Diff line
@@ -1513,7 +1513,7 @@ static int update_parent_subparts_cpumask(struct cpuset *cs, int cmd, 
	spin_unlock_irq(&callback_lock);



	if (adding || deleting)

		update_tasks_cpumask(parent, tmp->new_cpus);

		update_tasks_cpumask(parent, tmp->addmask);



	/*

	 * Set or clear CS_SCHED_LOAD_BALANCE when partcmd_update, if necessary.
@@ -1770,10 +1770,13 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs, 
	/*

	 * Use the cpumasks in trialcs for tmpmasks when they are pointers

	 * to allocated cpumasks.

	 *

	 * Note that update_parent_subparts_cpumask() uses only addmask &

	 * delmask, but not new_cpus.

	 */

	tmp.addmask  = trialcs->subparts_cpus;

	tmp.delmask  = trialcs->effective_cpus;

	tmp.new_cpus = trialcs->cpus_allowed;

	tmp.new_cpus = NULL;

#endif



	retval = validate_change(cs, trialcs);
@@ -1838,6 +1841,11 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs, 
	}

	spin_unlock_irq(&callback_lock);



#ifdef CONFIG_CPUMASK_OFFSTACK

	/* Now trialcs->cpus_allowed is available */

	tmp.new_cpus = trialcs->cpus_allowed;

#endif



	/* effective_cpus will be updated here */

	update_cpumasks_hier(cs, &tmp, false);

kernel/cgroup/rstat.c

+1 −3
Original line number Diff line number Diff line
@@ -457,9 +457,7 @@ static void root_cgroup_cputime(struct cgroup_base_stat *bstat) 
	struct task_cputime *cputime = &bstat->cputime;

	int i;



	cputime->stime = 0;

	cputime->utime = 0;

	cputime->sum_exec_runtime = 0;

	memset(bstat, 0, sizeof(*bstat));

	for_each_possible_cpu(i) {

		struct kernel_cpustat kcpustat;

		u64 *cpustat = kcpustat.cpustat;