From: Al Viro <viro@zeniv.linux.org.uk>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Christoph Hellwig <hch@lst.de>,
Greg KH <gregkh@linuxfoundation.org>,
Alexey Dobriyan <adobriyan@gmail.com>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/6] seq_file: add seq_read_iter
Date: Wed, 11 Nov 2020 21:52:20 +0000 [thread overview]
Message-ID: <20201111215220.GA3576660@ZenIV.linux.org.uk> (raw)
In-Reply-To: <CAHk-=whTqr4Lp0NYR6k3yc2EbiF0RR17=TJPa4JBQATMR__XqA@mail.gmail.com>
On Wed, Nov 11, 2020 at 09:54:12AM -0800, Linus Torvalds wrote:
> On Tue, Nov 10, 2020 at 3:20 PM Al Viro <viro@zeniv.linux.org.uk> wrote:
> >
> > Any objections to the following?
>
> Well, I don't _object_, but I find it ugly.
>
> And I think both the old and the "fixed" code is wrong when an EFAULT
> happens in the middle.
>
> Yes, we can just return EFAULT. But for read() and write() we really
> try to do the proper partial returns in other places, why not here?
>
> IOW, why isn't the proper fix just something like this:
>
> diff --git a/fs/seq_file.c b/fs/seq_file.c
> index 3b20e21604e7..ecc6909b71f5 100644
> --- a/fs/seq_file.c
> +++ b/fs/seq_file.c
> @@ -209,7 +209,8 @@ ssize_t seq_read_iter(struct kiocb *iocb,
> struct iov_iter *iter)
> /* if not empty - flush it first */
> if (m->count) {
> n = min(m->count, size);
> - if (copy_to_iter(m->buf + m->from, n, iter) != n)
> + n = copy_to_iter(m->buf + m->from, n, iter);
> + if (!n)
> goto Efault;
> m->count -= n;
> m->from += n;
>
> which should get the "efault in the middle" case roughly right (ie the
> usual "exact byte alignment and page crosser" caveats apply).
Look at the loop after that one, specifically the "it doesn't fit,
allocate a bigger one" part:
kvfree(m->buf);
m->count = 0;
m->buf = seq_buf_alloc(m->size <<= 1);
It really depends upon having m->buf empty at the beginning of
the loop. Your variant will lose the data, unless we copy the
"old" part of buffer (from before the ->show()) into the
larger one.
That can be done, but I would rather go with
n = copy_to_iter(m->buf + m->from, m->count, iter);
m->count -= n;
m->from += n;
copied += n;
if (!size)
goto Done;
if (m->count)
goto Efault;
if we do it that way. Let me see if I can cook something
reasonable along those lines...
next prev parent reply other threads:[~2020-11-11 21:52 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 8:27 support splice reads on seq_file based procfs files v2 Christoph Hellwig
2020-11-04 8:27 ` [PATCH 1/6] seq_file: add seq_read_iter Christoph Hellwig
2020-11-10 21:32 ` Al Viro
2020-11-10 21:35 ` Al Viro
2020-11-10 23:20 ` Al Viro
2020-11-11 7:55 ` Christoph Hellwig
2020-11-11 17:54 ` Linus Torvalds
2020-11-11 21:52 ` Al Viro [this message]
2020-11-11 22:21 ` Al Viro
2020-11-11 22:27 ` Linus Torvalds
2020-11-11 23:00 ` Al Viro
2020-11-13 23:54 ` Nathan Chancellor
2020-11-14 1:17 ` Al Viro
2020-11-14 3:01 ` Nathan Chancellor
2020-11-14 3:54 ` Al Viro
2020-11-14 4:14 ` Nathan Chancellor
2020-11-14 5:50 ` Al Viro
2020-11-14 6:19 ` Nathan Chancellor
2020-11-14 7:00 ` Al Viro
2020-11-14 20:50 ` Al Viro
2020-11-15 15:53 ` Al Viro
2020-11-15 16:56 ` Linus Torvalds
2020-11-15 21:41 ` Nathan Chancellor
2020-11-15 23:38 ` Al Viro
2020-11-15 23:51 ` Nathan Chancellor
2020-11-16 0:25 ` Al Viro
2020-11-16 0:34 ` Nathan Chancellor
2020-11-16 3:29 ` Al Viro
2020-11-27 16:29 ` Christoph Hellwig
2020-12-08 16:35 ` Christoph Hellwig
2020-12-08 18:34 ` Linus Torvalds
2020-12-08 19:49 ` Al Viro
2020-12-08 20:25 ` Linus Torvalds
2020-12-08 20:53 ` Al Viro
2020-12-08 21:01 ` Linus Torvalds
2020-12-08 19:49 ` Greg KH
2020-11-14 21:44 ` Al Viro
2020-11-04 8:27 ` [PATCH 2/6] proc: wire up generic_file_splice_read for iter ops Christoph Hellwig
2020-11-04 8:27 ` [PATCH 3/6] proc/cpuinfo: switch to ->read_iter Christoph Hellwig
2020-11-04 8:27 ` [PATCH 4/6] proc/stat: " Christoph Hellwig
2020-11-04 8:27 ` [PATCH 5/6] proc "single files": " Christoph Hellwig
2020-11-04 8:27 ` [PATCH 6/6] proc "seq " Christoph Hellwig
2020-11-04 17:53 ` support splice reads on seq_file based procfs files v2 Linus Torvalds
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=20201111215220.GA3576660@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=adobriyan@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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).