Skip to content

Commit d5cb4db

Browse files
riteshharjaniBrian Maly
authored andcommitted
ext4: Move to shared i_rwsem even without dioread_nolock mount opt
We were using shared locking only in case of dioread_nolock mount option in case of DIO overwrites. This mount condition is not needed anymore with current code, since:- 1. No race between buffered writes & DIO overwrites. Since buffIO writes takes exclusive lock & DIO overwrites will take shared locking. Also DIO path will make sure to flush and wait for any dirty page cache data. 2. No race between buffered reads & DIO overwrites, since there is no block allocation that is possible with DIO overwrites. So no stale data exposure should happen. Same is the case between DIO reads & DIO overwrites. 3. Also other paths like truncate is protected, since we wait there for any DIO in flight to be over. Reviewed-by: Jan Kara <[email protected]> Tested-by: Joseph Qi <[email protected]> Signed-off-by: Ritesh Harjani <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]> Orabug: 34405736 (cherry picked from commit bc6385d) Signed-off-by: Junxiao Bi <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Conflicts: fs/ext4/file.c Signed-off-by: Brian Maly <[email protected]>
1 parent af006cb commit d5cb4db

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

fs/ext4/file.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,6 @@ static ssize_t ext4_buffered_write_iter(struct kiocb *iocb,
265265
*
266266
* - For extending writes case we don't take the shared lock, since it requires
267267
* updating inode i_disksize and/or orphan handling with exclusive lock.
268-
*
269-
* - shared locking will only be true mostly with overwrites in dioread_nolock
270-
* mode. Otherwise we will switch to exclusive i_rwsem lock.
271268
*/
272269
static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from,
273270
bool *ilock_shared, bool *extend)
@@ -296,15 +293,12 @@ static ssize_t ext4_dio_write_checks(struct kiocb *iocb, struct iov_iter *from,
296293
}
297294
/*
298295
* Determine whether the IO operation will overwrite allocated
299-
* and initialized blocks. If so, check to see whether it is
300-
* possible to take the dioread_nolock path.
296+
* and initialized blocks.
301297
*
302298
* We need exclusive i_rwsem for changing security info
303299
* in file_modified().
304300
*/
305-
if (*ilock_shared && (!IS_NOSEC(inode) || *extend ||
306-
!ext4_should_dioread_nolock(inode) ||
307-
!overwrite)) {
301+
if (*ilock_shared && (!IS_NOSEC(inode) || *extend || !overwrite)) {
308302
inode_unlock_shared(inode);
309303
*ilock_shared = false;
310304
inode_lock(inode);

0 commit comments

Comments
 (0)