From: Ira Weiny <ira.weiny@intel.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: Re: [PATCH 10/11] fs: remove __vfs_read
Date: Fri, 8 May 2020 08:45:53 -0700 [thread overview]
Message-ID: <20200508154552.GB1431382@iweiny-DESK2.sc.intel.com> (raw)
In-Reply-To: <20200508092222.2097-11-hch@lst.de>
On Fri, May 08, 2020 at 11:22:21AM +0200, Christoph Hellwig wrote:
> Fold it into the two callers.
In 5.7-rc4, it looks like __vfs_read() is called from
security/integrity/iint.c
Was that removed somewhere prior to this patch?
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> fs/read_write.c | 43 +++++++++++++++++++++----------------------
> include/linux/fs.h | 1 -
> 2 files changed, 21 insertions(+), 23 deletions(-)
>
> diff --git a/fs/read_write.c b/fs/read_write.c
> index 0ffbed5fd8136..f0009b506014c 100644
> --- a/fs/read_write.c
> +++ b/fs/read_write.c
> @@ -419,17 +419,6 @@ static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, lo
> return ret;
> }
>
> -ssize_t __vfs_read(struct file *file, char __user *buf, size_t count,
> - loff_t *pos)
> -{
> - if (file->f_op->read)
> - return file->f_op->read(file, buf, count, pos);
> - else if (file->f_op->read_iter)
> - return new_sync_read(file, buf, count, pos);
> - else
> - return -EINVAL;
> -}
> -
> ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
> {
> mm_segment_t old_fs = get_fs();
> @@ -441,7 +430,12 @@ ssize_t __kernel_read(struct file *file, void *buf, size_t count, loff_t *pos)
> if (count > MAX_RW_COUNT)
> count = MAX_RW_COUNT;
> set_fs(KERNEL_DS);
> - ret = __vfs_read(file, (void __user *)buf, count, pos);
> + if (file->f_op->read)
> + ret = file->f_op->read(file, (void __user *)buf, count, pos);
> + else if (file->f_op->read_iter)
> + ret = new_sync_read(file, (void __user *)buf, count, pos);
> + else
> + ret = -EINVAL;
> set_fs(old_fs);
> if (ret > 0) {
> fsnotify_access(file);
> @@ -474,17 +468,22 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
> return -EFAULT;
>
> ret = rw_verify_area(READ, file, pos, count);
> - if (!ret) {
> - if (count > MAX_RW_COUNT)
> - count = MAX_RW_COUNT;
> - ret = __vfs_read(file, buf, count, pos);
> - if (ret > 0) {
> - fsnotify_access(file);
> - add_rchar(current, ret);
> - }
> - inc_syscr(current);
> - }
> + if (ret)
> + return ret;
> + if (count > MAX_RW_COUNT)
> + count = MAX_RW_COUNT;
Couldn't this clean up still happen while keeping __vfs_read()?
Ira
> + if (file->f_op->read)
> + ret = file->f_op->read(file, buf, count, pos);
> + else if (file->f_op->read_iter)
> + ret = new_sync_read(file, buf, count, pos);
> + else
> + ret = -EINVAL;
> + if (ret > 0) {
> + fsnotify_access(file);
> + add_rchar(current, ret);
> + }
> + inc_syscr(current);
> return ret;
> }
>
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 6441aaa25f8f2..4c10a07a36178 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -1905,7 +1905,6 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
> struct iovec *fast_pointer,
> struct iovec **ret_pointer);
>
> -extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
> extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
> extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
> extern ssize_t vfs_readv(struct file *, const struct iovec __user *,
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-05-08 15:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 9:22 clean up kernel_{read,write} & friends Christoph Hellwig
2020-05-08 9:22 ` [PATCH 01/11] fs: call file_{start,end}_write from __kernel_write Christoph Hellwig
2020-05-08 9:22 ` [PATCH 02/11] fs: check FMODE_WRITE in __kernel_write Christoph Hellwig
2020-05-08 9:22 ` [PATCH 03/11] fs: remove the call_{read,write}_iter functions Christoph Hellwig
2020-05-08 9:22 ` [PATCH 04/11] fs: implement kernel_write using __kernel_write Christoph Hellwig
2020-05-08 9:22 ` [PATCH 05/11] fs: remove __vfs_write Christoph Hellwig
2020-05-08 9:22 ` [PATCH 06/11] fs: don't change the address limit for ->write_iter in __kernel_write Christoph Hellwig
2020-05-08 9:22 ` [PATCH 07/11] fs: add a __kernel_read helper Christoph Hellwig
2020-05-08 9:22 ` [PATCH 08/11] integrity/ima: switch to using __kernel_read Christoph Hellwig
2020-05-08 9:22 ` [PATCH 09/11] fs: implement kernel_read " Christoph Hellwig
2020-05-08 9:22 ` [PATCH 10/11] fs: remove __vfs_read Christoph Hellwig
2020-05-08 15:45 ` Ira Weiny [this message]
2020-05-08 15:46 ` Christoph Hellwig
2020-05-08 9:22 ` [PATCH 11/11] fs: don't change the address limit for ->read_iter in __kernel_read Christoph Hellwig
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=20200508154552.GB1431382@iweiny-DESK2.sc.intel.com \
--to=ira.weiny@intel.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.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 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.