UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

- 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEzv7L6UO9uDPlPSfHEsHwGGHeVUoFAmGspTcACgkQEsHwGGHe
 VUqHhBAAhEd9DMoJwREKDCDMqc3pttNYpTpSVo1K6oBTsOh7mwEilPdlmsTl239V
 jRocVJST+/JmJ424j7t0Sp42tREMKNlbyf+ddvr0oUwi0mLUnN6J83NU4WK4Jisf
 gyXFIkeMR+/W6/LO7gDdq/+rlRDtJcllwHoOm1yyiy5Zc0qDrcy6CjgP5/9hEsh6
 xvRvPOXbeZZVA+a+n+G9xGN836aBe1VptoABbdAlOSTiOvAVkS95UCb9rfPTvMtq
 /71jjZMmhTxGUhg5oLpgvfRRZE608X6b2RCTcAPKa5mfMpN5YMQLcD9G0f8XZjkq
 iOO/+arE6XQJlTzhAEsGxkSXaVweYxRHHP1yAlWYlWV/xGhoaAyq/tXE1KusAnng
 16/eTbrPb1eawpI6p1AAScCQuF/TlYZCMqjbFVhViXM5Rkd6jrii9vz/JnkdokGR
 3TH0n4WAJkdZeg18WS3B0eIt6zDTvxbR9g5ap2/10xYnYHMNdHXGH8A+5Grw9/Ln
 Qsv0V43OjdUK2tVuIHYblx1X9dOlLdpTEg9FCfjiZTQVor1pTwcbG62qNMozanlf
 lQqI6f63E0jugHqhrqrfBvl4lUuoajN5SvXfBNFDIzxwWBGSdr+hJQXstUatfSZZ
 MdmJX+Dk5cAk4CpQQ1ofPvYkS3Ade0vxaL4H++KHYtRvpPvxCXA=
 =XQFF
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-12-05 08:53:31 -08:00
parent f5d54a42d3 315c4f8848
commit 1d213767dc
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/sched/cputime.h
View File

@ -18,15 +18,16 @@
#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ #endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN #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); u64 *utime, u64 *stime);
extern u64 task_gtime(struct task_struct *t); extern u64 task_gtime(struct task_struct *t);
#else #else
static inline void task_cputime(struct task_struct *t, static inline bool task_cputime(struct task_struct *t,
u64 *utime, u64 *stime) u64 *utime, u64 *stime)
{ {
*utime = t->utime; *utime = t->utime;
*stime = t->stime; *stime = t->stime;
return false;
} }
static inline u64 task_gtime(struct task_struct *t) static inline u64 task_gtime(struct task_struct *t)

6
kernel/sched/core.c
View File

@ -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) static void __init init_uclamp(void)
@ -6617,11 +6617,11 @@ static int __init setup_preempt_mode(char *str)
int mode = sched_dynamic_mode(str); int mode = sched_dynamic_mode(str);
if (mode < 0) { if (mode < 0) {
pr_warn("Dynamic Preempt: unsupported mode: %s\n", str); pr_warn("Dynamic Preempt: unsupported mode: %s\n", str);
return 1; return 0;
} }
sched_dynamic_update(mode); sched_dynamic_update(mode);
return 0; return 1;
} }
__setup("preempt=", setup_preempt_mode); __setup("preempt=", setup_preempt_mode);

12
kernel/sched/cputime.c
View File

@ -615,7 +615,8 @@ void task_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st)
.sum_exec_runtime = p->se.sum_exec_runtime, .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); cputime_adjust(&cputime, &p->prev_cputime, ut, st);
} }
EXPORT_SYMBOL_GPL(task_cputime_adjusted); 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 * add up the pending nohz execution time since the last
* cputime snapshot. * 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; struct vtime *vtime = &t->vtime;
unsigned int seq; unsigned int seq;
u64 delta; u64 delta;
int ret;
if (!vtime_accounting_enabled()) { if (!vtime_accounting_enabled()) {
*utime = t->utime; *utime = t->utime;
*stime = t->stime; *stime = t->stime;
return; return false;
} }
do { do {
ret = false;
seq = read_seqcount_begin(&vtime->seqcount); seq = read_seqcount_begin(&vtime->seqcount);
*utime = t->utime; *utime = t->utime;
@ -850,6 +853,7 @@ void task_cputime(struct task_struct *t, u64 *utime, u64 *stime)
if (vtime->state < VTIME_SYS) if (vtime->state < VTIME_SYS)
continue; continue;
ret = true;
delta = vtime_delta(vtime); delta = vtime_delta(vtime);
/* /*
@ -861,6 +865,8 @@ void task_cputime(struct task_struct *t, u64 *utime, u64 *stime)
else else
*utime += vtime->utime + delta; *utime += vtime->utime + delta;
} while (read_seqcount_retry(&vtime->seqcount, seq)); } while (read_seqcount_retry(&vtime->seqcount, seq));
return ret;
} }
static int vtime_state_fetch(struct vtime *vtime, int cpu) static int vtime_state_fetch(struct vtime *vtime, int cpu)