[04/44] btrfs: use IOMAP_DIO_NOSYNC

Message ID	20220622041552.737754-4-viro@zeniv.linux.org.uk (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-fsdevel-owner@kernel.org> From: Al Viro <viro@zeniv.linux.org.uk> To: linux-fsdevel@vger.kernel.org Cc: Linus Torvalds <torvalds@linux-foundation.org>, Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>, Matthew Wilcox <willy@infradead.org>, David Howells <dhowells@redhat.com>, Dominique Martinet <asmadeus@codewreck.org>, Christian Brauner <brauner@kernel.org> Subject: [PATCH 04/44] btrfs: use IOMAP_DIO_NOSYNC Date: Wed, 22 Jun 2022 05:15:12 +0100 Message-Id: <20220622041552.737754-4-viro@zeniv.linux.org.uk> In-Reply-To: <20220622041552.737754-1-viro@zeniv.linux.org.uk> References: <YrKWRCOOWXPHRCKg@ZenIV> <20220622041552.737754-1-viro@zeniv.linux.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Al Viro <viro@ftp.linux.org.uk> Precedence: bulk
Series	[01/44] 9p: handling Rerror without copy_from_iter_full() \| expand [01/44] 9p: handling Rerror without copy_from_iter_full() [02/44] No need of likely/unlikely on calls of check_copy_size() [03/44] teach iomap_dio_rw() to suppress dsync [04/44] btrfs: use IOMAP_DIO_NOSYNC [05/44] struct file: use anonymous union member for rcuhead and llist [06/44] iocb: delay evaluation of IS_SYNC(...) until we want to check IOCB_DSYNC [07/44] keep iocb_flags() result cached in struct file [08/44] copy_page_{to,from}_iter(): switch iovec variants to generic [09/44] new iov_iter flavour - ITER_UBUF [10/44] switch new_sync_{read,write}() to ITER_UBUF [11/44] iov_iter_bvec_advance(): don't bother with bvec_iter [12/44] fix short copy handling in copy_mc_pipe_to_iter() [13/44] splice: stop abusing iov_iter_advance() to flush a pipe [14/44] ITER_PIPE: helper for getting pipe buffer by index [15/44] ITER_PIPE: helpers for adding pipe buffers [16/44] ITER_PIPE: allocate buffers as we go in copy-to-pipe primitives [17/44] ITER_PIPE: fold push_pipe() into __pipe_get_pages() [18/44] ITER_PIPE: lose iter_head argument of __pipe_get_pages() [19/44] ITER_PIPE: clean pipe_advance() up [20/44] ITER_PIPE: clean iov_iter_revert() [21/44] ITER_PIPE: cache the type of last buffer [22/44] ITER_PIPE: fold data_start() and pipe_space_for_user() together [23/44] iov_iter_get_pages{,_alloc}(): cap the maxsize with MAX_RW_COUNT [24/44] iov_iter_get_pages_alloc(): lift freeing pages array on failure exits into wrapper [25/44] iov_iter_get_pages(): sanity-check arguments [26/44] unify pipe_get_pages() and pipe_get_pages_alloc() [27/44] unify xarray_get_pages() and xarray_get_pages_alloc() [28/44] unify the rest of iov_iter_get_pages()/iov_iter_get_pages_alloc() guts [29/44] ITER_XARRAY: don't open-code DIV_ROUND_UP() [30/44] iov_iter: lift dealing with maxpages out of first_{iovec,bvec}_segment() [31/44] iov_iter: first_{iovec,bvec}_segment() - simplify a bit [32/44] iov_iter: massage calling conventions for first_{iovec,bvec}_segment() [33/44] found_iovec_segment(): just return address [34/44] fold __pipe_get_pages() into pipe_get_pages() [35/44] iov_iter: saner helper for page array allocation [36/44] iov_iter: advancing variants of iov_iter_get_pages{,_alloc}() [37/44] block: convert to advancing variants of iov_iter_get_pages{,_alloc}() [38/44] iter_to_pipe(): switch to advancing variant of iov_iter_get_pages() [39/44] af_alg_make_sg(): switch to advancing variant of iov_iter_get_pages() [40/44] 9p: convert to advancing variant of iov_iter_get_pages_alloc() [41/44] ceph: switch the last caller of iov_iter_get_pages_alloc() [42/44] get rid of non-advancing variants [43/44] pipe_get_pages(): switch to append_pipe() [44/44] expand those iov_iter_advance()...

Message ID

20220622041552.737754-4-viro@zeniv.linux.org.uk (mailing list archive)

State

New, archived

Headers

From: Al Viro <viro@zeniv.linux.org.uk>
To: linux-fsdevel@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
        Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
        Matthew Wilcox <willy@infradead.org>,
        David Howells <dhowells@redhat.com>,
        Dominique Martinet <asmadeus@codewreck.org>,
        Christian Brauner <brauner@kernel.org>
Subject: [PATCH 04/44] btrfs: use IOMAP_DIO_NOSYNC
Date: Wed, 22 Jun 2022 05:15:12 +0100
Message-Id: <20220622041552.737754-4-viro@zeniv.linux.org.uk>
In-Reply-To: <20220622041552.737754-1-viro@zeniv.linux.org.uk>
References: <YrKWRCOOWXPHRCKg@ZenIV>
 <20220622041552.737754-1-viro@zeniv.linux.org.uk>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: Al Viro <viro@ftp.linux.org.uk>
Precedence: bulk

Series

[01/44] 9p: handling Rerror without copy_from_iter_full() | expand

Commit Message

Al Viro June 22, 2022, 4:15 a.m. UTC

... instead of messing with iocb flags

Suggested-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/btrfs/file.c  | 17 -----------------
 fs/btrfs/inode.c |  3 ++-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 1fd827b99c1b..98f81e304eb1 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1848,7 +1848,6 @@  static ssize_t check_direct_IO(struct btrfs_fs_info *fs_info,
 
 static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)
 {
-	const bool is_sync_write = (iocb->ki_flags & IOCB_DSYNC);
 	struct file *file = iocb->ki_filp;
 	struct inode *inode = file_inode(file);
 	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
@@ -1901,15 +1900,6 @@  static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)
 		goto buffered;
 	}
 
-	/*
-	 * We remove IOCB_DSYNC so that we don't deadlock when iomap_dio_rw()
-	 * calls generic_write_sync() (through iomap_dio_complete()), because
-	 * that results in calling fsync (btrfs_sync_file()) which will try to
-	 * lock the inode in exclusive/write mode.
-	 */
-	if (is_sync_write)
-		iocb->ki_flags &= ~IOCB_DSYNC;
-
 	/*
 	 * The iov_iter can be mapped to the same file range we are writing to.
 	 * If that's the case, then we will deadlock in the iomap code, because
@@ -1964,13 +1954,6 @@  static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)
 
 	btrfs_inode_unlock(inode, ilock_flags);
 
-	/*
-	 * Add back IOCB_DSYNC. Our caller, btrfs_file_write_iter(), will do
-	 * the fsync (call generic_write_sync()).
-	 */
-	if (is_sync_write)
-		iocb->ki_flags |= IOCB_DSYNC;
-
 	/* If 'err' is -ENOTBLK then it means we must fallback to buffered IO. */
 	if ((err < 0 && err != -ENOTBLK) || !iov_iter_count(from))
 		goto out;
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 81737eff92f3..fbf0aee7d66a 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8152,7 +8152,8 @@  ssize_t btrfs_dio_rw(struct kiocb *iocb, struct iov_iter *iter, size_t done_befo
 	struct btrfs_dio_data data;
 
 	return iomap_dio_rw(iocb, iter, &btrfs_dio_iomap_ops, &btrfs_dio_ops,
-			    IOMAP_DIO_PARTIAL, &data, done_before);
+			    IOMAP_DIO_PARTIAL | IOMAP_DIO_NOSYNC,
+			    &data, done_before);
 }
 
 static int btrfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

[04/44] btrfs: use IOMAP_DIO_NOSYNC

Commit Message

Patch