Commit 1d213767 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fixes from Borislav Petkov:

 - Properly init uclamp_flags of a runqueue, on first enqueuing

 - Fix preempt= callback return values

 - Correct utime/stime resource usage reporting on nohz_full to return
   the proper times instead of shorter ones

* tag 'sched_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/uclamp: Fix rq->uclamp_max not set on first enqueue
  preempt/dynamic: Fix setup_preempt_mode() return value
  sched/cputime: Fix getrusage(RUSAGE_THREAD) with nohz_full
parents f5d54a42 315c4f88

include/linux/sched/cputime.h

+3 −2
Original line number Diff line number Diff line
@@ -18,15 +18,16 @@ 
#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */



#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN

extern void task_cputime(struct task_struct *t,

extern bool task_cputime(struct task_struct *t,

			 u64 *utime, u64 *stime);

extern u64 task_gtime(struct task_struct *t);

#else

static inline void task_cputime(struct task_struct *t,

static inline bool task_cputime(struct task_struct *t,

				u64 *utime, u64 *stime)

{

	*utime = t->utime;

	*stime = t->stime;

	return false;

}



static inline u64 task_gtime(struct task_struct *t)

kernel/sched/core.c

+3 −3
Original line number Diff line number Diff line
@@ -1918,7 +1918,7 @@ static void __init init_uclamp_rq(struct rq *rq) 
		};

	}



	rq->uclamp_flags = 0;

	rq->uclamp_flags = UCLAMP_FLAG_IDLE;

}



static void __init init_uclamp(void)
@@ -6617,11 +6617,11 @@ static int __init setup_preempt_mode(char *str) 
	int mode = sched_dynamic_mode(str);

	if (mode < 0) {

		pr_warn("Dynamic Preempt: unsupported mode: %s\n", str);

		return 1;

		return 0;

	}



	sched_dynamic_update(mode);

	return 0;

	return 1;

}

__setup("preempt=", setup_preempt_mode);

kernel/sched/cputime.c

+9 −3
Original line number Diff line number Diff line
@@ -615,7 +615,8 @@ void task_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st) 
		.sum_exec_runtime = p->se.sum_exec_runtime,

	};



	task_cputime(p, &cputime.utime, &cputime.stime);

	if (task_cputime(p, &cputime.utime, &cputime.stime))

		cputime.sum_exec_runtime = task_sched_runtime(p);

	cputime_adjust(&cputime, &p->prev_cputime, ut, st);

}

EXPORT_SYMBOL_GPL(task_cputime_adjusted);
@@ -828,19 +829,21 @@ u64 task_gtime(struct task_struct *t) 
 * add up the pending nohz execution time since the last

 * cputime snapshot.

 */

void task_cputime(struct task_struct *t, u64 *utime, u64 *stime)

bool task_cputime(struct task_struct *t, u64 *utime, u64 *stime)

{

	struct vtime *vtime = &t->vtime;

	unsigned int seq;

	u64 delta;

	int ret;



	if (!vtime_accounting_enabled()) {

		*utime = t->utime;

		*stime = t->stime;

		return;

		return false;

	}



	do {

		ret = false;

		seq = read_seqcount_begin(&vtime->seqcount);



		*utime = t->utime;
@@ -850,6 +853,7 @@ void task_cputime(struct task_struct *t, u64 *utime, u64 *stime) 
		if (vtime->state < VTIME_SYS)

			continue;



		ret = true;

		delta = vtime_delta(vtime);



		/*
@@ -861,6 +865,8 @@ void task_cputime(struct task_struct *t, u64 *utime, u64 *stime) 
		else

			*utime += vtime->utime + delta;

	} while (read_seqcount_retry(&vtime->seqcount, seq));



	return ret;

}



static int vtime_state_fetch(struct vtime *vtime, int cpu)