From: Justin He <Justin.He@arm.com>
To: Al Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Petr Mladek <pmladek@suse.com>,
Steven Rostedt <rostedt@goodmis.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Jonathan Corbet <corbet@lwn.net>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
"Eric W . Biederman" <ebiederm@xmission.com>,
"Darrick J. Wong" <darrick.wong@oracle.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Ira Weiny <ira.weiny@intel.com>,
Eric Biggers <ebiggers@google.com>,
"Ahmed S. Darwish" <a.darwish@linutronix.de>,
"open list:DOCUMENTATION" <linux-doc@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-s390 <linux-s390@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>, nd <nd@arm.com>
Subject: RE: [PATCH 07/14] d_path: lift -ENAMETOOLONG handling into callers of prepend_path()
Date: Mon, 28 Jun 2021 05:20:16 +0000 [thread overview]
Message-ID: <AM6PR08MB4376C948F728D815CA984349F7039@AM6PR08MB4376.eurprd08.prod.outlook.com> (raw)
In-Reply-To: <AM6PR08MB4376E091A9A84BE1240F3989F7069@AM6PR08MB4376.eurprd08.prod.outlook.com>
> -----Original Message-----
> From: Justin He
> Sent: Friday, June 25, 2021 5:18 PM
> To: Al Viro <viro@zeniv.linux.org.uk>; Linus Torvalds <torvalds@linux-
> foundation.org>
> Cc: Petr Mladek <pmladek@suse.com>; Steven Rostedt <rostedt@goodmis.org>;
> Sergey Senozhatsky <senozhatsky@chromium.org>; Andy Shevchenko
> <andriy.shevchenko@linux.intel.com>; Rasmus Villemoes
> <linux@rasmusvillemoes.dk>; Jonathan Corbet <corbet@lwn.net>; Heiko
> Carstens <hca@linux.ibm.com>; Vasily Gorbik <gor@linux.ibm.com>; Christian
> Borntraeger <borntraeger@de.ibm.com>; Eric W . Biederman
> <ebiederm@xmission.com>; Darrick J. Wong <darrick.wong@oracle.com>; Peter
> Zijlstra (Intel) <peterz@infradead.org>; Ira Weiny <ira.weiny@intel.com>;
> Eric Biggers <ebiggers@google.com>; Ahmed S. Darwish
> <a.darwish@linutronix.de>; open list:DOCUMENTATION <linux-
> doc@vger.kernel.org>; Linux Kernel Mailing List <linux-
> kernel@vger.kernel.org>; linux-s390 <linux-s390@vger.kernel.org>; linux-
> fsdevel <linux-fsdevel@vger.kernel.org>
> Subject: RE: [PATCH 07/14] d_path: lift -ENAMETOOLONG handling into callers
> of prepend_path()
>
> Hi Al
>
> > -----Original Message-----
> > From: Al Viro <viro@ftp.linux.org.uk> On Behalf Of Al Viro
> > Sent: Wednesday, May 19, 2021 8:49 AM
> > To: Linus Torvalds <torvalds@linux-foundation.org>
> > Cc: Justin He <Justin.He@arm.com>; Petr Mladek <pmladek@suse.com>; Steven
> > Rostedt <rostedt@goodmis.org>; Sergey Senozhatsky
> > <senozhatsky@chromium.org>; Andy Shevchenko
> > <andriy.shevchenko@linux.intel.com>; Rasmus Villemoes
> > <linux@rasmusvillemoes.dk>; Jonathan Corbet <corbet@lwn.net>; Heiko
> > Carstens <hca@linux.ibm.com>; Vasily Gorbik <gor@linux.ibm.com>;
> Christian
> > Borntraeger <borntraeger@de.ibm.com>; Eric W . Biederman
> > <ebiederm@xmission.com>; Darrick J. Wong <darrick.wong@oracle.com>; Peter
> > Zijlstra (Intel) <peterz@infradead.org>; Ira Weiny <ira.weiny@intel.com>;
> > Eric Biggers <ebiggers@google.com>; Ahmed S. Darwish
> > <a.darwish@linutronix.de>; open list:DOCUMENTATION <linux-
> > doc@vger.kernel.org>; Linux Kernel Mailing List <linux-
> > kernel@vger.kernel.org>; linux-s390 <linux-s390@vger.kernel.org>; linux-
> > fsdevel <linux-fsdevel@vger.kernel.org>
> > Subject: [PATCH 07/14] d_path: lift -ENAMETOOLONG handling into callers
> of
> > prepend_path()
> >
> > The only negative value ever returned by prepend_path() is -ENAMETOOLONG
> > and callers can recognize that situation (overflow) by looking at the
> > sign of buflen. Lift that into the callers; we already have the
> > same logics (buf if buflen is non-negative, ERR_PTR(-ENAMETOOLONG)
> > otherwise)
> > in several places and that'll become a new primitive several commits down
> > the road.
> >
> > Make prepend_path() return 0 instead of -ENAMETOOLONG. That makes for
> > saner calling conventions (0/1/2/3/-ENAMETOOLONG is obnoxious) and
> > callers actually get simpler, especially once the aforementioned
> > primitive gets added.
> >
> > In prepend_path() itself we switch prepending the / (in case of
> > empty path) to use of prepend() - no need to open-code that, compiler
> > will do the right thing. It's exactly the same logics as in
> > __dentry_path().
> >
> > Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> > ---
> > fs/d_path.c | 39 +++++++++++----------------------------
> > 1 file changed, 11 insertions(+), 28 deletions(-)
> >
> > diff --git a/fs/d_path.c b/fs/d_path.c
> > index 72b8087aaf9c..327cc3744554 100644
> > --- a/fs/d_path.c
> > +++ b/fs/d_path.c
> > @@ -127,8 +127,7 @@ static int prepend_path(const struct path *path,
> > }
> > parent = dentry->d_parent;
> > prefetch(parent);
> > - error = prepend_name(&bptr, &blen, &dentry->d_name);
> > - if (error)
> > + if (unlikely(prepend_name(&bptr, &blen, &dentry->d_name) < 0))
> > break;
> >
> > dentry = parent;
> > @@ -149,12 +148,9 @@ static int prepend_path(const struct path *path,
> > }
> > done_seqretry(&mount_lock, m_seq);
> >
> > - if (error >= 0 && bptr == *buffer) {
> > - if (--blen < 0)
> > - error = -ENAMETOOLONG;
> > - else
> > - *--bptr = '/';
> > - }
> > + if (blen == *buflen)
> > + prepend(&bptr, &blen, "/", 1);
> > +
> > *buffer = bptr;
> > *buflen = blen;
> > return error;
> > @@ -181,16 +177,11 @@ char *__d_path(const struct path *path,
> > char *buf, int buflen)
> > {
> > char *res = buf + buflen;
> > - int error;
> >
> > prepend(&res, &buflen, "", 1);
> > - error = prepend_path(path, root, &res, &buflen);
> > -
> > - if (error < 0)
> > - return ERR_PTR(error);
> > - if (error > 0)
> > + if (prepend_path(path, root, &res, &buflen) > 0)
> > return NULL;
> > - return res;
> > + return buflen >= 0 ? res : ERR_PTR(-ENAMETOOLONG);
> > }
> >
> > char *d_absolute_path(const struct path *path,
> > @@ -198,16 +189,11 @@ char *d_absolute_path(const struct path *path,
> > {
> > struct path root = {};
> > char *res = buf + buflen;
> > - int error;
> >
> > prepend(&res, &buflen, "", 1);
> > - error = prepend_path(path, &root, &res, &buflen);
> > -
> > - if (error > 1)
> > - error = -EINVAL;
> > - if (error < 0)
> > - return ERR_PTR(error);
> > - return res;
> > + if (prepend_path(path, &root, &res, &buflen) > 1)
> > + return ERR_PTR(-EINVAL);
> > + return buflen >= 0 ? res : ERR_PTR(-ENAMETOOLONG);
>
> This patch is *correct*.
> But do you mind changing like:
> if (buflen >= 0 || error == 1)
> return res;
> else
> return ERR_PTR(-ENAMETOOLONG);
>
> The reason why I comment here is that I will change the
> prepend_name in __prepend_path to prepend_name_with_len.
> The latter will go through all the dentries recursively instead
> of returning false if p.len<0.
> So (error == 1 && buflen < 0) is possible.
Please ignore it, this is not relevant to this patch itself, I can
draft a new patch if it is needed.
Hence:
Reviewed-by: Jia He <justin.he@arm.com>
next prev parent reply other threads:[~2021-06-28 5:20 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-08 12:25 [PATCH RFC 0/3] make '%pD' print full path for file Jia He
2021-05-08 12:25 ` [PATCH RFC 1/3] fs: introduce helper d_path_fast() Jia He
2021-05-08 15:30 ` Linus Torvalds
2021-05-08 19:13 ` Al Viro
2021-05-08 20:39 ` Linus Torvalds
2021-05-08 21:05 ` Al Viro
2021-05-08 22:17 ` Linus Torvalds
2021-05-08 22:46 ` Al Viro
2021-05-08 22:48 ` Linus Torvalds
2021-05-08 23:15 ` Al Viro
2021-05-08 23:18 ` Al Viro
2021-05-09 22:58 ` Eric W. Biederman
2021-05-10 12:51 ` Christian Brauner
2021-05-10 7:20 ` Christian Brauner
2021-05-08 22:42 ` Linus Torvalds
2021-05-08 22:47 ` Linus Torvalds
2021-05-09 2:28 ` Al Viro
2021-05-09 2:53 ` Linus Torvalds
2021-05-19 0:43 ` [PATCHSET] d_path cleanups Al Viro
2021-05-19 0:48 ` [PATCH 01/14] d_path: "\0" is {0,0}, not {0} Al Viro
2021-05-19 0:48 ` [PATCH 02/14] d_path: saner calling conventions for __dentry_path() Al Viro
2021-06-25 9:32 ` Justin He
2021-07-07 4:52 ` Justin He
2021-05-19 0:48 ` [PATCH 03/14] d_path: regularize handling of root dentry in __dentry_path() Al Viro
2021-07-07 4:50 ` Justin He
2021-05-19 0:48 ` [PATCH 04/14] d_path: get rid of path_with_deleted() Al Viro
2021-05-19 0:48 ` [PATCH 05/14] getcwd(2): saner logics around prepend_path() call Al Viro
2021-07-07 7:41 ` Justin He
2021-05-19 0:48 ` [PATCH 06/14] d_path: don't bother with return value of prepend() Al Viro
2021-06-24 6:13 ` Justin He
2021-05-19 0:48 ` [PATCH 07/14] d_path: lift -ENAMETOOLONG handling into callers of prepend_path() Al Viro
2021-06-25 9:18 ` Justin He
2021-06-28 5:20 ` Justin He [this message]
2021-05-19 0:48 ` [PATCH 08/14] d_path: make prepend_name() boolean Al Viro
2021-05-20 9:12 ` Justin He
2021-05-20 9:19 ` Andy Shevchenko
2021-05-20 14:53 ` Petr Mladek
2021-05-20 19:35 ` Al Viro
2021-07-07 7:43 ` Justin He
2021-05-19 0:48 ` [PATCH 09/14] d_path: introduce struct prepend_buffer Al Viro
2021-06-23 13:28 ` Justin He
2021-06-24 9:29 ` Enrico Weigelt, metux IT consult
2021-06-25 0:43 ` Justin He
2021-06-28 16:42 ` Enrico Weigelt, metux IT consult
2021-06-28 17:10 ` Andy Shevchenko
2021-05-19 0:48 ` [PATCH 10/14] d_path: prepend_path(): get rid of vfsmnt Al Viro
2021-05-19 0:48 ` [PATCH 11/14] d_path: prepend_path(): lift resetting b in case when we'd return 3 out of loop Al Viro
2021-05-19 0:48 ` [PATCH 12/14] d_path: prepend_path(): lift the inner loop into a new helper Al Viro
2021-05-19 8:07 ` Andy Shevchenko
2021-05-19 15:55 ` Al Viro
2021-07-07 7:52 ` Justin He
2021-05-19 0:49 ` [PATCH 13/14] d_path: prepend_path() is unlikely to return non-zero Al Viro
2021-06-25 8:00 ` Justin He
2021-06-25 17:58 ` Al Viro
2021-06-28 3:28 ` Justin He
2021-06-28 4:14 ` Al Viro
2021-06-28 4:36 ` Justin He
2021-06-28 4:37 ` Justin He
2021-05-19 0:49 ` [PATCH 14/14] getcwd(2): clean up error handling Al Viro
2021-07-07 8:03 ` Justin He
2021-06-24 6:05 ` [PATCH 01/14] d_path: "\0" is {0,0}, not {0} Justin He
2021-05-19 2:39 ` [PATCHSET] d_path cleanups Linus Torvalds
2021-06-22 14:00 ` Justin He
2021-05-09 2:20 ` [PATCH RFC 1/3] fs: introduce helper d_path_fast() Al Viro
2021-05-09 4:58 ` Al Viro
2021-05-10 16:16 ` Eric W. Biederman
2021-05-10 15:07 ` Justin He
2021-05-10 17:03 ` Linus Torvalds
2021-05-08 12:25 ` [PATCH RFC 2/3] lib/vsprintf.c: make %pD print full path for file Jia He
2021-05-10 3:46 ` Sergey Senozhatsky
2021-05-10 13:04 ` Petr Mladek
2021-05-10 14:25 ` Justin He
2021-05-27 7:20 ` Justin He
2021-05-27 9:14 ` Petr Mladek
2021-05-08 12:25 ` [PATCH RFC 3/3] s390/hmcdrv: remove the redundant directory path in debug message Jia He
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=AM6PR08MB4376C948F728D815CA984349F7039@AM6PR08MB4376.eurprd08.prod.outlook.com \
--to=justin.he@arm.com \
--cc=a.darwish@linutronix.de \
--cc=andriy.shevchenko@linux.intel.com \
--cc=borntraeger@de.ibm.com \
--cc=corbet@lwn.net \
--cc=darrick.wong@oracle.com \
--cc=ebiederm@xmission.com \
--cc=ebiggers@google.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=ira.weiny@intel.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=nd@arm.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=senozhatsky@chromium.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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).