From: Tejun Heo <tj@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "David S. Miller" <davem@davemloft.net>,
pablo@netfilter.org, Patrick McHardy <kaber@trash.net>,
kadlec@blackhole.kfki.hu, Daniel Borkmann <daniel@iogearbox.net>,
daniel.wagner@bmw-carit.de, nhorman@tuxdriver.com,
Zefan Li <lizefan@huawei.com>,
Johannes Weiner <hannes@cmpxchg.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
cgroups@vger.kernel.org,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
kernel-team@fb.com, ninasc@fb.com,
Josh Triplett <josh@joshtriplett.org>
Subject: [PATCH] kernfs: make kernfs_walk_ns() use kernfs_pr_cont_buf[]
Date: Fri, 15 Jan 2016 12:30:14 -0500 [thread overview]
Message-ID: <20160115173014.GI3520@mtj.duckdns.org> (raw)
In-Reply-To: <CAMuHMdXT63aJ2hXJg9mtMv-PZYT7CEw+ab-j42_VoFB-ib+ghg@mail.gmail.com>
kernfs_walk_ns() uses a static path_buf[PATH_MAX] to separate out path
components. Keeping around the 4k buffer just for kernfs_walk_ns() is
wasteful. This patch makes it piggyback on kernfs_pr_cont_buf[]
instead. This requires kernfs_walk_ns() to hold kernfs_rename_lock.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Hello,
Greg, can you please route this one?
Thanks.
fs/kernfs/dir.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -698,15 +698,22 @@ static struct kernfs_node *kernfs_walk_n
const unsigned char *path,
const void *ns)
{
- static char path_buf[PATH_MAX]; /* protected by kernfs_mutex */
- size_t len = strlcpy(path_buf, path, PATH_MAX);
- char *p = path_buf;
- char *name;
+ size_t len;
+ char *p, *name;
lockdep_assert_held(&kernfs_mutex);
- if (len >= PATH_MAX)
+ /* grab kernfs_rename_lock to piggy back on kernfs_pr_cont_buf */
+ spin_lock_irq(&kernfs_rename_lock);
+
+ len = strlcpy(kernfs_pr_cont_buf, path, sizeof(kernfs_pr_cont_buf));
+
+ if (len >= sizeof(kernfs_pr_cont_buf)) {
+ spin_unlock_irq(&kernfs_rename_lock);
return NULL;
+ }
+
+ p = kernfs_pr_cont_buf;
while ((name = strsep(&p, "/")) && parent) {
if (*name == '\0')
@@ -714,6 +721,8 @@ static struct kernfs_node *kernfs_walk_n
parent = kernfs_find_ns(parent, name, ns);
}
+ spin_unlock_irq(&kernfs_rename_lock);
+
return parent;
}
next prev parent reply other threads:[~2016-01-15 17:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 22:38 [PATCHSET v4] netfilter, cgroup: implement cgroup2 path match in xt_cgroup Tejun Heo
2015-12-07 22:38 ` [PATCH 1/8] cgroup: record ancestor IDs and reimplement cgroup_is_descendant() using it Tejun Heo
2015-12-07 22:38 ` [PATCH 2/8] kernfs: implement kernfs_walk_and_get() Tejun Heo
[not found] ` <1449527935-27056-3-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2016-01-15 12:29 ` Geert Uytterhoeven
2016-01-15 17:30 ` Tejun Heo [this message]
[not found] ` <20160115173014.GI3520-qYNAdHglDFBN0TnZuCh8vA@public.gmane.org>
2016-01-15 22:05 ` [PATCH] kernfs: make kernfs_walk_ns() use kernfs_pr_cont_buf[] Greg Kroah-Hartman
2015-12-07 22:38 ` [PATCH 5/8] net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct Tejun Heo
2015-12-07 22:38 ` [PATCH 6/8] sock, cgroup: add sock->sk_cgroup Tejun Heo
2015-12-07 22:38 ` [PATCH 7/8] netfilter: prepare xt_cgroup for multi revisions Tejun Heo
2015-12-14 19:35 ` Pablo Neira Ayuso
2015-12-07 22:38 ` [PATCH 8/8] netfilter: implement xt_cgroup cgroup2 path match Tejun Heo
2015-12-14 19:37 ` Pablo Neira Ayuso
[not found] ` <1449527935-27056-9-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2016-02-12 0:10 ` Alban Crequy
[not found] ` <CAMXgnP7Eue2NQrUcRSNgM8NJT5XOscPWwqVkuh7LnwQn-1oQ_A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-02-12 16:05 ` Tejun Heo
[not found] ` <1449527935-27056-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2015-12-07 22:38 ` [PATCH 3/8] cgroup: implement cgroup_get_from_path() and expose cgroup_put() Tejun Heo
[not found] ` <1449527935-27056-4-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2015-12-22 0:22 ` Serge E. Hallyn
2015-12-22 18:13 ` Tejun Heo
2015-12-07 22:38 ` [PATCH 4/8] netprio_cgroup: limit the maximum css->id to USHRT_MAX Tejun Heo
2015-12-09 3:03 ` [PATCHSET v4] netfilter, cgroup: implement cgroup2 path match in xt_cgroup David Miller
2015-12-14 11:54 ` Dexuan Cui
2015-12-14 16:24 ` [PATCH net-next] net, cgroup: cgroup_sk_updat_lock was missing initializer Tejun Heo
2015-12-14 19:20 ` David Miller
[not found] ` <20151214.142043.1185024338854399910.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2015-12-15 2:11 ` Dexuan Cui
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=20160115173014.GI3520@mtj.duckdns.org \
--to=tj@kernel.org \
--cc=cgroups@vger.kernel.org \
--cc=coreteam@netfilter.org \
--cc=daniel.wagner@bmw-carit.de \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=hannes@cmpxchg.org \
--cc=josh@joshtriplett.org \
--cc=kaber@trash.net \
--cc=kadlec@blackhole.kfki.hu \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=ninasc@fb.com \
--cc=pablo@netfilter.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).