From: Chengming Zhou <zhouchengming@bytedance.com>
To: hannes@cmpxchg.org, surenb@google.com, mingo@redhat.com,
peterz@infradead.org, tj@kernel.org, corbet@lwn.net,
akpm@linux-foundation.org, rdunlap@infradead.org
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
songmuchun@bytedance.com, cgroups@vger.kernel.org,
Chengming Zhou <zhouchengming@bytedance.com>
Subject: [PATCH 6/9] sched/psi: save percpu memory when !psi_cgroups_enabled
Date: Thu, 21 Jul 2022 12:04:36 +0800 [thread overview]
Message-ID: <20220721040439.2651-7-zhouchengming@bytedance.com> (raw)
In-Reply-To: <20220721040439.2651-1-zhouchengming@bytedance.com>
We won't use cgroup psi_group when !psi_cgroups_enabled, so don't
bother to alloc percpu memory and init for it.
Also don't need to migrate task PSI stats between cgroups in
cgroup_move_task().
Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
---
kernel/sched/psi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 6ba159fe2a4f..aa40bf888102 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -205,6 +205,7 @@ void __init psi_init(void)
{
if (!psi_enable) {
static_branch_enable(&psi_disabled);
+ static_branch_disable(&psi_cgroups_enabled);
return;
}
@@ -952,7 +953,7 @@ void psi_memstall_leave(unsigned long *flags)
#ifdef CONFIG_CGROUPS
int psi_cgroup_alloc(struct cgroup *cgroup)
{
- if (static_branch_likely(&psi_disabled))
+ if (!static_branch_likely(&psi_cgroups_enabled))
return 0;
cgroup->psi.pcpu = alloc_percpu(struct psi_group_cpu);
@@ -964,7 +965,7 @@ int psi_cgroup_alloc(struct cgroup *cgroup)
void psi_cgroup_free(struct cgroup *cgroup)
{
- if (static_branch_likely(&psi_disabled))
+ if (!static_branch_likely(&psi_cgroups_enabled))
return;
cancel_delayed_work_sync(&cgroup->psi.avgs_work);
@@ -991,7 +992,7 @@ void cgroup_move_task(struct task_struct *task, struct css_set *to)
struct rq_flags rf;
struct rq *rq;
- if (static_branch_likely(&psi_disabled)) {
+ if (!static_branch_likely(&psi_cgroups_enabled)) {
/*
* Lame to do this here, but the scheduler cannot be locked
* from the outside, so we move cgroups from inside sched/.
--
2.36.1
next prev parent reply other threads:[~2022-07-21 4:06 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-21 4:04 [PATCH 0/9] sched/psi: some optimization and extension Chengming Zhou
2022-07-21 4:04 ` [PATCH 1/9] sched/psi: fix periodic aggregation shut off Chengming Zhou
2022-07-25 15:34 ` Johannes Weiner
2022-07-25 15:39 ` Johannes Weiner
2022-07-26 13:28 ` Chengming Zhou
2022-07-21 4:04 ` [PATCH 2/9] sched/psi: optimize task switch inside shared cgroups again Chengming Zhou
2022-07-21 4:04 ` [PATCH 3/9] sched/psi: move private helpers to sched/stats.h Chengming Zhou
2022-07-25 16:39 ` Johannes Weiner
2022-07-21 4:04 ` [PATCH 4/9] sched/psi: don't change task psi_flags when migrate CPU/group Chengming Zhou
2022-07-21 4:04 ` [PATCH 5/9] sched/psi: don't create cgroup PSI files when psi_disabled Chengming Zhou
2022-07-25 16:41 ` Johannes Weiner
2022-07-21 4:04 ` Chengming Zhou [this message]
2022-07-25 16:47 ` [PATCH 6/9] sched/psi: save percpu memory when !psi_cgroups_enabled Johannes Weiner
2022-07-21 4:04 ` [PATCH 7/9] sched/psi: cache parent psi_group to speed up groups iterate Chengming Zhou
2022-07-21 4:04 ` [PATCH 8/9] sched/psi: add kernel cmdline parameter psi_inner_cgroup Chengming Zhou
2022-07-25 16:52 ` Johannes Weiner
2022-07-26 13:38 ` [External] " Chengming Zhou
2022-07-26 17:54 ` Tejun Heo
2022-08-03 12:17 ` Chengming Zhou
2022-08-03 17:58 ` Tejun Heo
2022-08-03 19:22 ` Johannes Weiner
2022-08-03 19:48 ` Tejun Heo
2022-08-04 13:51 ` Chengming Zhou
2022-08-04 16:56 ` Johannes Weiner
2022-08-04 2:02 ` Chengming Zhou
2022-07-21 4:04 ` [PATCH 9/9] sched/psi: add PSI_IRQ to track IRQ/SOFTIRQ pressure Chengming Zhou
2022-07-21 10:00 ` kernel test robot
2022-07-21 22:10 ` kernel test robot
2022-07-22 3:30 ` Abel Wu
2022-07-22 6:13 ` Chengming Zhou
2022-07-22 7:14 ` Abel Wu
2022-07-22 7:33 ` Chengming Zhou
2022-07-25 18:26 ` Johannes Weiner
2022-07-26 13:55 ` [External] " Chengming Zhou
2022-07-27 11:28 ` Chengming Zhou
2022-07-27 13:00 ` Johannes Weiner
2022-07-27 15:09 ` Chengming Zhou
2022-07-27 16:07 ` Peter Zijlstra
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=20220721040439.2651-7-zhouchengming@bytedance.com \
--to=zhouchengming@bytedance.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=corbet@lwn.net \
--cc=hannes@cmpxchg.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
--cc=songmuchun@bytedance.com \
--cc=surenb@google.com \
--cc=tj@kernel.org \
/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).