From patchwork Wed May 24 06:38:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13253305 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8613EC7EE2F for ; Wed, 24 May 2023 06:38:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1AA7C280002; Wed, 24 May 2023 02:38:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15D91280001; Wed, 24 May 2023 02:38:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1715280002; Wed, 24 May 2023 02:38:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D503A280001 for ; Wed, 24 May 2023 02:38:38 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9B5CC140867 for ; Wed, 24 May 2023 06:38:38 +0000 (UTC) X-FDA: 80824195116.19.BB520CF Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf29.hostedemail.com (Postfix) with ESMTP id 01A6212000E for ; Wed, 24 May 2023 06:38:36 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=KluVLKd9; spf=none (imf29.hostedemail.com: domain of BATV+8349dc162fb675e8d54f+7213+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+8349dc162fb675e8d54f+7213+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684910317; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=JJwCNovA8Hvn4E2j3I1EFqtVuzu7mduVb6MIKUgJaYA=; b=YnTDFLYRFXQHd4OufXWYqVpMbzEuklMPcwHdM1Kz/P0YCcxLyT1xJDhbRdcM+JughL5j81 aqKT33oOJIed3P6i1QbUS7IOymfe9YzCVvCipPdzgksPMMUyMVDYlFcd0l4PuyXss7uLpw U6xzWTvExAo7O0Av6ucbT8e4tJZ8YFM= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=KluVLKd9; spf=none (imf29.hostedemail.com: domain of BATV+8349dc162fb675e8d54f+7213+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+8349dc162fb675e8d54f+7213+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684910317; a=rsa-sha256; cv=none; b=tIHjH7RYZf1YKEDY3i6w41iL/rz2YPQn2ZNRHRee6OY/CIJWviKW6aV37D3E/qtBwXKgdz B8ct6aCYk9hd6MYVfCeY/biu605UrZtanxcXTD7X/t4BLMfJa92T2udYBdH9p6XAV9y+/b J/nTU0HGlPp7RiAqrgBFQaFfh+/YS1w= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=JJwCNovA8Hvn4E2j3I1EFqtVuzu7mduVb6MIKUgJaYA=; b=KluVLKd9ujTBULz/Oac6KpUAEF sPSrWCifr7i0eK+kRjnOHUKMBeVjKARBkPf9xwEJp8kT01+lLQv6MRd/hqkSNoQUcLqKZ7/BGrDcN dA3NJJNXp/9uMXRhkFjxdjy5Cix+8ukkPMb/2IOstgyXPxekPMR5F0U56sNBp9qT4v2u57Ha/q7kF ydIlmlrEAUFmlDYIA9/lAt6aihuql08dwpcpP9IBMk2Pqg/kgz/RSPJciiTw5Eona1z8aYRGjnxl5 dgFQlf2gaeA/3y76BPGTs55ud6OcsdO38YfGliCEJWIcQ5j89VqlB+U7Y62S6aiqSM7c2KLIuczIz /3UPYgzg==; Received: from [2001:4bb8:188:23b2:cbb8:fcea:a637:5089] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1q1i8f-00CVfQ-1M; Wed, 24 May 2023 06:38:26 +0000 From: Christoph Hellwig To: Matthew Wilcox Cc: Jens Axboe , Xiubo Li , Ilya Dryomov , Alexander Viro , Christian Brauner , "Theodore Ts'o" , Jaegeuk Kim , Chao Yu , Miklos Szeredi , Andreas Gruenbacher , "Darrick J. Wong" , Trond Myklebust , Anna Schumaker , Damien Le Moal , Andrew Morton , linux-block@vger.kernel.org, ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 04/11] filemap: add a kiocb_write_and_wait helper Date: Wed, 24 May 2023 08:38:03 +0200 Message-Id: <20230524063810.1595778-5-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230524063810.1595778-1-hch@lst.de> References: <20230524063810.1595778-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: 01A6212000E X-Rspam-User: X-Stat-Signature: b3p7goc3xou4n66pzzn87sxqbp9up78q X-Rspamd-Server: rspam01 X-HE-Tag: 1684910316-412545 X-HE-Meta: U2FsdGVkX19ifz1nsoPuu0XHg675ETpeLeUVXqd79If83xNkOchrVzlkyAy4fiDKmQJWwHQrz0VCZ+4Ii0EOC52AOZ2FzN0awyO73WX2gAv1mfcMiE/GQR647Z3uj7QnU7ChxE9fKQ4o4eHKgeEeDNawHLhAzx62BymHwUaProoqpAw4hIjst9patXXYuoAHwbMtV3Nc4JUlSvWKdbZkSe+ynwQ3tHKoCcIudrKN0I3Rh2C1xpXFfpCn3GLEpIO9jxeD5guKUAR5EXnrJ6SjzVO9FpxMkyXDrbK8VwaI0+L8WR59P6ojCJl1UyuzKQuTH2ITHhHzWNlQY002NUiZlkBlF7u70vFsm3h7PEu7SU/Up4fktuxOisfZh3Znfnry3TB+4ENgIS4yTCr2X62QioUU53ND0EBIPuZpZ1joYn8eIhmYho603nJIIG2QvF2jRrxszjWt+gCgHPFSl2Z2o6F/7CRiNPDuGP6aPGPFyZ+/5WwsHDrn26YWOi+UNePlgBFQ/QxdxM6CsIQ0h8kpbAoIgF6FhWAnLYpkpEhbv9lnFwzBWzBEdXtrPGG/8nIrPNi+rYwwMir+B+UrqBciyhYSfylPVhzPdAPKSd5SjKMpc31+X7lyT44lwvxgrdaM1121gH3w5JH5qjW8M+2tBYNz2gS1cN4ylxcLR/NLEdFkrP4bf2pDRrci1iuYolpyQiBlkoUHtRnA8pK4Qe3kPQRzOKw2l251PcA4/CgIr8WEDwtVT/+wlVYNk6b9eeDhrIcTLvxDK/EnkqXJtCl0Qc/ZZ37sh++2xkBAHwxQJLemaYeQclEN2cHa2GyKzJoR+ocV9Hg2ywW5N+N31xJYRjcucPUgmLFdZeEsRkHdkal/eo1V71kFrppzXIhmwS1HrM3YFtwMqoU4cCIoE/ArqT4EDISOAJR2b95HLZsC9r6T3Fg5CXetWf1dymijXgjL/6xVdUBlryjlYtKzGHP h2Y1SeUy 4xLmvxMY9yZ07uDWxIiA8pEqGMNJMjvTwU+EjHlvFmW8Y74d+SrSbsDL12TG4iuHEg3x/GTBjJAjccXqliya86JsTRE4QkQV8HvLKrbnYHKRhvs3wT42NFL07YY5+k29m8XJ412pZgqd16taghVOkqSHUkktLZDhJzI0HflEv5rTTmWkW8jD4e0e1Fc1zCKSSxAaDqWD9uDspSfULrc3K/SXdMm2Tbn4mD32la2l6xQB36Ydl5LV+SOD+72S3VPAA+H7DMHNq19nOd2qXvE0mznVeSu9DIiSNsTMA26jqWPVdarFFSqsJmFGvz7i3KiUw+BiFGlLAz9Dl8CwF3EGvMH8KGFUl3IxaTraq5wG/+wZ7h0zZTft08brosWESNYTlqoudeDK2U9nNk19M2nn2B8xvQhWeQrFpOG+mmpgcqHoM/TKqLHKBYwfjTyhgYO12Eg+bNzdBLXFOeE65prIv3qKg1aNudw6w31tN2WPZ6Ux9yU221zgU12S0BrYjC90P3KDcHhmaMemCBAuD8z9F4108IGsoLdV6XxGpmaaSpRcTWyo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Factor out a helper that does filemap_write_and_wait_range for the range covered by a read kiocb, or returns -EAGAIN if the kiocb is marked as nowait and there would be pages to write. Signed-off-by: Christoph Hellwig Reviewed-by: Damien Le Moal Acked-by: Darrick J. Wong Reviewed-by: Hannes Reinecke --- block/fops.c | 18 +++--------------- include/linux/pagemap.h | 2 ++ mm/filemap.c | 30 ++++++++++++++++++------------ 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/block/fops.c b/block/fops.c index 58d0aebc7313a8..575171049c5d83 100644 --- a/block/fops.c +++ b/block/fops.c @@ -576,21 +576,9 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to) goto reexpand; /* skip atime */ if (iocb->ki_flags & IOCB_DIRECT) { - struct address_space *mapping = iocb->ki_filp->f_mapping; - - if (iocb->ki_flags & IOCB_NOWAIT) { - if (filemap_range_needs_writeback(mapping, pos, - pos + count - 1)) { - ret = -EAGAIN; - goto reexpand; - } - } else { - ret = filemap_write_and_wait_range(mapping, pos, - pos + count - 1); - if (ret < 0) - goto reexpand; - } - + ret = kiocb_write_and_wait(iocb, count); + if (ret < 0) + goto reexpand; file_accessed(iocb->ki_filp); ret = blkdev_direct_IO(iocb, to); diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index a56308a9d1a450..36fc2cea13ce20 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -30,6 +30,7 @@ static inline void invalidate_remote_inode(struct inode *inode) int invalidate_inode_pages2(struct address_space *mapping); int invalidate_inode_pages2_range(struct address_space *mapping, pgoff_t start, pgoff_t end); + int write_inode_now(struct inode *, int sync); int filemap_fdatawrite(struct address_space *); int filemap_flush(struct address_space *); @@ -54,6 +55,7 @@ int filemap_check_errors(struct address_space *mapping); void __filemap_set_wb_err(struct address_space *mapping, int err); int filemap_fdatawrite_wbc(struct address_space *mapping, struct writeback_control *wbc); +int kiocb_write_and_wait(struct kiocb *iocb, size_t count); static inline int filemap_write_and_wait(struct address_space *mapping) { diff --git a/mm/filemap.c b/mm/filemap.c index 15907af4a57ff5..5fcd5227f9cae2 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2762,6 +2762,21 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, } EXPORT_SYMBOL_GPL(filemap_read); +int kiocb_write_and_wait(struct kiocb *iocb, size_t count) +{ + struct address_space *mapping = iocb->ki_filp->f_mapping; + loff_t pos = iocb->ki_pos; + loff_t end = pos + count - 1; + + if (iocb->ki_flags & IOCB_NOWAIT) { + if (filemap_range_needs_writeback(mapping, pos, end)) + return -EAGAIN; + return 0; + } + + return filemap_write_and_wait_range(mapping, pos, end); +} + /** * generic_file_read_iter - generic filesystem read routine * @iocb: kernel I/O control block @@ -2797,18 +2812,9 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) struct address_space *mapping = file->f_mapping; struct inode *inode = mapping->host; - if (iocb->ki_flags & IOCB_NOWAIT) { - if (filemap_range_needs_writeback(mapping, iocb->ki_pos, - iocb->ki_pos + count - 1)) - return -EAGAIN; - } else { - retval = filemap_write_and_wait_range(mapping, - iocb->ki_pos, - iocb->ki_pos + count - 1); - if (retval < 0) - return retval; - } - + retval = kiocb_write_and_wait(iocb, count); + if (retval < 0) + return retval; file_accessed(file); retval = mapping->a_ops->direct_IO(iocb, iter);