* [GIT PULL] sched/psi changes for v6.1
@ 2022-10-14 9:28 Ingo Molnar
2022-10-14 20:24 ` pr-tracker-bot
0 siblings, 1 reply; 2+ messages in thread
From: Ingo Molnar @ 2022-10-14 9:28 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, Peter Zijlstra, Greg Kroah-Hartman, Tejun Heo,
Johannes Weiner, Thomas Gleixner, Borislav Petkov, Juri Lelli,
Vincent Guittot, Dietmar Eggemann, Daniel Bristot de Oliveira,
Valentin Schneider
Linus,
Please pull the latest sched/psi git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-psi-2022-10-14
# HEAD: 34f26a15611afb03c33df6819359d36f5b382589 sched/psi: Per-cgroup PSI accounting disable/re-enable interface
PSI updates for v6.1:
- Various performance optimizations, resulting in a 4%-9% speedup
in the mmtests/config-scheduler-perfpipe micro-benchmark.
- New interface to turn PSI on/off on a per cgroup level.
MERGE NOTES:
- The cgroup interface was suggested & acked by the cgroup maintainers.
- There's a merge commit in the tree, because the changes rely on
driver-core kernfs changes to hit upstream first. This is why
this tree was sent late in the merge window as well.
- There will be a new conflict in kernel/cgroup/cgroup.c when
merged into your tree at 9c9155a3509a.
Most of the conflicts are straightforward, but there's a semantic
conflict between these two commits:
cgroup-tree/upstream: 8a693f7766f9 ("cgroup: Remove CFTYPE_PRESSURE")
sched/psi tree: 34f26a15611a ("sched/psi: Per-cgroup PSI accounting disable/re-enable interface")
8a693f7766f9 removes the CFTYPE_PRESSURE flag, while 34f26a15611a adds
new uses. This semantic conflict will result in a build failure on
certain configs.
The resolution I used in -tip is to remove the two new lines adding
CFTYPE_PRESSURE flags use in 34f26a15611a.
Thanks,
Ingo
------------------>
Chengming Zhou (9):
sched/psi: Fix periodic aggregation shut off
sched/psi: Don't create cgroup PSI files when psi_disabled
sched/psi: Save percpu memory when !psi_cgroups_enabled
sched/psi: Move private helpers to sched/stats.h
sched/psi: Optimize task switch inside shared cgroups again
sched/psi: Add PSI_IRQ to track IRQ/SOFTIRQ pressure
sched/psi: Consolidate cgroup_psi()
sched/psi: Cache parent psi_group to speed up group iteration
sched/psi: Per-cgroup PSI accounting disable/re-enable interface
Johannes Weiner (1):
sched/psi: Remove NR_ONCPU task accounting
Peter Zijlstra (1):
Merge branch 'driver-core/driver-core-next'
Documentation/admin-guide/cgroup-v2.rst | 23 +++
include/linux/cgroup-defs.h | 3 +
include/linux/cgroup.h | 5 -
include/linux/psi.h | 12 +-
include/linux/psi_types.h | 31 ++--
kernel/cgroup/cgroup.c | 104 +++++++++++-
kernel/sched/core.c | 1 +
kernel/sched/psi.c | 280 +++++++++++++++++++++++---------
kernel/sched/stats.h | 6 +
9 files changed, 362 insertions(+), 103 deletions(-)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [GIT PULL] sched/psi changes for v6.1
2022-10-14 9:28 [GIT PULL] sched/psi changes for v6.1 Ingo Molnar
@ 2022-10-14 20:24 ` pr-tracker-bot
0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2022-10-14 20:24 UTC (permalink / raw)
To: Ingo Molnar
Cc: Linus Torvalds, linux-kernel, Peter Zijlstra, Greg Kroah-Hartman,
Tejun Heo, Johannes Weiner, Thomas Gleixner, Borislav Petkov,
Juri Lelli, Vincent Guittot, Dietmar Eggemann,
Daniel Bristot de Oliveira, Valentin Schneider
The pull request you sent on Fri, 14 Oct 2022 11:28:10 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-psi-2022-10-14
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/bd9a3dba185ce6701b41f0341470d3f53bbbbaed
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-14 20:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-14 9:28 [GIT PULL] sched/psi changes for v6.1 Ingo Molnar
2022-10-14 20:24 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).