mirror of
https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10.git
synced 2026-09-09 00:07:04 +08:00
Alexandra Hájková
aaec807319
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2172
JIRA: https://issues.redhat.com/browse/RHEL-113305
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/2172
Omitted-fix: c853d18706de ("cgroup: adjust criteria for rstat subsystem cpu lock access")
Upstream commit 6af89c6ca717 ("cgroup: remove per-cpu per-subsystem
locks") removes the per-cpu rstat lock altogether making commit
c853d18706de unnecessary. Also that commit is in a dead branch. So
including it will cause merge conflict with other rstat patches.
Omitted-fix: a1a01793ae1f ("cgroup/cpuset: Consistently compute effective_xcpus in update_cpumasks_hier()")
There will be a cpuset specific MR later that will include this
commit.
This MR rebases the cgroup subsystem under kernel/cgroup to v6.18 with
fixes beyound that for RHEL 10.3. Other cgroup components like memcg and
blkio are not updated. They will be handled separately, if needed.
It will supersede MR #1840 ("Backport upstream cgroup commits up to
v6.16"). The major differences are the inclusion of upstream commit up
to v6.18 and the removal of memcg related commits.
This MR also contains a RHEL-only memcg commit to work around the
effect of upstream removal of cgroup_rstat_flush_hold/release() on
RHEL-only commit be64087096 ("mm/memcg: Free percpu stats memory of
dying memcg's").
Signed-off-by: Waiman Long <longman@redhat.com>
Approved-by: Rafael Aquini <raquini@redhat.com>
Approved-by: Phil Auld <pauld@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>
Merged-by: Alexandra Hájková <ahajkova@redhat.com>