From: Ronnie Sahlberg <lsahlber@redhat.com>
To: linux-cifs <linux-cifs@vger.kernel.org>
Cc: Steve French <smfrench@gmail.com>,
Ronnie Sahlberg <lsahlber@redhat.com>,
Paulo Alcantara <pc@cjr.nz>, Enzo Matsumiya <ematsumiya@suse.de>
Subject: [PATCH] cifs: destage dirty pages before re-reading them for cache=none
Date: Tue, 20 Sep 2022 07:37:59 +1000 [thread overview]
Message-ID: <20220919213759.487123-2-lsahlber@redhat.com> (raw)
In-Reply-To: <20220919213759.487123-1-lsahlber@redhat.com>
This is the opposite case of kernel bugzilla 216301.
If we mmap a file using cache=none and then proceed to update the mmapped
area these updates are not reflected in a later pread() of that part of the
file.
To fix this we must first destage any dirty pages in the range before
we allow the pread() to proceed.
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Reviewed-by: Enzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
fs/cifs/file.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 6f38b134a346..1f3eb97ef4ab 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -4271,6 +4271,15 @@ static ssize_t __cifs_readv(
len = ctx->len;
}
+ if (direct) {
+ rc = filemap_write_and_wait_range(file->f_inode->i_mapping,
+ offset, offset + len - 1);
+ if (rc) {
+ kref_put(&ctx->refcount, cifs_aio_ctx_release);
+ return rc;
+ }
+ }
+
/* grab a lock here due to read response handlers can access ctx */
mutex_lock(&ctx->aio_mutex);
--
2.35.3
next prev parent reply other threads:[~2022-09-19 21:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-19 21:37 Updated patch for the corruption with cache=none and mmap Ronnie Sahlberg
2022-09-19 21:37 ` Ronnie Sahlberg [this message]
2022-09-20 1:43 ` [PATCH] cifs: destage dirty pages before re-reading them for cache=none Tom Talpey
2022-09-20 4:08 ` Leif Sahlberg
2022-09-20 4:10 ` Steve French
2022-09-20 23:46 ` Updated patch for the corruption with cache=none and mmap ronnie sahlberg
-- strict thread matches above, loose matches on Subject: below --
2022-09-20 4:32 [PATCH] cifs: destage dirty pages before re-reading them for cache=none Ronnie Sahlberg
2022-09-20 4:44 ` Steve French
2022-09-20 19:08 ` Tom Talpey
2022-09-19 5:39 Improved fix for reading stale data when cache=none Ronnie Sahlberg
2022-09-19 5:39 ` [PATCH] cifs: destage dirty pages before re-reading them for cache=none Ronnie Sahlberg
2022-09-19 14:46 ` Paulo Alcantara
2022-09-19 14:54 ` Enzo Matsumiya
2022-09-19 21:21 ` ronnie sahlberg
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=20220919213759.487123-2-lsahlber@redhat.com \
--to=lsahlber@redhat.com \
--cc=ematsumiya@suse.de \
--cc=linux-cifs@vger.kernel.org \
--cc=pc@cjr.nz \
--cc=smfrench@gmail.com \
/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).