From: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org,
pablo-Cap9r6Oaw4JrovVCs/uTlw@public.gmane.org,
kaber-dcUjhNyLwpNeoWH0uzbU5w@public.gmane.org,
kadlec-K40Dz/62t/MgiyqX0sVFJYdd74u8MsAO@public.gmane.org,
daniel-FeC+5ew28dpmcu3hnIyYJQ@public.gmane.org,
daniel.wagner-98C5kh4wR6ohFhg+JK9F0w@public.gmane.org,
nhorman-2XuSBdqkA4SvXiR4WA35Jg@public.gmane.org
Cc: lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org,
hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
netfilter-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
coreteam-Cap9r6Oaw4JrovVCs/uTlw@public.gmane.org,
cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
kernel-team-b10kYP2dOMg@public.gmane.org,
ninasc-b10kYP2dOMg@public.gmane.org,
Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Subject: [PATCH 3/9] cgroup: implement cgroup_get_from_path() and expose cgroup_put()
Date: Sat, 21 Nov 2015 11:13:55 -0500 [thread overview]
Message-ID: <1448122441-9335-4-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1448122441-9335-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Implement cgroup_get_from_path() using kernfs_walk_and_get() which
obtains a default hierarchy cgroup from its path. This will be used
to allow cgroup path based matching from outside cgroup proper -
e.g. networking and perf.
v2: Add EXPORT_SYMBOL_GPL(cgroup_get_from_path).
Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
include/linux/cgroup.h | 7 +++++++
kernel/cgroup.c | 39 ++++++++++++++++++++++++++++++++++-----
2 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index b5ee2c4..4c3ffab 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -81,6 +81,8 @@ struct cgroup_subsys_state *cgroup_get_e_css(struct cgroup *cgroup,
struct cgroup_subsys_state *css_tryget_online_from_dir(struct dentry *dentry,
struct cgroup_subsys *ss);
+struct cgroup *cgroup_get_from_path(const char *path);
+
int cgroup_attach_task_all(struct task_struct *from, struct task_struct *);
int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from);
@@ -351,6 +353,11 @@ static inline void css_put_many(struct cgroup_subsys_state *css, unsigned int n)
percpu_ref_put_many(&css->refcnt, n);
}
+static inline void cgroup_put(struct cgroup *cgrp)
+{
+ css_put(&cgrp->self);
+}
+
/**
* task_css_set_check - obtain a task's css_set with extra access conditions
* @task: the task to obtain css_set for
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 3190040..3db5e8f 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -434,11 +434,6 @@ static bool cgroup_tryget(struct cgroup *cgrp)
return css_tryget(&cgrp->self);
}
-static void cgroup_put(struct cgroup *cgrp)
-{
- css_put(&cgrp->self);
-}
-
struct cgroup_subsys_state *of_css(struct kernfs_open_file *of)
{
struct cgroup *cgrp = of->kn->parent->priv;
@@ -5753,6 +5748,40 @@ struct cgroup_subsys_state *css_from_id(int id, struct cgroup_subsys *ss)
return id > 0 ? idr_find(&ss->css_idr, id) : NULL;
}
+/**
+ * cgroup_get_from_path - lookup and get a cgroup from its default hierarchy path
+ * @path: path on the default hierarchy
+ *
+ * Find the cgroup at @path on the default hierarchy, increment its
+ * reference count and return it. Returns pointer to the found cgroup on
+ * success, ERR_PTR(-ENOENT) if @path doens't exist and ERR_PTR(-ENOTDIR)
+ * if @path points to a non-directory.
+ */
+struct cgroup *cgroup_get_from_path(const char *path)
+{
+ struct kernfs_node *kn;
+ struct cgroup *cgrp;
+
+ mutex_lock(&cgroup_mutex);
+
+ kn = kernfs_walk_and_get(cgrp_dfl_root.cgrp.kn, path);
+ if (kn) {
+ if (kernfs_type(kn) == KERNFS_DIR) {
+ cgrp = kn->priv;
+ cgroup_get(cgrp);
+ } else {
+ cgrp = ERR_PTR(-ENOTDIR);
+ }
+ kernfs_put(kn);
+ } else {
+ cgrp = ERR_PTR(-ENOENT);
+ }
+
+ mutex_unlock(&cgroup_mutex);
+ return cgrp;
+}
+EXPORT_SYMBOL_GPL(cgroup_get_from_path);
+
#ifdef CONFIG_CGROUP_DEBUG
static struct cgroup_subsys_state *
debug_css_alloc(struct cgroup_subsys_state *parent_css)
--
2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj@kernel.org>
To: davem@davemloft.net, pablo@netfilter.org, kaber@trash.net,
kadlec@blackhole.kfki.hu, daniel@iogearbox.net,
daniel.wagner@bmw-carit.de, nhorman@tuxdriver.co
Cc: lizefan@huawei.com, hannes@cmpxchg.org, netdev@vger.kernel.org,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
cgroups@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-team@fb.com, ninasc@fb.com, Tejun Heo <tj@kernel.org>
Subject: [PATCH 3/9] cgroup: implement cgroup_get_from_path() and expose cgroup_put()
Date: Sat, 21 Nov 2015 11:13:55 -0500 [thread overview]
Message-ID: <1448122441-9335-4-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1448122441-9335-1-git-send-email-tj@kernel.org>
Implement cgroup_get_from_path() using kernfs_walk_and_get() which
obtains a default hierarchy cgroup from its path. This will be used
to allow cgroup path based matching from outside cgroup proper -
e.g. networking and perf.
v2: Add EXPORT_SYMBOL_GPL(cgroup_get_from_path).
Signed-off-by: Tejun Heo <tj@kernel.org>
---
include/linux/cgroup.h | 7 +++++++
kernel/cgroup.c | 39 ++++++++++++++++++++++++++++++++++-----
2 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index b5ee2c4..4c3ffab 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -81,6 +81,8 @@ struct cgroup_subsys_state *cgroup_get_e_css(struct cgroup *cgroup,
struct cgroup_subsys_state *css_tryget_online_from_dir(struct dentry *dentry,
struct cgroup_subsys *ss);
+struct cgroup *cgroup_get_from_path(const char *path);
+
int cgroup_attach_task_all(struct task_struct *from, struct task_struct *);
int cgroup_transfer_tasks(struct cgroup *to, struct cgroup *from);
@@ -351,6 +353,11 @@ static inline void css_put_many(struct cgroup_subsys_state *css, unsigned int n)
percpu_ref_put_many(&css->refcnt, n);
}
+static inline void cgroup_put(struct cgroup *cgrp)
+{
+ css_put(&cgrp->self);
+}
+
/**
* task_css_set_check - obtain a task's css_set with extra access conditions
* @task: the task to obtain css_set for
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 3190040..3db5e8f 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -434,11 +434,6 @@ static bool cgroup_tryget(struct cgroup *cgrp)
return css_tryget(&cgrp->self);
}
-static void cgroup_put(struct cgroup *cgrp)
-{
- css_put(&cgrp->self);
-}
-
struct cgroup_subsys_state *of_css(struct kernfs_open_file *of)
{
struct cgroup *cgrp = of->kn->parent->priv;
@@ -5753,6 +5748,40 @@ struct cgroup_subsys_state *css_from_id(int id, struct cgroup_subsys *ss)
return id > 0 ? idr_find(&ss->css_idr, id) : NULL;
}
+/**
+ * cgroup_get_from_path - lookup and get a cgroup from its default hierarchy path
+ * @path: path on the default hierarchy
+ *
+ * Find the cgroup at @path on the default hierarchy, increment its
+ * reference count and return it. Returns pointer to the found cgroup on
+ * success, ERR_PTR(-ENOENT) if @path doens't exist and ERR_PTR(-ENOTDIR)
+ * if @path points to a non-directory.
+ */
+struct cgroup *cgroup_get_from_path(const char *path)
+{
+ struct kernfs_node *kn;
+ struct cgroup *cgrp;
+
+ mutex_lock(&cgroup_mutex);
+
+ kn = kernfs_walk_and_get(cgrp_dfl_root.cgrp.kn, path);
+ if (kn) {
+ if (kernfs_type(kn) == KERNFS_DIR) {
+ cgrp = kn->priv;
+ cgroup_get(cgrp);
+ } else {
+ cgrp = ERR_PTR(-ENOTDIR);
+ }
+ kernfs_put(kn);
+ } else {
+ cgrp = ERR_PTR(-ENOENT);
+ }
+
+ mutex_unlock(&cgroup_mutex);
+ return cgrp;
+}
+EXPORT_SYMBOL_GPL(cgroup_get_from_path);
+
#ifdef CONFIG_CGROUP_DEBUG
static struct cgroup_subsys_state *
debug_css_alloc(struct cgroup_subsys_state *parent_css)
--
2.5.0
next prev parent reply other threads:[~2015-11-21 16:13 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-21 16:13 [PATCHSET v3] netfilter, cgroup: implement cgroup2 path match in xt_cgroup Tejun Heo
2015-11-21 16:13 ` Tejun Heo
2015-11-21 16:13 ` [PATCH 1/9] cgroup: record ancestor IDs and reimplement cgroup_is_descendant() using it Tejun Heo
2015-11-21 16:13 ` [PATCH 2/9] kernfs: implement kernfs_walk_and_get() Tejun Heo
2015-11-21 16:13 ` [PATCH 4/9] cgroups: Allow dynamically changing net_classid Tejun Heo
2015-11-21 16:13 ` [PATCH 5/9] netprio_cgroup: limit the maximum css->id to USHRT_MAX Tejun Heo
2015-11-21 16:13 ` [PATCH 6/9] net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct Tejun Heo
2015-11-21 16:13 ` [PATCH 7/9] sock, cgroup: add sock->sk_cgroup Tejun Heo
2015-11-23 13:02 ` Daniel Wagner
2015-11-23 13:02 ` Daniel Wagner
[not found] ` <56530E4B.4090209-98C5kh4wR6ohFhg+JK9F0w@public.gmane.org>
2015-11-23 15:48 ` Tejun Heo
2015-11-23 15:48 ` Tejun Heo
2015-11-23 15:53 ` Daniel Wagner
2015-11-23 15:53 ` Daniel Wagner
2015-11-21 16:14 ` [PATCH 8/9] netfilter: prepare xt_cgroup for multi revisions Tejun Heo
2015-11-23 12:44 ` Daniel Wagner
2015-11-23 12:44 ` Daniel Wagner
2015-11-21 16:14 ` [PATCH 9/9] netfilter: implement xt_cgroup cgroup2 path match Tejun Heo
[not found] ` <1448122441-9335-10-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2015-11-21 16:56 ` Florian Westphal
2015-11-21 16:56 ` Florian Westphal
[not found] ` <20151121165605.GC25336-E0PNVn5OA6ohrxcnuTQ+TQ@public.gmane.org>
2015-11-21 17:04 ` Tejun Heo
2015-11-21 17:04 ` Tejun Heo
2015-11-21 18:54 ` Florian Westphal
2015-11-21 20:26 ` Jan Engelhardt
2015-11-23 13:43 ` Daniel Borkmann
[not found] ` <565317F0.2030502-FeC+5ew28dpmcu3hnIyYJQ@public.gmane.org>
2015-11-23 13:51 ` Daniel Borkmann
2015-11-23 13:51 ` Daniel Borkmann
2015-11-23 15:40 ` Tejun Heo
2015-11-23 15:40 ` Tejun Heo
2015-11-23 17:35 ` David Laight
[not found] ` <063D6719AE5E284EB5DD2968C1650D6D1CBDA8E2-VkEWCZq2GCInGFn1LkZF6NBPR1lH4CV8@public.gmane.org>
2015-11-23 17:55 ` Jan Engelhardt
2015-11-23 17:55 ` Jan Engelhardt
2015-11-23 17:55 ` Jan Engelhardt
2015-11-23 12:43 ` Daniel Wagner
2015-11-23 12:43 ` Daniel Wagner
2015-11-23 12:43 ` Daniel Wagner
[not found] ` <565309D5.80707-98C5kh4wR6ohFhg+JK9F0w@public.gmane.org>
2015-11-23 15:41 ` Tejun Heo
2015-11-23 15:41 ` Tejun Heo
2015-11-21 16:17 ` [PATCHSET v3] netfilter, cgroup: implement cgroup2 path match in xt_cgroup Tejun Heo
2015-11-21 16:18 ` [PATCH 1/2 iptables] libxt_cgroup: prepare for multi revisions Tejun Heo
[not found] ` <20151121161846.GB3428-piEFEHQLUPpN0TnZuCh8vA@public.gmane.org>
2015-11-21 16:19 ` [PATCH 2/2 iptables] libxt_cgroup: add support for cgroup2 path matching Tejun Heo
2015-11-21 16:19 ` Tejun Heo
2015-11-22 20:31 ` [PATCH 1/2 iptables] libxt_cgroup: prepare for multi revisions Pablo Neira Ayuso
2015-11-22 20:34 ` Pablo Neira Ayuso
2015-11-22 20:34 ` Pablo Neira Ayuso
[not found] ` <1448122441-9335-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2015-11-21 16:13 ` Tejun Heo [this message]
2015-11-21 16:13 ` [PATCH 3/9] cgroup: implement cgroup_get_from_path() and expose cgroup_put() Tejun Heo
2015-11-23 7:11 ` [PATCHSET v3] netfilter, cgroup: implement cgroup2 path match in xt_cgroup Daniel Wagner
2015-11-23 7:11 ` Daniel Wagner
2015-11-23 7:11 ` Daniel Wagner
[not found] ` <5652BC3A.1010701-98C5kh4wR6ohFhg+JK9F0w@public.gmane.org>
2015-11-23 8:54 ` Daniel Wagner
2015-11-23 8:54 ` Daniel Wagner
2015-11-23 8:54 ` Daniel Wagner
[not found] ` <5652D448.3080002-98C5kh4wR6ohFhg+JK9F0w@public.gmane.org>
2015-11-23 15:53 ` Tejun Heo
2015-11-23 15:53 ` Tejun Heo
[not found] ` <20151123155346.GE3049-qYNAdHglDFBN0TnZuCh8vA@public.gmane.org>
2015-11-23 15:57 ` Daniel Wagner
2015-11-23 15:57 ` Daniel Wagner
2015-11-23 15:57 ` Daniel Wagner
2015-11-23 19:58 ` Tejun Heo
2015-11-23 20:45 ` David Miller
[not found] ` <20151123.154523.125969708507852672.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2015-11-23 20:54 ` Tejun Heo
2015-11-23 20:54 ` Tejun Heo
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=1448122441-9335-4-git-send-email-tj@kernel.org \
--to=tj-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \
--cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=coreteam-Cap9r6Oaw4JrovVCs/uTlw@public.gmane.org \
--cc=daniel-FeC+5ew28dpmcu3hnIyYJQ@public.gmane.org \
--cc=daniel.wagner-98C5kh4wR6ohFhg+JK9F0w@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org \
--cc=kaber-dcUjhNyLwpNeoWH0uzbU5w@public.gmane.org \
--cc=kadlec-K40Dz/62t/MgiyqX0sVFJYdd74u8MsAO@public.gmane.org \
--cc=kernel-team-b10kYP2dOMg@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=netfilter-devel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=nhorman-2XuSBdqkA4SvXiR4WA35Jg@public.gmane.org \
--cc=ninasc-b10kYP2dOMg@public.gmane.org \
--cc=pablo-Cap9r6Oaw4JrovVCs/uTlw@public.gmane.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 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.