linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable
@ 2021-05-24 19:53 Suren Baghdasaryan
  2021-05-24 20:00 ` Suren Baghdasaryan
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Suren Baghdasaryan @ 2021-05-24 19:53 UTC (permalink / raw)
  To: tj
  Cc: hannes, lizefan.x, mingo, peterz, shakeelb, juri.lelli,
	vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman,
	minchan, corbet, bristot, paulmck, rdunlap, akpm, tglx, macro,
	viresh.kumar, mike.kravetz, linux-doc, linux-kernel, cgroups,
	surenb, kernel-team

PSI accounts stalls for each cgroup separately and aggregates it at each
level of the hierarchy. This causes additional overhead with psi_avgs_work
being called for each cgroup in the hierarchy. psi_avgs_work has been
highly optimized, however on systems with large number of cgroups the
overhead becomes noticeable.
Systems which use PSI only at the system level could avoid this overhead
if PSI can be configured to skip per-cgroup stall accounting.
Add "cgroup_disable=pressure" kernel command-line option to allow
requesting system-wide only pressure stall accounting. When set, it
keeps system-wide accounting under /proc/pressure/ but skips accounting
for individual cgroups and does not expose PSI nodes in cgroup hierarchy.

Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
changes in v3:
- Replaced psi_cgroups_disabled with psi_cgroups_enabled key, per PeterZ
- Rebased to ToT after cgroup tree merge
- Added "Disabling ... control group feature" message in cgroup_disable()
  similar to the new message generated when a cgroup gets disabled

 .../admin-guide/kernel-parameters.txt         |  9 +++-
 include/linux/cgroup-defs.h                   |  1 +
 include/linux/cgroup.h                        |  7 +++
 kernel/cgroup/cgroup.c                        | 48 +++++++++++++++++++
 kernel/sched/psi.c                            | 30 +++++++-----
 5 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index cb89dbdedc46..653c62142f07 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -497,16 +497,21 @@
 	ccw_timeout_log	[S390]
 			See Documentation/s390/common_io.rst for details.
 
-	cgroup_disable=	[KNL] Disable a particular controller
-			Format: {name of the controller(s) to disable}
+	cgroup_disable=	[KNL] Disable a particular controller or optional feature
+			Format: {name of the controller(s) or feature(s) to disable}
 			The effects of cgroup_disable=foo are:
 			- foo isn't auto-mounted if you mount all cgroups in
 			  a single hierarchy
 			- foo isn't visible as an individually mountable
 			  subsystem
+			- if foo is an optional feature then the feature is
+			  disabled and corresponding cgroup files are not
+			  created
 			{Currently only "memory" controller deal with this and
 			cut the overhead, others just disable the usage. So
 			only cgroup_disable=memory is actually worthy}
+			Specifying "pressure" disables per-cgroup pressure
+			stall information accounting feature
 
 	cgroup_no_v1=	[KNL] Disable cgroup controllers and named hierarchies in v1
 			Format: { { controller | "all" | "named" }
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index fb8f6d2cd104..5a9d898daecb 100644
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -110,6 +110,7 @@ enum {
 	CFTYPE_NO_PREFIX	= (1 << 3),	/* (DON'T USE FOR NEW FILES) no subsys prefix */
 	CFTYPE_WORLD_WRITABLE	= (1 << 4),	/* (DON'T USE FOR NEW FILES) S_IWUGO */
 	CFTYPE_DEBUG		= (1 << 5),	/* create when cgroup_debug */
+	CFTYPE_PRESSURE		= (1 << 6),	/* only if pressure feature is enabled */
 
 	/* internal flags, do not use outside cgroup core proper */
 	__CFTYPE_ONLY_ON_DFL	= (1 << 16),	/* only on default hierarchy */
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 6bc9c76680b2..5492fcb7f9ca 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -676,6 +676,8 @@ static inline struct psi_group *cgroup_psi(struct cgroup *cgrp)
 	return &cgrp->psi;
 }
 
+bool cgroup_psi_enabled(void);
+
 static inline void cgroup_init_kthreadd(void)
 {
 	/*
@@ -735,6 +737,11 @@ static inline struct psi_group *cgroup_psi(struct cgroup *cgrp)
 	return NULL;
 }
 
+static inline bool cgroup_psi_enabled(void)
+{
+	return false;
+}
+
 static inline bool task_under_cgroup_hierarchy(struct task_struct *task,
 					       struct cgroup *ancestor)
 {
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 21ecc6ee6a6d..3a15a8407b46 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -209,6 +209,22 @@ struct cgroup_namespace init_cgroup_ns = {
 static struct file_system_type cgroup2_fs_type;
 static struct cftype cgroup_base_files[];
 
+/* cgroup optional features */
+enum cgroup_opt_features {
+#ifdef CONFIG_PSI
+	OPT_FEATURE_PRESSURE,
+#endif
+	OPT_FEATURE_COUNT
+};
+
+static const char *cgroup_opt_feature_names[OPT_FEATURE_COUNT] = {
+#ifdef CONFIG_PSI
+	"pressure",
+#endif
+};
+
+static u16 cgroup_feature_disable_mask __read_mostly;
+
 static int cgroup_apply_control(struct cgroup *cgrp);
 static void cgroup_finalize_control(struct cgroup *cgrp, int ret);
 static void css_task_iter_skip(struct css_task_iter *it,
@@ -3631,6 +3647,18 @@ static void cgroup_pressure_release(struct kernfs_open_file *of)
 {
 	psi_trigger_replace(&of->priv, NULL);
 }
+
+bool cgroup_psi_enabled(void)
+{
+	return (cgroup_feature_disable_mask & (1 << OPT_FEATURE_PRESSURE)) == 0;
+}
+
+#else /* CONFIG_PSI */
+bool cgroup_psi_enabled(void)
+{
+	return false;
+}
+
 #endif /* CONFIG_PSI */
 
 static int cgroup_freeze_show(struct seq_file *seq, void *v)
@@ -3881,6 +3909,8 @@ static int cgroup_addrm_files(struct cgroup_subsys_state *css,
 restart:
 	for (cft = cfts; cft != cft_end && cft->name[0] != '\0'; cft++) {
 		/* does cft->flags tell us to skip this file on @cgrp? */
+		if ((cft->flags & CFTYPE_PRESSURE) && !cgroup_psi_enabled())
+			continue;
 		if ((cft->flags & __CFTYPE_ONLY_ON_DFL) && !cgroup_on_dfl(cgrp))
 			continue;
 		if ((cft->flags & __CFTYPE_NOT_ON_DFL) && cgroup_on_dfl(cgrp))
@@ -3958,6 +3988,9 @@ static int cgroup_init_cftypes(struct cgroup_subsys *ss, struct cftype *cfts)
 
 		WARN_ON(cft->ss || cft->kf_ops);
 
+		if ((cft->flags & CFTYPE_PRESSURE) && !cgroup_psi_enabled())
+			continue;
+
 		if (cft->seq_start)
 			kf_ops = &cgroup_kf_ops;
 		else
@@ -4866,6 +4899,7 @@ static struct cftype cgroup_base_files[] = {
 #ifdef CONFIG_PSI
 	{
 		.name = "io.pressure",
+		.flags = CFTYPE_PRESSURE,
 		.seq_show = cgroup_io_pressure_show,
 		.write = cgroup_io_pressure_write,
 		.poll = cgroup_pressure_poll,
@@ -4873,6 +4907,7 @@ static struct cftype cgroup_base_files[] = {
 	},
 	{
 		.name = "memory.pressure",
+		.flags = CFTYPE_PRESSURE,
 		.seq_show = cgroup_memory_pressure_show,
 		.write = cgroup_memory_pressure_write,
 		.poll = cgroup_pressure_poll,
@@ -4880,6 +4915,7 @@ static struct cftype cgroup_base_files[] = {
 	},
 	{
 		.name = "cpu.pressure",
+		.flags = CFTYPE_PRESSURE,
 		.seq_show = cgroup_cpu_pressure_show,
 		.write = cgroup_cpu_pressure_write,
 		.poll = cgroup_pressure_poll,
@@ -6213,6 +6249,15 @@ static int __init cgroup_disable(char *str)
 			pr_info("Disabling %s control group subsystem\n",
 				ss->name);
 		}
+
+		for (i = 0; i < OPT_FEATURE_COUNT; i++) {
+			if (strcmp(token, cgroup_opt_feature_names[i]))
+				continue;
+			cgroup_feature_disable_mask |= 1 << i;
+			pr_info("Disabling %s control group feature\n",
+				cgroup_opt_feature_names[i]);
+			break;
+		}
 	}
 	return 1;
 }
@@ -6511,6 +6556,9 @@ static ssize_t show_delegatable_files(struct cftype *files, char *buf,
 		if (!(cft->flags & CFTYPE_NS_DELEGATABLE))
 			continue;
 
+		if ((cft->flags & CFTYPE_PRESSURE) && !cgroup_psi_enabled())
+			continue;
+
 		if (prefix)
 			ret += snprintf(buf + ret, size - ret, "%s.", prefix);
 
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index cc25a3cff41f..b773cae4c24b 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -148,6 +148,7 @@
 static int psi_bug __read_mostly;
 
 DEFINE_STATIC_KEY_FALSE(psi_disabled);
+DEFINE_STATIC_KEY_TRUE(psi_cgroups_enabled);
 
 #ifdef CONFIG_PSI_DEFAULT_DISABLED
 static bool psi_enable;
@@ -211,6 +212,9 @@ void __init psi_init(void)
 		return;
 	}
 
+	if (!cgroup_psi_enabled())
+		static_branch_disable(&psi_cgroups_enabled);
+
 	psi_period = jiffies_to_nsecs(PSI_FREQ);
 	group_init(&psi_system);
 }
@@ -744,23 +748,23 @@ static void psi_group_change(struct psi_group *group, int cpu,
 
 static struct psi_group *iterate_groups(struct task_struct *task, void **iter)
 {
+	if (*iter == &psi_system)
+		return NULL;
+
 #ifdef CONFIG_CGROUPS
-	struct cgroup *cgroup = NULL;
+	if (static_branch_likely(&psi_cgroups_enabled)) {
+		struct cgroup *cgroup = NULL;
 
-	if (!*iter)
-		cgroup = task->cgroups->dfl_cgrp;
-	else if (*iter == &psi_system)
-		return NULL;
-	else
-		cgroup = cgroup_parent(*iter);
+		if (!*iter)
+			cgroup = task->cgroups->dfl_cgrp;
+		else
+			cgroup = cgroup_parent(*iter);
 
-	if (cgroup && cgroup_parent(cgroup)) {
-		*iter = cgroup;
-		return cgroup_psi(cgroup);
+		if (cgroup && cgroup_parent(cgroup)) {
+			*iter = cgroup;
+			return cgroup_psi(cgroup);
+		}
 	}
-#else
-	if (*iter)
-		return NULL;
 #endif
 	*iter = &psi_system;
 	return &psi_system;
-- 
2.31.1.818.g46aad6cb9e-goog


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable
  2021-05-24 19:53 [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable Suren Baghdasaryan
@ 2021-05-24 20:00 ` Suren Baghdasaryan
  2021-05-25  7:12 ` Peter Zijlstra
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 8+ messages in thread
From: Suren Baghdasaryan @ 2021-05-24 20:00 UTC (permalink / raw)
  To: Tejun Heo
  Cc: Johannes Weiner, Zefan Li, Ingo Molnar, Peter Zijlstra,
	Shakeel Butt, Juri Lelli, Vincent Guittot, Dietmar Eggemann,
	Steven Rostedt, Benjamin Segall, Mel Gorman, Minchan Kim,
	Jonathan Corbet, Daniel Bristot de Oliveira, Paul E . McKenney,
	Randy Dunlap, Andrew Morton, Thomas Gleixner, macro,
	Viresh Kumar, Mike Kravetz, linux-doc, LKML, cgroups mailinglist,
	kernel-team

On Mon, May 24, 2021 at 12:53 PM Suren Baghdasaryan <surenb@google.com> wrote:
>
> PSI accounts stalls for each cgroup separately and aggregates it at each
> level of the hierarchy. This causes additional overhead with psi_avgs_work
> being called for each cgroup in the hierarchy. psi_avgs_work has been
> highly optimized, however on systems with large number of cgroups the
> overhead becomes noticeable.
> Systems which use PSI only at the system level could avoid this overhead
> if PSI can be configured to skip per-cgroup stall accounting.
> Add "cgroup_disable=pressure" kernel command-line option to allow
> requesting system-wide only pressure stall accounting. When set, it
> keeps system-wide accounting under /proc/pressure/ but skips accounting
> for individual cgroups and does not expose PSI nodes in cgroup hierarchy.

Tejun and other cgroup experts, could you please take a look at the
cgroup-related parts of this patch and provide your feedback? Would
greatly appreciate your opinion on this.
Thanks!

>
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> ---
> changes in v3:
> - Replaced psi_cgroups_disabled with psi_cgroups_enabled key, per PeterZ
> - Rebased to ToT after cgroup tree merge
> - Added "Disabling ... control group feature" message in cgroup_disable()
>   similar to the new message generated when a cgroup gets disabled
>
>  .../admin-guide/kernel-parameters.txt         |  9 +++-
>  include/linux/cgroup-defs.h                   |  1 +
>  include/linux/cgroup.h                        |  7 +++
>  kernel/cgroup/cgroup.c                        | 48 +++++++++++++++++++
>  kernel/sched/psi.c                            | 30 +++++++-----
>  5 files changed, 80 insertions(+), 15 deletions(-)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index cb89dbdedc46..653c62142f07 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -497,16 +497,21 @@
>         ccw_timeout_log [S390]
>                         See Documentation/s390/common_io.rst for details.
>
> -       cgroup_disable= [KNL] Disable a particular controller
> -                       Format: {name of the controller(s) to disable}
> +       cgroup_disable= [KNL] Disable a particular controller or optional feature
> +                       Format: {name of the controller(s) or feature(s) to disable}
>                         The effects of cgroup_disable=foo are:
>                         - foo isn't auto-mounted if you mount all cgroups in
>                           a single hierarchy
>                         - foo isn't visible as an individually mountable
>                           subsystem
> +                       - if foo is an optional feature then the feature is
> +                         disabled and corresponding cgroup files are not
> +                         created
>                         {Currently only "memory" controller deal with this and
>                         cut the overhead, others just disable the usage. So
>                         only cgroup_disable=memory is actually worthy}
> +                       Specifying "pressure" disables per-cgroup pressure
> +                       stall information accounting feature
>
>         cgroup_no_v1=   [KNL] Disable cgroup controllers and named hierarchies in v1
>                         Format: { { controller | "all" | "named" }
> diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
> index fb8f6d2cd104..5a9d898daecb 100644
> --- a/include/linux/cgroup-defs.h
> +++ b/include/linux/cgroup-defs.h
> @@ -110,6 +110,7 @@ enum {
>         CFTYPE_NO_PREFIX        = (1 << 3),     /* (DON'T USE FOR NEW FILES) no subsys prefix */
>         CFTYPE_WORLD_WRITABLE   = (1 << 4),     /* (DON'T USE FOR NEW FILES) S_IWUGO */
>         CFTYPE_DEBUG            = (1 << 5),     /* create when cgroup_debug */
> +       CFTYPE_PRESSURE         = (1 << 6),     /* only if pressure feature is enabled */
>
>         /* internal flags, do not use outside cgroup core proper */
>         __CFTYPE_ONLY_ON_DFL    = (1 << 16),    /* only on default hierarchy */
> diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
> index 6bc9c76680b2..5492fcb7f9ca 100644
> --- a/include/linux/cgroup.h
> +++ b/include/linux/cgroup.h
> @@ -676,6 +676,8 @@ static inline struct psi_group *cgroup_psi(struct cgroup *cgrp)
>         return &cgrp->psi;
>  }
>
> +bool cgroup_psi_enabled(void);
> +
>  static inline void cgroup_init_kthreadd(void)
>  {
>         /*
> @@ -735,6 +737,11 @@ static inline struct psi_group *cgroup_psi(struct cgroup *cgrp)
>         return NULL;
>  }
>
> +static inline bool cgroup_psi_enabled(void)
> +{
> +       return false;
> +}
> +
>  static inline bool task_under_cgroup_hierarchy(struct task_struct *task,
>                                                struct cgroup *ancestor)
>  {
> diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
> index 21ecc6ee6a6d..3a15a8407b46 100644
> --- a/kernel/cgroup/cgroup.c
> +++ b/kernel/cgroup/cgroup.c
> @@ -209,6 +209,22 @@ struct cgroup_namespace init_cgroup_ns = {
>  static struct file_system_type cgroup2_fs_type;
>  static struct cftype cgroup_base_files[];
>
> +/* cgroup optional features */
> +enum cgroup_opt_features {
> +#ifdef CONFIG_PSI
> +       OPT_FEATURE_PRESSURE,
> +#endif
> +       OPT_FEATURE_COUNT
> +};
> +
> +static const char *cgroup_opt_feature_names[OPT_FEATURE_COUNT] = {
> +#ifdef CONFIG_PSI
> +       "pressure",
> +#endif
> +};
> +
> +static u16 cgroup_feature_disable_mask __read_mostly;
> +
>  static int cgroup_apply_control(struct cgroup *cgrp);
>  static void cgroup_finalize_control(struct cgroup *cgrp, int ret);
>  static void css_task_iter_skip(struct css_task_iter *it,
> @@ -3631,6 +3647,18 @@ static void cgroup_pressure_release(struct kernfs_open_file *of)
>  {
>         psi_trigger_replace(&of->priv, NULL);
>  }
> +
> +bool cgroup_psi_enabled(void)
> +{
> +       return (cgroup_feature_disable_mask & (1 << OPT_FEATURE_PRESSURE)) == 0;
> +}
> +
> +#else /* CONFIG_PSI */
> +bool cgroup_psi_enabled(void)
> +{
> +       return false;
> +}
> +
>  #endif /* CONFIG_PSI */
>
>  static int cgroup_freeze_show(struct seq_file *seq, void *v)
> @@ -3881,6 +3909,8 @@ static int cgroup_addrm_files(struct cgroup_subsys_state *css,
>  restart:
>         for (cft = cfts; cft != cft_end && cft->name[0] != '\0'; cft++) {
>                 /* does cft->flags tell us to skip this file on @cgrp? */
> +               if ((cft->flags & CFTYPE_PRESSURE) && !cgroup_psi_enabled())
> +                       continue;
>                 if ((cft->flags & __CFTYPE_ONLY_ON_DFL) && !cgroup_on_dfl(cgrp))
>                         continue;
>                 if ((cft->flags & __CFTYPE_NOT_ON_DFL) && cgroup_on_dfl(cgrp))
> @@ -3958,6 +3988,9 @@ static int cgroup_init_cftypes(struct cgroup_subsys *ss, struct cftype *cfts)
>
>                 WARN_ON(cft->ss || cft->kf_ops);
>
> +               if ((cft->flags & CFTYPE_PRESSURE) && !cgroup_psi_enabled())
> +                       continue;
> +
>                 if (cft->seq_start)
>                         kf_ops = &cgroup_kf_ops;
>                 else
> @@ -4866,6 +4899,7 @@ static struct cftype cgroup_base_files[] = {
>  #ifdef CONFIG_PSI
>         {
>                 .name = "io.pressure",
> +               .flags = CFTYPE_PRESSURE,
>                 .seq_show = cgroup_io_pressure_show,
>                 .write = cgroup_io_pressure_write,
>                 .poll = cgroup_pressure_poll,
> @@ -4873,6 +4907,7 @@ static struct cftype cgroup_base_files[] = {
>         },
>         {
>                 .name = "memory.pressure",
> +               .flags = CFTYPE_PRESSURE,
>                 .seq_show = cgroup_memory_pressure_show,
>                 .write = cgroup_memory_pressure_write,
>                 .poll = cgroup_pressure_poll,
> @@ -4880,6 +4915,7 @@ static struct cftype cgroup_base_files[] = {
>         },
>         {
>                 .name = "cpu.pressure",
> +               .flags = CFTYPE_PRESSURE,
>                 .seq_show = cgroup_cpu_pressure_show,
>                 .write = cgroup_cpu_pressure_write,
>                 .poll = cgroup_pressure_poll,
> @@ -6213,6 +6249,15 @@ static int __init cgroup_disable(char *str)
>                         pr_info("Disabling %s control group subsystem\n",
>                                 ss->name);
>                 }
> +
> +               for (i = 0; i < OPT_FEATURE_COUNT; i++) {
> +                       if (strcmp(token, cgroup_opt_feature_names[i]))
> +                               continue;
> +                       cgroup_feature_disable_mask |= 1 << i;
> +                       pr_info("Disabling %s control group feature\n",
> +                               cgroup_opt_feature_names[i]);
> +                       break;
> +               }
>         }
>         return 1;
>  }
> @@ -6511,6 +6556,9 @@ static ssize_t show_delegatable_files(struct cftype *files, char *buf,
>                 if (!(cft->flags & CFTYPE_NS_DELEGATABLE))
>                         continue;
>
> +               if ((cft->flags & CFTYPE_PRESSURE) && !cgroup_psi_enabled())
> +                       continue;
> +
>                 if (prefix)
>                         ret += snprintf(buf + ret, size - ret, "%s.", prefix);
>
> diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
> index cc25a3cff41f..b773cae4c24b 100644
> --- a/kernel/sched/psi.c
> +++ b/kernel/sched/psi.c
> @@ -148,6 +148,7 @@
>  static int psi_bug __read_mostly;
>
>  DEFINE_STATIC_KEY_FALSE(psi_disabled);
> +DEFINE_STATIC_KEY_TRUE(psi_cgroups_enabled);
>
>  #ifdef CONFIG_PSI_DEFAULT_DISABLED
>  static bool psi_enable;
> @@ -211,6 +212,9 @@ void __init psi_init(void)
>                 return;
>         }
>
> +       if (!cgroup_psi_enabled())
> +               static_branch_disable(&psi_cgroups_enabled);
> +
>         psi_period = jiffies_to_nsecs(PSI_FREQ);
>         group_init(&psi_system);
>  }
> @@ -744,23 +748,23 @@ static void psi_group_change(struct psi_group *group, int cpu,
>
>  static struct psi_group *iterate_groups(struct task_struct *task, void **iter)
>  {
> +       if (*iter == &psi_system)
> +               return NULL;
> +
>  #ifdef CONFIG_CGROUPS
> -       struct cgroup *cgroup = NULL;
> +       if (static_branch_likely(&psi_cgroups_enabled)) {
> +               struct cgroup *cgroup = NULL;
>
> -       if (!*iter)
> -               cgroup = task->cgroups->dfl_cgrp;
> -       else if (*iter == &psi_system)
> -               return NULL;
> -       else
> -               cgroup = cgroup_parent(*iter);
> +               if (!*iter)
> +                       cgroup = task->cgroups->dfl_cgrp;
> +               else
> +                       cgroup = cgroup_parent(*iter);
>
> -       if (cgroup && cgroup_parent(cgroup)) {
> -               *iter = cgroup;
> -               return cgroup_psi(cgroup);
> +               if (cgroup && cgroup_parent(cgroup)) {
> +                       *iter = cgroup;
> +                       return cgroup_psi(cgroup);
> +               }
>         }
> -#else
> -       if (*iter)
> -               return NULL;
>  #endif
>         *iter = &psi_system;
>         return &psi_system;
> --
> 2.31.1.818.g46aad6cb9e-goog
>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable
  2021-05-24 19:53 [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable Suren Baghdasaryan
  2021-05-24 20:00 ` Suren Baghdasaryan
@ 2021-05-25  7:12 ` Peter Zijlstra
  2021-05-25 13:00 ` Johannes Weiner
  2021-06-08 19:01 ` Tejun Heo
  3 siblings, 0 replies; 8+ messages in thread
From: Peter Zijlstra @ 2021-05-25  7:12 UTC (permalink / raw)
  To: Suren Baghdasaryan
  Cc: tj, hannes, lizefan.x, mingo, shakeelb, juri.lelli,
	vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman,
	minchan, corbet, bristot, paulmck, rdunlap, akpm, tglx, macro,
	viresh.kumar, mike.kravetz, linux-doc, linux-kernel, cgroups,
	kernel-team

On Mon, May 24, 2021 at 12:53:39PM -0700, Suren Baghdasaryan wrote:
> PSI accounts stalls for each cgroup separately and aggregates it at each
> level of the hierarchy. This causes additional overhead with psi_avgs_work
> being called for each cgroup in the hierarchy. psi_avgs_work has been
> highly optimized, however on systems with large number of cgroups the
> overhead becomes noticeable.
> Systems which use PSI only at the system level could avoid this overhead
> if PSI can be configured to skip per-cgroup stall accounting.
> Add "cgroup_disable=pressure" kernel command-line option to allow
> requesting system-wide only pressure stall accounting. When set, it
> keeps system-wide accounting under /proc/pressure/ but skips accounting
> for individual cgroups and does not expose PSI nodes in cgroup hierarchy.
> 
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>

>  kernel/sched/psi.c                            | 30 +++++++-----

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable
  2021-05-24 19:53 [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable Suren Baghdasaryan
  2021-05-24 20:00 ` Suren Baghdasaryan
  2021-05-25  7:12 ` Peter Zijlstra
@ 2021-05-25 13:00 ` Johannes Weiner
  2021-06-08 16:25   ` Suren Baghdasaryan
  2021-06-08 19:01 ` Tejun Heo
  3 siblings, 1 reply; 8+ messages in thread
From: Johannes Weiner @ 2021-05-25 13:00 UTC (permalink / raw)
  To: Suren Baghdasaryan
  Cc: tj, lizefan.x, mingo, peterz, shakeelb, juri.lelli,
	vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman,
	minchan, corbet, bristot, paulmck, rdunlap, akpm, tglx, macro,
	viresh.kumar, mike.kravetz, linux-doc, linux-kernel, cgroups,
	kernel-team

On Mon, May 24, 2021 at 12:53:39PM -0700, Suren Baghdasaryan wrote:
> PSI accounts stalls for each cgroup separately and aggregates it at each
> level of the hierarchy. This causes additional overhead with psi_avgs_work
> being called for each cgroup in the hierarchy. psi_avgs_work has been
> highly optimized, however on systems with large number of cgroups the
> overhead becomes noticeable.
> Systems which use PSI only at the system level could avoid this overhead
> if PSI can be configured to skip per-cgroup stall accounting.
> Add "cgroup_disable=pressure" kernel command-line option to allow
> requesting system-wide only pressure stall accounting. When set, it
> keeps system-wide accounting under /proc/pressure/ but skips accounting
> for individual cgroups and does not expose PSI nodes in cgroup hierarchy.
> 
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>

Acked-by: Johannes Weiner <hannes@cmpxchg.org>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable
  2021-05-25 13:00 ` Johannes Weiner
@ 2021-06-08 16:25   ` Suren Baghdasaryan
  2021-06-08 18:51     ` Johannes Weiner
  0 siblings, 1 reply; 8+ messages in thread
From: Suren Baghdasaryan @ 2021-06-08 16:25 UTC (permalink / raw)
  To: Johannes Weiner
  Cc: Tejun Heo, Zefan Li, Ingo Molnar, Peter Zijlstra, Shakeel Butt,
	Juri Lelli, Vincent Guittot, Dietmar Eggemann, Steven Rostedt,
	Benjamin Segall, Mel Gorman, Minchan Kim, Jonathan Corbet,
	Daniel Bristot de Oliveira, Paul E . McKenney, Randy Dunlap,
	Andrew Morton, Thomas Gleixner, macro, Viresh Kumar,
	Mike Kravetz, linux-doc, LKML, cgroups mailinglist, kernel-team

On Tue, May 25, 2021 at 6:00 AM Johannes Weiner <hannes@cmpxchg.org> wrote:
>
> On Mon, May 24, 2021 at 12:53:39PM -0700, Suren Baghdasaryan wrote:
> > PSI accounts stalls for each cgroup separately and aggregates it at each
> > level of the hierarchy. This causes additional overhead with psi_avgs_work
> > being called for each cgroup in the hierarchy. psi_avgs_work has been
> > highly optimized, however on systems with large number of cgroups the
> > overhead becomes noticeable.
> > Systems which use PSI only at the system level could avoid this overhead
> > if PSI can be configured to skip per-cgroup stall accounting.
> > Add "cgroup_disable=pressure" kernel command-line option to allow
> > requesting system-wide only pressure stall accounting. When set, it
> > keeps system-wide accounting under /proc/pressure/ but skips accounting
> > for individual cgroups and does not expose PSI nodes in cgroup hierarchy.
> >
> > Signed-off-by: Suren Baghdasaryan <surenb@google.com>
>
> Acked-by: Johannes Weiner <hannes@cmpxchg.org>

Gentle ping for cgroup folks to please take a look at the cgroup interface part.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable
  2021-06-08 16:25   ` Suren Baghdasaryan
@ 2021-06-08 18:51     ` Johannes Weiner
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Weiner @ 2021-06-08 18:51 UTC (permalink / raw)
  To: Suren Baghdasaryan
  Cc: Tejun Heo, Zefan Li, Ingo Molnar, Peter Zijlstra, Shakeel Butt,
	Juri Lelli, Vincent Guittot, Dietmar Eggemann, Steven Rostedt,
	Benjamin Segall, Mel Gorman, Minchan Kim, Jonathan Corbet,
	Daniel Bristot de Oliveira, Paul E . McKenney, Randy Dunlap,
	Andrew Morton, Thomas Gleixner, macro, Viresh Kumar,
	Mike Kravetz, linux-doc, LKML, cgroups mailinglist, kernel-team

On Tue, Jun 08, 2021 at 09:25:08AM -0700, Suren Baghdasaryan wrote:
> On Tue, May 25, 2021 at 6:00 AM Johannes Weiner <hannes@cmpxchg.org> wrote:
> >
> > On Mon, May 24, 2021 at 12:53:39PM -0700, Suren Baghdasaryan wrote:
> > > PSI accounts stalls for each cgroup separately and aggregates it at each
> > > level of the hierarchy. This causes additional overhead with psi_avgs_work
> > > being called for each cgroup in the hierarchy. psi_avgs_work has been
> > > highly optimized, however on systems with large number of cgroups the
> > > overhead becomes noticeable.
> > > Systems which use PSI only at the system level could avoid this overhead
> > > if PSI can be configured to skip per-cgroup stall accounting.
> > > Add "cgroup_disable=pressure" kernel command-line option to allow
> > > requesting system-wide only pressure stall accounting. When set, it
> > > keeps system-wide accounting under /proc/pressure/ but skips accounting
> > > for individual cgroups and does not expose PSI nodes in cgroup hierarchy.
> > >
> > > Signed-off-by: Suren Baghdasaryan <surenb@google.com>
> >
> > Acked-by: Johannes Weiner <hannes@cmpxchg.org>
> 
> Gentle ping for cgroup folks to please take a look at the cgroup interface part.

Tejun, this is more in cgroups territory than it is psi/scheduler, and
should go through the cgroup tree.

Both the psi and the cgroup side look good to me, and we have Peter's
ack from the scheduler too.

Do you have concerns about the cgroup side? If not, would you mind
picking this up for 5.14?

Thanks

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable
  2021-05-24 19:53 [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable Suren Baghdasaryan
                   ` (2 preceding siblings ...)
  2021-05-25 13:00 ` Johannes Weiner
@ 2021-06-08 19:01 ` Tejun Heo
  2021-06-08 19:01   ` Suren Baghdasaryan
  3 siblings, 1 reply; 8+ messages in thread
From: Tejun Heo @ 2021-06-08 19:01 UTC (permalink / raw)
  To: Suren Baghdasaryan
  Cc: hannes, lizefan.x, mingo, peterz, shakeelb, juri.lelli,
	vincent.guittot, dietmar.eggemann, rostedt, bsegall, mgorman,
	minchan, corbet, bristot, paulmck, rdunlap, akpm, tglx, macro,
	viresh.kumar, mike.kravetz, linux-doc, linux-kernel, cgroups,
	kernel-team

On Mon, May 24, 2021 at 12:53:39PM -0700, Suren Baghdasaryan wrote:
> PSI accounts stalls for each cgroup separately and aggregates it at each
> level of the hierarchy. This causes additional overhead with psi_avgs_work
> being called for each cgroup in the hierarchy. psi_avgs_work has been
> highly optimized, however on systems with large number of cgroups the
> overhead becomes noticeable.
> Systems which use PSI only at the system level could avoid this overhead
> if PSI can be configured to skip per-cgroup stall accounting.
> Add "cgroup_disable=pressure" kernel command-line option to allow
> requesting system-wide only pressure stall accounting. When set, it
> keeps system-wide accounting under /proc/pressure/ but skips accounting
> for individual cgroups and does not expose PSI nodes in cgroup hierarchy.
> 
> Signed-off-by: Suren Baghdasaryan <surenb@google.com>

Applied to cgroup/for-5.14.

Thanks.

-- 
tejun

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable
  2021-06-08 19:01 ` Tejun Heo
@ 2021-06-08 19:01   ` Suren Baghdasaryan
  0 siblings, 0 replies; 8+ messages in thread
From: Suren Baghdasaryan @ 2021-06-08 19:01 UTC (permalink / raw)
  To: Tejun Heo
  Cc: Johannes Weiner, Zefan Li, Ingo Molnar, Peter Zijlstra,
	Shakeel Butt, Juri Lelli, Vincent Guittot, Dietmar Eggemann,
	Steven Rostedt, Benjamin Segall, Mel Gorman, Minchan Kim,
	Jonathan Corbet, Daniel Bristot de Oliveira, Paul E . McKenney,
	Randy Dunlap, Andrew Morton, Thomas Gleixner, macro,
	Viresh Kumar, Mike Kravetz, linux-doc, LKML, cgroups mailinglist,
	kernel-team

On Tue, Jun 8, 2021 at 12:01 PM Tejun Heo <tj@kernel.org> wrote:
>
> On Mon, May 24, 2021 at 12:53:39PM -0700, Suren Baghdasaryan wrote:
> > PSI accounts stalls for each cgroup separately and aggregates it at each
> > level of the hierarchy. This causes additional overhead with psi_avgs_work
> > being called for each cgroup in the hierarchy. psi_avgs_work has been
> > highly optimized, however on systems with large number of cgroups the
> > overhead becomes noticeable.
> > Systems which use PSI only at the system level could avoid this overhead
> > if PSI can be configured to skip per-cgroup stall accounting.
> > Add "cgroup_disable=pressure" kernel command-line option to allow
> > requesting system-wide only pressure stall accounting. When set, it
> > keeps system-wide accounting under /proc/pressure/ but skips accounting
> > for individual cgroups and does not expose PSI nodes in cgroup hierarchy.
> >
> > Signed-off-by: Suren Baghdasaryan <surenb@google.com>
>
> Applied to cgroup/for-5.14.
>
> Thanks.

Thanks folks!

>
> --
> tejun

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-06-08 19:19 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-24 19:53 [PATCH v3 1/1] cgroup: make per-cgroup pressure stall tracking configurable Suren Baghdasaryan
2021-05-24 20:00 ` Suren Baghdasaryan
2021-05-25  7:12 ` Peter Zijlstra
2021-05-25 13:00 ` Johannes Weiner
2021-06-08 16:25   ` Suren Baghdasaryan
2021-06-08 18:51     ` Johannes Weiner
2021-06-08 19:01 ` Tejun Heo
2021-06-08 19:01   ` Suren Baghdasaryan

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).