mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
- Fix a small inconsistency (bug) in load tracking, caught by a
new warning that several people reported. - Flip CONFIG_SCHED_CORE to default-disabled, and update the Kconfig help text. Signed-off-by: Ingo Molnar <mingo@kernel.org> -----BEGIN PGP SIGNATURE----- iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmDcSeURHG1pbmdvQGtl cm5lbC5vcmcACgkQEnMQ0APhK1g0ixAApwxCWCyNWKEKzg/I3FsR3RYfErpIUgnf gwQRtXNKZBOt/q8yWYw0VXG2ob17NgUdiC3p9IaxPrmCmB8tuojcsuPssHj5UktQ GWFoJdUwqQrM68Pl0centbN3xeKPcp7tHXK0jfmpbzolJxSFnx4/bQVPdhjlmWTM CoSTx4QCJoHYsNhZXj7aHQczKUMKBZ2/SD74+c/2Ft3jWkFmwdynzMdySKJfEuVX u/6PiFQDK0/5Qsic3a6pWmXZHcA0Q6HUwKKAaJcqI1OcAQyPuzwxY5qwbzvq5fRM ZhaJ7T5rJFQ8u6KndV5wv4+Xqgv6teAZBaPVP93cbnfeyVzWaiYL6/SC+xJnNDT+ fNpE41FINHq/NfUa6sId84lIpcQvAZzy3tpxS3VI/WXqDymFsG9BuoX9V2fm1uQP O3oa+B/PkP+VVezDS8qxZ2xixpcsRW97UVFtaj2P0QFOeb+qrOhPuSoCjNREkFmu CFWW+qnbiVaxQ3rtaXaHWhEtAhOMPbE4frYtbS4pjEMgv0K2E/mvDivHwrVX23II WkEQxUbzdp/APppBlhtFpcxKNTnNsV5Uk0VPhTu1bEOpKAC7wA+dmyPEMG0MLBUc 88DizVnofzKTax8PZnuabWpITcS+TS1qzBRmn1W1SajEh66iJltCSafWZ3JxytDO meqBYVd0ubQ= =Jgwc -----END PGP SIGNATURE----- Merge tag 'sched-urgent-2021-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull scheduler fixes from Ingo Molnar: - Fix a small inconsistency (bug) in load tracking, caught by a new warning that several people reported. - Flip CONFIG_SCHED_CORE to default-disabled, and update the Kconfig help text. * tag 'sched-urgent-2021-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/core: Disable CONFIG_SCHED_CORE by default sched/fair: Ensure _sum and _avg values stay consistent
This commit is contained in:
commit
a6eaf3850c
2 changed files with 6 additions and 6 deletions
|
@ -102,7 +102,6 @@ config PREEMPT_DYNAMIC
|
|||
|
||||
config SCHED_CORE
|
||||
bool "Core Scheduling for SMT"
|
||||
default y
|
||||
depends on SCHED_SMT
|
||||
help
|
||||
This option permits Core Scheduling, a means of coordinated task
|
||||
|
@ -115,7 +114,8 @@ config SCHED_CORE
|
|||
- mitigation of some (not all) SMT side channels;
|
||||
- limiting SMT interference to improve determinism and/or performance.
|
||||
|
||||
SCHED_CORE is default enabled when SCHED_SMT is enabled -- when
|
||||
unused there should be no impact on performance.
|
||||
SCHED_CORE is default disabled. When it is enabled and unused,
|
||||
which is the likely usage by Linux distributions, there should
|
||||
be no measurable impact on performance.
|
||||
|
||||
|
||||
|
|
|
@ -3685,15 +3685,15 @@ update_cfs_rq_load_avg(u64 now, struct cfs_rq *cfs_rq)
|
|||
|
||||
r = removed_load;
|
||||
sub_positive(&sa->load_avg, r);
|
||||
sub_positive(&sa->load_sum, r * divider);
|
||||
sa->load_sum = sa->load_avg * divider;
|
||||
|
||||
r = removed_util;
|
||||
sub_positive(&sa->util_avg, r);
|
||||
sub_positive(&sa->util_sum, r * divider);
|
||||
sa->util_sum = sa->util_avg * divider;
|
||||
|
||||
r = removed_runnable;
|
||||
sub_positive(&sa->runnable_avg, r);
|
||||
sub_positive(&sa->runnable_sum, r * divider);
|
||||
sa->runnable_sum = sa->runnable_avg * divider;
|
||||
|
||||
/*
|
||||
* removed_runnable is the unweighted version of removed_load so we
|
||||
|
|
Loading…
Reference in a new issue