From patchwork Wed May 31 07:50:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13261640 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 8F7B8C87FE2 for ; Wed, 31 May 2023 07:50:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 011B46B007B; Wed, 31 May 2023 03:50:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F05C66B007D; Wed, 31 May 2023 03:50:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C44D86B007E; Wed, 31 May 2023 03:50:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B6AC26B007B for ; Wed, 31 May 2023 03:50:52 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8639580249 for ; Wed, 31 May 2023 07:50:52 +0000 (UTC) X-FDA: 80849778744.13.F6854A0 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf22.hostedemail.com (Postfix) with ESMTP id D3CE5C0011 for ; Wed, 31 May 2023 07:50:50 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=mX63p2gq; spf=none (imf22.hostedemail.com: domain of BATV+b81a8c9a6d22e8bb2302+7220+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+b81a8c9a6d22e8bb2302+7220+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685519450; a=rsa-sha256; cv=none; b=RxjdwddaZ7/inawnZY8wCwKjg5/eWQR6HsXdj9cgsZHtddzFcPAsa+rQ6C3/XxUdHxN8kq cYRL1dKOj0WkFdhp/8aMDpq96tKgo/YKuyxicJgR33uFeBQVlos1ivxXCRzoN7ioQ+kTgi f8ND6JeBpceRVZyByP9yXzhPzIGms0Q= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=mX63p2gq; spf=none (imf22.hostedemail.com: domain of BATV+b81a8c9a6d22e8bb2302+7220+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+b81a8c9a6d22e8bb2302+7220+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=1685519450; 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=4ln1KAbDHy9yBOHA1NQmJ3I7VD+LrDF+lbZ0/N7BIOE=; b=dJ4WobheDnn2z9HKC6Bjs5uvTFB03Q0lzIDzakdZpl2jHIsEF2tru+0UKFnID01G3sK0fC IuPw9i14BoovCuT0hupjA3jzzhB8vb4iIOzygruKfWr6ZZlrglZRFUgNrwOqKLGN13QUOZ lS0KDTigFZucPQIL7gq8HHaigH7K9AM= 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=4ln1KAbDHy9yBOHA1NQmJ3I7VD+LrDF+lbZ0/N7BIOE=; b=mX63p2gq79YVonFeh66UH/Gf07 oDQXwuuVG/0zTbaChYcaSZnA6FeYN2+9PpMTDarXzQiay1+KiGGQH1JIFRsfB64CVQWWnTGpLxwVO VcpKJWbzddayA6uVwiaBzXTcqQxwjJk1jmmNn1tjvtVvwMsaEd4AEVEQhGQXPPFQ1E/Kq493soZrW 9Z2XZuavCo3rcl9FCHi+6jxhHCR6klyJnP2Kasjtdf8Fe8M/81uTlaDUsNSJfVZXOwAhdv3404pY6 rQfVgPAz0cL/WvQa9HtgtvqrCTXdWaIaGGb7pgiRTbLTatjklSX4muexsK6BIbV6QgrMZDrXKNRk6 VVYhOjBw==; Received: from [2001:4bb8:182:6d06:f5c3:53d7:b5aa:b6a7] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1q4GbQ-00GVp2-07; Wed, 31 May 2023 07:50:40 +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, Hannes Reinecke Subject: [PATCH 04/12] filemap: add a kiocb_write_and_wait helper Date: Wed, 31 May 2023 09:50:18 +0200 Message-Id: <20230531075026.480237-5-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230531075026.480237-1-hch@lst.de> References: <20230531075026.480237-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-Server: rspam08 X-Rspamd-Queue-Id: D3CE5C0011 X-Stat-Signature: njd94na6c3jccod3zzx3u4njpy79u6en X-Rspam-User: X-HE-Tag: 1685519450-746564 X-HE-Meta: U2FsdGVkX1/EsQr+M0jb8jCZrvOT7UGvy0b0h/zrojQFj9aDGAqqURCoK0x20p8TVsXHWMikMjoO8WLVPdw+rlaeso35F2oafkxQ2ZhFFL8RZjAU+pjI3oCKfHAn89KlCEALGZeaJhoqeof5DFsf95gxhznDW8XyV8HIND3DogAPeVrAqmNsMdHHUoCdGEbUUWXFpRrFpIJoSJt/LUO0+YOP4IHwDLgiUfVrGPpcS1kNyfo0TSXQ14A3/jNjYmJST/DCH+/3NkVNnxm5uQ/1+ATTkKL38adOm07IK4bEIe6F5CzRtJUAhXZPBWztnHU6rKGZeWDJtumpbmlH7v3ZpnGU83cgVPCdWlZA/HNkdo+kgK5610CNh9+Nk4RGMGNcrdAF54wTGdnYYrrdvyc53unsk9qP0MrIRnFkMieeW/9x2WR3JYDXktvlYFRw4YzINy0lpdm5+uwuAvvMCG8GxYIjESTOrwZfrLYUAgDCulmvslSTVj8sL//LqiGGwpCJIDIbdFIE4wogjXqShfQuSbwdMFgvIVpYPQW5IXaLYwJEPADnJCvoygCa/6xEt0DCajKviNmH4F6QryczQFH6/18O3Iq3XxXIlMEMm+EKau4hWU5Nb2HySomgqQSsDpSZnupodd5RQfl0CjRZKX9d/zsznd2OgcgMLjnYjjbpJWHOCXQs6jTAYXSe8/ww9knLV8S0s5DZU1IBFU1iwlfKUs+GV1rp6NEELTPNTZhDqEIVVj2f/WynlwfzbKnLMrw/lAfULtlwAdOGeWTrR5rQpnK/mCCRJjmo6wOyD5Ui14Mz3snPDEsLQIcoNQOIaBctIyVtqH6c8dy37bw9mAYsaVvB3Gkm6sk4licpzitMGMSlHV2evtwb+wIz71zSh22caXjW8OZWtHs90kIvTNF0Bdi42UApbLS95TkPv1FRyEA7PUGhISfdkVuQ4u0/gQx1f8zd2zfUCTesFrVzyyv wXiC+f2q KX75tNqLIXnwOu0j+BhmYuIVSAMVyZl2Pa4vVEVmsWUGIgc5Ro1LaToQw1BofnGtF1AghbXshFAy/I09RcsavrPzIAIpV6FqyRxiYyto50IAmzrJPrzaOG0SLhunn6ebF9/cCQB1zZzqppP0c8V3OpZuQQr+g+yhrxHzBmE9m/j5kKpxBsQhAQl5GgP4Zqob+1RXe7GEpu8uZnD7n+aON7yqc0ZM9DQqcWu9y/FFrVrQMDK4mrv7PkjwEWY3mjUVVkCb7fBIcHc50PCz7CYMucS8m8Ev22txFUYAmxJ7dPTBygG72dRaffiN16+ZyJjwqjE1KScEGmtKPGRjpeRFLl1nvEvRExS6g77HmSQgdpi2T8aeZdXFJXipfxuKNa9KI2qpH5Kte5z9kuCvs4dHlafiRZzW9bS3pykPm8Y+MqDXcJb3NplhFtJX5IDpXp4LGQLqQSQ7wgdo+7LbCM9wbte1csmN+GIX8IBNmfe8LzRhrZ1zq3mvvGX4ozTlub5nYf93P6wL3uaprrNTdW+2SDWgyqeI/hbHhZ2lTp4BtrQKBRCK7fsawgMD20Wx+sJakIxp7ivJ+ftlBjmpDZlnidEWRLUtatsJex18YawLUF1uROz2sgpTZCBqaoQ== 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 Reviewed-by: Hannes Reinecke Acked-by: Darrick J. Wong --- 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);