From: Miklos Szeredi <miklos@szeredi.hu>
To: Amir Goldstein <amir73il@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Dave Chinner <david@fromorbit.com>,
overlayfs <linux-unionfs@vger.kernel.org>,
linux-fsdevel@vger.kernel.org
Subject: Re: [PATCH v2 5/6] vfs: fix fadvise64 syscall on an overlayfs file
Date: Sun, 26 Aug 2018 21:30:41 +0200 [thread overview]
Message-ID: <CAJfpegvwndyAPEbrB2aSRJWkUXLCATEU_4qSbG6C_MzzMo6ybw@mail.gmail.com> (raw)
In-Reply-To: <1535300717-26686-6-git-send-email-amir73il@gmail.com>
On Sun, Aug 26, 2018 at 6:25 PM, Amir Goldstein <amir73il@gmail.com> wrote:
> For an overlayfs file/inode, gage io is operating on the real underlying
> file, so the readahead hints set by fadvise64() should also be set on the
> real underlying file to take affect.
Hmm, how about making this be an f_op?
Would also fix readahead(2), which can be translated to fadvise(...,
POSIX_FADV_WILLNEED).
And possibly be useful for other filesystems, since there are cases
when things are not done through a_ops, yet the filesystem would
benefit from knowing the intentions of the user.
Thanks,
Miklos
>
> Fixes: d1d04ef8572b ("ovl: stack file ops")
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
> ---
> mm/fadvise.c | 34 ++++++++++++++++++++--------------
> 1 file changed, 20 insertions(+), 14 deletions(-)
>
> diff --git a/mm/fadvise.c b/mm/fadvise.c
> index 2d8376e3c640..d5528343ce77 100644
> --- a/mm/fadvise.c
> +++ b/mm/fadvise.c
> @@ -30,6 +30,7 @@
> int ksys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
> {
> struct fd f = fdget(fd);
> + struct file *file;
> struct inode *inode;
> struct address_space *mapping;
> struct backing_dev_info *bdi;
> @@ -42,13 +43,18 @@ int ksys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
> if (!f.file)
> return -EBADF;
>
> - inode = file_inode(f.file);
> + /*
> + * XXX: We need to use file_real() for overlayfs stacked file because
> + * readahead will be operating on the real underlying file/inode.
> + */
> + file = file_real(f.file);
> + inode = file_inode(file);
> if (S_ISFIFO(inode->i_mode)) {
> ret = -ESPIPE;
> goto out;
> }
>
> - mapping = f.file->f_mapping;
> + mapping = file->f_mapping;
> if (!mapping || len < 0) {
> ret = -EINVAL;
> goto out;
> @@ -85,21 +91,21 @@ int ksys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
>
> switch (advice) {
> case POSIX_FADV_NORMAL:
> - f.file->f_ra.ra_pages = bdi->ra_pages;
> - spin_lock(&f.file->f_lock);
> - f.file->f_mode &= ~FMODE_RANDOM;
> - spin_unlock(&f.file->f_lock);
> + file->f_ra.ra_pages = bdi->ra_pages;
> + spin_lock(&file->f_lock);
> + file->f_mode &= ~FMODE_RANDOM;
> + spin_unlock(&file->f_lock);
> break;
> case POSIX_FADV_RANDOM:
> - spin_lock(&f.file->f_lock);
> - f.file->f_mode |= FMODE_RANDOM;
> - spin_unlock(&f.file->f_lock);
> + spin_lock(&file->f_lock);
> + file->f_mode |= FMODE_RANDOM;
> + spin_unlock(&file->f_lock);
> break;
> case POSIX_FADV_SEQUENTIAL:
> - f.file->f_ra.ra_pages = bdi->ra_pages * 2;
> - spin_lock(&f.file->f_lock);
> - f.file->f_mode &= ~FMODE_RANDOM;
> - spin_unlock(&f.file->f_lock);
> + file->f_ra.ra_pages = bdi->ra_pages * 2;
> + spin_lock(&file->f_lock);
> + file->f_mode &= ~FMODE_RANDOM;
> + spin_unlock(&file->f_lock);
> break;
> case POSIX_FADV_WILLNEED:
> /* First and last PARTIAL page! */
> @@ -115,7 +121,7 @@ int ksys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
> * Ignore return value because fadvise() shall return
> * success even if filesystem can't retrieve a hint,
> */
> - force_page_cache_readahead(mapping, f.file, start_index,
> + force_page_cache_readahead(mapping, file, start_index,
> nrpages);
> break;
> case POSIX_FADV_NOREUSE:
> --
> 2.7.4
>
next prev parent reply other threads:[~2018-08-26 23:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-26 16:25 [PATCH v2 0/6] Overlayfs stacked f_op fixes Amir Goldstein
2018-08-26 16:25 ` [PATCH v2 1/6] vfs: add helper to get "real" overlayfs file Amir Goldstein
2018-08-26 16:25 ` [PATCH v2 2/6] ovl: respect FIEMAP_FLAG_SYNC flag Amir Goldstein
2018-08-26 19:26 ` Miklos Szeredi
2018-08-27 3:38 ` Dave Chinner
2018-08-27 6:20 ` Amir Goldstein
2018-08-27 23:05 ` Dave Chinner
2018-08-26 16:25 ` [PATCH v2 3/6] ovl: fix GPF in swapfile_activate of file from overlayfs over xfs Amir Goldstein
2018-08-27 3:43 ` Dave Chinner
2018-08-27 6:34 ` Amir Goldstein
2018-08-27 9:49 ` Miklos Szeredi
2018-08-26 16:25 ` [PATCH v2 4/6] vfs: fix readahead syscall on an overlayfs file Amir Goldstein
2018-08-26 16:25 ` [PATCH v2 5/6] vfs: fix fadvise64 " Amir Goldstein
2018-08-26 19:30 ` Miklos Szeredi [this message]
2018-08-26 21:23 ` Amir Goldstein
2018-08-26 16:25 ` [PATCH v2 6/6] vfs: fix sync_file_range " Amir Goldstein
2018-08-26 19:34 ` Miklos Szeredi
2018-08-26 21:55 ` Amir Goldstein
2018-08-27 4:23 ` Dave Chinner
2018-08-27 6:37 ` Amir Goldstein
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=CAJfpegvwndyAPEbrB2aSRJWkUXLCATEU_4qSbG6C_MzzMo6ybw@mail.gmail.com \
--to=miklos@szeredi.hu \
--cc=amir73il@gmail.com \
--cc=david@fromorbit.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-unionfs@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 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).