From: Yafang Shao <laoar.shao@gmail.com>
To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com,
andrii@kernel.org, martin.lau@linux.dev, song@kernel.org,
yonghong.song@linux.dev, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, tj@kernel.org,
lizefan.x@bytedance.com, hannes@cmpxchg.org
Cc: bpf@vger.kernel.org, cgroups@vger.kernel.org,
Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH bpf-next 1/4] cgroup, psi: Init PSI of root cgroup to psi_system
Date: Fri, 22 Dec 2023 11:30:59 +0000 [thread overview]
Message-ID: <20231222113102.4148-2-laoar.shao@gmail.com> (raw)
In-Reply-To: <20231222113102.4148-1-laoar.shao@gmail.com>
By initializing the root cgroup's psi field to psi_system, we can
consistently obtain the psi information for all cgroups from the struct
cgroup.
Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
include/linux/psi.h | 2 +-
kernel/cgroup/cgroup.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/linux/psi.h b/include/linux/psi.h
index e074587..8f2db51 100644
--- a/include/linux/psi.h
+++ b/include/linux/psi.h
@@ -34,7 +34,7 @@ __poll_t psi_trigger_poll(void **trigger_ptr, struct file *file,
#ifdef CONFIG_CGROUPS
static inline struct psi_group *cgroup_psi(struct cgroup *cgrp)
{
- return cgroup_ino(cgrp) == 1 ? &psi_system : cgrp->psi;
+ return cgrp->psi;
}
int psi_cgroup_alloc(struct cgroup *cgrp);
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 8f3cef1..07c7747 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -164,7 +164,10 @@ struct cgroup_subsys *cgroup_subsys[] = {
static DEFINE_PER_CPU(struct cgroup_rstat_cpu, cgrp_dfl_root_rstat_cpu);
/* the default hierarchy */
-struct cgroup_root cgrp_dfl_root = { .cgrp.rstat_cpu = &cgrp_dfl_root_rstat_cpu };
+struct cgroup_root cgrp_dfl_root = {
+ .cgrp.rstat_cpu = &cgrp_dfl_root_rstat_cpu,
+ .cgrp.psi = &psi_system,
+};
EXPORT_SYMBOL_GPL(cgrp_dfl_root);
/*
--
1.8.3.1
next prev parent reply other threads:[~2023-12-22 11:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-22 11:30 [PATCH bpf-next 0/4] bpf: Add bpf_iter_cpumask Yafang Shao
2023-12-22 11:30 ` Yafang Shao [this message]
2023-12-22 17:47 ` [PATCH bpf-next 1/4] cgroup, psi: Init PSI of root cgroup to psi_system Tejun Heo
2023-12-24 3:14 ` Yafang Shao
2023-12-22 23:49 ` kernel test robot
2023-12-23 7:26 ` kernel test robot
2023-12-22 11:31 ` [PATCH bpf-next 2/4] bpf: Add bpf_iter_cpumask kfuncs Yafang Shao
2024-01-02 22:13 ` Andrii Nakryiko
2024-01-04 2:30 ` Yafang Shao
2023-12-22 11:31 ` [PATCH bpf-next 3/4] bpf: Add new kfunc bpf_cpumask_set_from_pid Yafang Shao
2023-12-22 17:51 ` Tejun Heo
2023-12-24 3:05 ` Yafang Shao
2023-12-22 11:31 ` [PATCH bpf-next 4/4] selftests/bpf: Add selftests for cpumask iter Yafang Shao
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=20231222113102.4148-2-laoar.shao@gmail.com \
--to=laoar.shao@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=cgroups@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=hannes@cmpxchg.org \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=lizefan.x@bytedance.com \
--cc=martin.lau@linux.dev \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=tj@kernel.org \
--cc=yonghong.song@linux.dev \
/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;
as well as URLs for NNTP newsgroup(s).