Messages in this thread | | | Date | Fri, 14 Oct 2022 11:28:10 +0200 | From | Ingo Molnar <> | Subject | [GIT PULL] sched/psi changes for v6.1 |
| |
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(-)
| |