All of lore.kernel.org
 help / color / mirror / Atom feed
* + cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem.patch added to -mm tree
@ 2009-06-02  6:02 akpm
  2009-06-02  9:09 ` + cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem. patch " Dhaval Giani
  0 siblings, 1 reply; 9+ messages in thread
From: akpm @ 2009-06-02  6:02 UTC (permalink / raw)
  To: mm-commits; +Cc: lizf, balbir, dhaval, kamezawa.hiroyu, menage


The patch titled
     cgroups: forbid noprefix if mounting more than just cpuset subsystem
has been added to the -mm tree.  Its filename is
     cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: cgroups: forbid noprefix if mounting more than just cpuset subsystem
From: Li Zefan <lizf@cn.fujitsu.com>

The 'noprefix' option was introduced for backwards-compatibility of
cpuset, but actually it can be used when mounting other subsystems.

This results in possibility of name collision, and now the collision can
really happen, because we have 'stat' file in both memory and cpuacct
subsystem:

	# mount -t cgroup -o noprefix,memory,cpuacct xxx /mnt

Cgroup will happily mount the 2 subsystems, but only 'stat' file of memory
subsys can be seen.

We don't want users to use nopreifx, and also want to avoid name
collision, so we change to allow noprefix only if mounting just the cpuset
subsystem.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Paul Menage <menage@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/cgroup.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff -puN kernel/cgroup.c~cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem kernel/cgroup.c
--- a/kernel/cgroup.c~cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem
+++ a/kernel/cgroup.c
@@ -842,6 +842,11 @@ static int parse_cgroupfs_options(char *
 				     struct cgroup_sb_opts *opts)
 {
 	char *token, *o = data ?: "all";
+	unsigned long mask = (unsigned long)-1;
+
+#ifdef CONFIG_CPUSETS
+	mask = ~(1 << cpuset_subsys_id);
+#endif
 
 	opts->subsys_bits = 0;
 	opts->flags = 0;
@@ -886,6 +891,11 @@ static int parse_cgroupfs_options(char *
 		}
 	}
 
+	/* We allow noprefix only if mounting just the cpuset subsystem */
+	if (test_bit(ROOT_NOPREFIX, &opts->flags) &&
+	    (opts->subsys_bits & mask))
+		return -EINVAL;
+
 	/* We can't have an empty hierarchy */
 	if (!opts->subsys_bits)
 		return -EINVAL;
_

Patches currently in -mm which might be from lizf@cn.fujitsu.com are

origin.patch
linux-next.patch
mm-add-swap-cache-interface-for-swap-reference.patch
mm-modify-swap_map-and-add-swap_has_cache-flag.patch
mm-reuse-unused-swap-entry-if-necessary.patch
hexdump-remove-the-trailing-space.patch
cgroups-make-messages-more-readable.patch
cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem.patch
devcgroup-skip-superfluous-checks-when-found-the-dev_all-elem.patch
memcg-remove-some-redundant-checks.patch
memcg-remove-unneeded-forward-declaration-from-schedh.patch
memcg-fix-swap-accounting.patch


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

end of thread, other threads:[~2009-06-03  5:21 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-02  6:02 + cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem.patch added to -mm tree akpm
2009-06-02  9:09 ` + cgroups-forbid-noprefix-if-mounting-more-than-just-cpuset-subsystem. patch " Dhaval Giani
2009-06-02 16:08   ` Paul Menage
2009-06-02 17:40     ` Dhaval Giani
2009-06-02 20:35       ` Andrew Morton
2009-06-03  0:02         ` KAMEZAWA Hiroyuki
2009-06-03  5:20         ` Dhaval Giani
2009-06-02 23:27       ` Balbir Singh
2009-06-03  0:53       ` Li Zefan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.