From: Ingo Molnar <mingo@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Tejun Heo <tj@kernel.org>, Johannes Weiner <hannes@cmpxchg.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>,
Juri Lelli <juri.lelli@redhat.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Daniel Bristot de Oliveira <bristot@redhat.com>,
Valentin Schneider <vschneid@redhat.com>
Subject: [GIT PULL] sched/psi changes for v6.1
Date: Fri, 14 Oct 2022 11:28:10 +0200 [thread overview]
Message-ID: <Y0krqnKlHb/gp9Za@gmail.com> (raw)
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(-)
next reply other threads:[~2022-10-14 9:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-14 9:28 Ingo Molnar [this message]
2022-10-14 20:24 ` [GIT PULL] sched/psi changes for v6.1 pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y0krqnKlHb/gp9Za@gmail.com \
--to=mingo@kernel.org \
--cc=bp@alien8.de \
--cc=bristot@redhat.com \
--cc=dietmar.eggemann@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=hannes@cmpxchg.org \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=vincent.guittot@linaro.org \
--cc=vschneid@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox