From: Goldwyn Rodrigues <rgoldwyn@suse.de>
To: linux-fsdevel@vger.kernel.org
Cc: linux-ext4@vger.kernel.org, linux-btrfs@vger.kernel.org,
hch@infradead.org, andres@anarazel.de, david@fromorbit.com,
riteshh@linux.ibm.com, linux-f2fs-devel@lists.sourceforge.net,
Goldwyn Rodrigues <rgoldwyn@suse.com>
Subject: [PATCH 2/3] ext4: fix inode rwsem regression
Date: Wed, 11 Sep 2019 11:45:16 -0500 [thread overview]
Message-ID: <20190911164517.16130-3-rgoldwyn@suse.de> (raw)
In-Reply-To: <20190911164517.16130-1-rgoldwyn@suse.de>
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
This is similar to 942491c9e6d6 ("xfs: fix AIM7 regression")
Apparently our current rwsem code doesn't like doing the trylock, then
lock for real scheme. So change our read/write methods to just do the
trylock for the RWF_NOWAIT case.
Fixes: 728fbc0e10b7 ("ext4: nowait aio support")
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
---
fs/ext4/file.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 70b0438dbc94..d5b2d0cc325d 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -40,11 +40,13 @@ static ssize_t ext4_dax_read_iter(struct kiocb *iocb, struct iov_iter *to)
struct inode *inode = file_inode(iocb->ki_filp);
ssize_t ret;
- if (!inode_trylock_shared(inode)) {
- if (iocb->ki_flags & IOCB_NOWAIT)
+ if (iocb->ki_flags & IOCB_NOWAIT) {
+ if (!inode_trylock_shared(inode))
return -EAGAIN;
+ } else {
inode_lock_shared(inode);
}
+
/*
* Recheck under inode lock - at this point we are sure it cannot
* change anymore
@@ -190,11 +192,13 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from)
struct inode *inode = file_inode(iocb->ki_filp);
ssize_t ret;
- if (!inode_trylock(inode)) {
- if (iocb->ki_flags & IOCB_NOWAIT)
+ if (iocb->ki_flags & IOCB_NOWAIT) {
+ if (!inode_trylock(inode))
return -EAGAIN;
+ } else {
inode_lock(inode);
}
+
ret = ext4_write_checks(iocb, from);
if (ret <= 0)
goto out;
@@ -233,9 +237,10 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
if (!o_direct && (iocb->ki_flags & IOCB_NOWAIT))
return -EOPNOTSUPP;
- if (!inode_trylock(inode)) {
- if (iocb->ki_flags & IOCB_NOWAIT)
+ if (iocb->ki_flags & IOCB_NOWAIT) {
+ if (!inode_trylock(inode))
return -EAGAIN;
+ } else {
inode_lock(inode);
}
--
2.16.4
next prev parent reply other threads:[~2019-09-11 16:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190910223327.mnegfoggopwqqy33@alap3.anarazel.de>
[not found] ` <20190911040420.GB27547@dread.disaster.area>
2019-09-11 9:39 ` Odd locking pattern introduced as part of "nowait aio support" Andres Freund
2019-09-11 10:19 ` Christoph Hellwig
2019-09-11 10:31 ` Ritesh Harjani
2019-09-11 10:55 ` Goldwyn Rodrigues
2019-09-11 16:45 ` Fix inode sem regression for nowait Goldwyn Rodrigues
2019-09-11 16:45 ` [PATCH 1/3] btrfs: fix inode rwsem regression Goldwyn Rodrigues
2019-09-11 17:21 ` David Sterba
2019-09-11 16:45 ` Goldwyn Rodrigues [this message]
2019-09-12 8:52 ` [PATCH 2/3] ext4: " Ritesh Harjani
2019-09-12 9:26 ` Matthew Bobrowski
2019-09-23 10:10 ` Jan Kara
2019-09-23 13:18 ` Theodore Y. Ts'o
2019-09-11 16:45 ` [PATCH 3/3] f2fs: " Goldwyn Rodrigues
2019-09-12 6:17 ` Chao Yu
2019-09-13 19:46 ` Jaegeuk Kim
2019-09-16 1:16 ` Chao Yu
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=20190911164517.16130-3-rgoldwyn@suse.de \
--to=rgoldwyn@suse.de \
--cc=andres@anarazel.de \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=rgoldwyn@suse.com \
--cc=riteshh@linux.ibm.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).