From patchwork Mon Feb 8 22:18:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 12076607 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F22BC433DB for ; Mon, 8 Feb 2021 22:18:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 87EA664E9A for ; Mon, 8 Feb 2021 22:18:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 87EA664E9A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 086A46B006C; Mon, 8 Feb 2021 17:18:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 00DF06B006E; Mon, 8 Feb 2021 17:18:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E16806B0070; Mon, 8 Feb 2021 17:18:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0120.hostedemail.com [216.40.44.120]) by kanga.kvack.org (Postfix) with ESMTP id CC5B66B006C for ; Mon, 8 Feb 2021 17:18:38 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 98673B9E8 for ; Mon, 8 Feb 2021 22:18:38 +0000 (UTC) X-FDA: 77796515916.22.wash71_400500b27602 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 74EB0181D179E for ; Mon, 8 Feb 2021 22:18:38 +0000 (UTC) X-HE-Tag: wash71_400500b27602 X-Filterd-Recvd-Size: 6296 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Mon, 8 Feb 2021 22:18:37 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id c132so11173478pga.3 for ; Mon, 08 Feb 2021 14:18:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/11CO3rYWuI/f/YHyMz9MjwWlbtuyR7jns8drX5Z6GM=; b=mb2oFeIEVgDEViUTWxQhJRn8gyfghyhp/ElayDIuXqgeaBC3HYBqXz/VyGWRwyfxyX xNOVUOTlqZOiwoPZvGkawIKvPSdaiRywSD983pANIibOlTA45T3D/u9hBzhvPIaon/tU WBt2X4roLHiAAxx56l/gFiUa/HQcYyqIS4SHHtGj51uM/gYRzdJCOrOubTCc7icgPz/e TBPf1d33DE2Lp+z5ek0LEGD8l0kYthWmJBknCrZPLXoi744YaRuxo52NTOvbjN+Hl6oI shdmBniDyS8xzu99iHg+R7lPS9r9fejFakjX/txkrDqm21gvQbo2V0UeFU7OjW3KBDZA ushw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/11CO3rYWuI/f/YHyMz9MjwWlbtuyR7jns8drX5Z6GM=; b=LFZqQJImsP5YLVitImWMvN7lqaN91NhkxbrYdQI3ChgaZcuiGTrxZ1VQhnit9dt7oA FFdoNLAOtUJ7In/6qbIAAcYv/43hVSKDVJVwgvqj0mFDsmaeTyhPGSK26b9KbZoSlFgm PRq17OEH591YT+Yof99e28N6fuBJfFoPR/F1PXjR+W+NwovqAt8yOTt+d+MefIVdLadM oBjY+rYxwSVbVGIcxF49kqxXJitlQtM4zAUp0vO9XmxQJgor6rQb1OEsGmPteQSExqoB XknqTJ+I9ZlRimr71GUs+0BKy43W0/pcLvptpRvwVE00yWLH85cejiqn+/w7ykGZTyWc y72g== X-Gm-Message-State: AOAM533O7t/wf5sSW6h2kl9xdbsInxdiBJVzjaeSC0DRA2j/U36eY5As /fe3Oee5qwTyxaM8+6cIOzEbHQ== X-Google-Smtp-Source: ABdhPJzusnHUSOjH31Tu9aj2qgCr38CSB6bRtXmJ7daXvBLWnpK3G1cjMgphD7zjBJsZ8VTZxUZ39g== X-Received: by 2002:a63:416:: with SMTP id 22mr18850742pge.286.1612822716935; Mon, 08 Feb 2021 14:18:36 -0800 (PST) Received: from localhost.localdomain ([2600:380:4a36:d38a:f60:a5d4:5474:9bbc]) by smtp.gmail.com with ESMTPSA id o10sm19324472pfp.87.2021.02.08.14.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 14:18:36 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: hch@infradead.org, akpm@linux-foundation.org, Jens Axboe Subject: [PATCH 1/3] mm: provide filemap_range_needs_writeback() helper Date: Mon, 8 Feb 2021 15:18:27 -0700 Message-Id: <20210208221829.17247-2-axboe@kernel.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208221829.17247-1-axboe@kernel.dk> References: <20210208221829.17247-1-axboe@kernel.dk> MIME-Version: 1.0 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: For O_DIRECT reads/writes, we check if we need to issue a call to filemap_write_and_wait_range() to issue and/or wait for writeback for any page in the given range. The existing mechanism just checks for a page in the range, which is suboptimal for IOCB_NOWAIT as we'll fallback to the slow path (and needing retry) if there's just a clean page cache page in the range. Provide filemap_range_needs_writeback() which tries a little harder to check if we actually need to issue and/or wait for writeback in the range. Signed-off-by: Jens Axboe --- include/linux/fs.h | 2 ++ mm/filemap.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/include/linux/fs.h b/include/linux/fs.h index fd47deea7c17..def89222dfe9 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2633,6 +2633,8 @@ static inline int filemap_fdatawait(struct address_space *mapping) extern bool filemap_range_has_page(struct address_space *, loff_t lstart, loff_t lend); +extern bool filemap_range_needs_writeback(struct address_space *, + loff_t lstart, loff_t lend); extern int filemap_write_and_wait_range(struct address_space *mapping, loff_t lstart, loff_t lend); extern int __filemap_fdatawrite_range(struct address_space *mapping, diff --git a/mm/filemap.c b/mm/filemap.c index aa0e0fb04670..1ed7acac8a1b 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -633,6 +633,52 @@ static bool mapping_needs_writeback(struct address_space *mapping) return mapping->nrpages; } +/** + * filemap_range_needs_writeback - check if range potentially needs writeback + * @mapping: address space within which to check + * @start_byte: offset in bytes where the range starts + * @end_byte: offset in bytes where the range ends (inclusive) + * + * Find at least one page in the range supplied, usually used to check if + * direct writing in this range will trigger a writeback. Used by O_DIRECT + * read/write with IOCB_NOWAIT, to see if the caller needs to do + * filemap_write_and_wait_range() before proceeding. + * + * Return: %true if the caller should do filemap_write_and_wait_range() before + * doing O_DIRECT to a page in this range, %false otherwise. + */ +bool filemap_range_needs_writeback(struct address_space *mapping, + loff_t start_byte, loff_t end_byte) +{ + struct page *page = NULL, *head; + XA_STATE(xas, &mapping->i_pages, start_byte >> PAGE_SHIFT); + pgoff_t max = end_byte >> PAGE_SHIFT; + + if (!mapping_needs_writeback(mapping)) + return false; + if (!mapping_tagged(mapping, PAGECACHE_TAG_DIRTY) && + !mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK)) + return false; + if (end_byte < start_byte) + return false; + + rcu_read_lock(); + xas_for_each(&xas, head, max) { + if (xas_retry(&xas, head)) + continue; + if (xa_is_value(head)) + continue; + page = find_subpage(head, xas.xa_index); + if (PageDirty(page) || PageLocked(page) || PageWriteback(page)) + break; + page = NULL; + } + rcu_read_unlock(); + + return page != NULL; +} +EXPORT_SYMBOL_GPL(filemap_range_needs_writeback); + /** * filemap_write_and_wait_range - write out & wait on a file range * @mapping: the address_space for the pages From patchwork Mon Feb 8 22:18:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 12076609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D7C7C433DB for ; Mon, 8 Feb 2021 22:18:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BCE1F64E50 for ; Mon, 8 Feb 2021 22:18:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCE1F64E50 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 968DF6B006E; Mon, 8 Feb 2021 17:18:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 84A6A6B0070; Mon, 8 Feb 2021 17:18:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7133C6B0071; Mon, 8 Feb 2021 17:18:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0136.hostedemail.com [216.40.44.136]) by kanga.kvack.org (Postfix) with ESMTP id 4EB596B006E for ; Mon, 8 Feb 2021 17:18:40 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 1FF258248047 for ; Mon, 8 Feb 2021 22:18:40 +0000 (UTC) X-FDA: 77796516000.29.price89_1b07f1127602 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id F2FD4181A5F8E for ; Mon, 8 Feb 2021 22:18:39 +0000 (UTC) X-HE-Tag: price89_1b07f1127602 X-Filterd-Recvd-Size: 4305 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf02.hostedemail.com (Postfix) with ESMTP for ; Mon, 8 Feb 2021 22:18:39 +0000 (UTC) Received: by mail-pl1-f175.google.com with SMTP id u11so8587881plg.13 for ; Mon, 08 Feb 2021 14:18:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l21CUn6uOrJ6V+uVH7pfm2X9pDOAs2Cr5X1HAOPDvBM=; b=CkUpTf4LsCzZxBf8xCPGD9HLztKuswz0Wz7mkj/6AHj1jEV5viIjhGkLl/M0cI8J// YP5VkdWIj0dzDanvSVirVQ0PK3pZDI05qlB8A3d3pKAsbn2yW/gNuOSraXYqSYQ7DFoN K6eFLBvv5XjfRIG+oPbxqWY8tjvUgjLhfz39BTfw5axsankjScRZtVRa1990CQs+sz5k RsaBW81w/If5OHKriQMeTrp1A/pJQVLqD1USt/TlJvccTgyyVy7XzH94Dpkk2kIzDx42 zcH+/GiUASWBwFiPFFO0dc9zxHTjre3uaUtyaxw5u3SJeVRq7W2SeEWYM7qpyL5eVVM+ to7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l21CUn6uOrJ6V+uVH7pfm2X9pDOAs2Cr5X1HAOPDvBM=; b=pzMnecl9GZ+JhaP1H8LU2T1V9RFQPadD30zQC0A/PpVSAx5Roc+F2lh6Pyczf2Utkq Y2cRYs5CzTBqjIWOTEekOXit1sNk2Gtscl/tGy+Xtio6W5AOXZCK/dBaVcoiH7U6dVr+ KPaWF+klP9PPxebJkeZDmu5H6dzLa39WYdak62ZyyePjkqn12rT2JDShlhY75H7Ff7KL Tlc7Aaob5ymRTNcdCBM5GzwjehplvWdzyjzKUC9360mECIoGXG8+Hhsw4uxgtUsa0g2u hELrpoaEUr3oC9+ojUYip/bHsC4y7Kr7yBjwYF5f4Z6owP6aVG4Tm31vOYmuLbnWbZ+X 2MSQ== X-Gm-Message-State: AOAM530+L4rhDSoS0Fig7BCFlY66YlKAJFVFEBMlrOf5jKEGJ57Moi3c PIjvtCv8oMJTd/ngAGUuKf9ttQ== X-Google-Smtp-Source: ABdhPJwk636mSXsDJfOY2icC7pKLKXKi13Hf9+733aw6b6XHlVfNF13HD2wUVVO8AIxkBCDamgOU6g== X-Received: by 2002:a17:90a:e292:: with SMTP id d18mr940078pjz.66.1612822718274; Mon, 08 Feb 2021 14:18:38 -0800 (PST) Received: from localhost.localdomain ([2600:380:4a36:d38a:f60:a5d4:5474:9bbc]) by smtp.gmail.com with ESMTPSA id o10sm19324472pfp.87.2021.02.08.14.18.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 14:18:37 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: hch@infradead.org, akpm@linux-foundation.org, Jens Axboe Subject: [PATCH 2/3] mm: use filemap_range_needs_writeback() for O_DIRECT IO Date: Mon, 8 Feb 2021 15:18:28 -0700 Message-Id: <20210208221829.17247-3-axboe@kernel.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208221829.17247-1-axboe@kernel.dk> References: <20210208221829.17247-1-axboe@kernel.dk> MIME-Version: 1.0 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: For the generic page cache read/write helpers, use the better variant of checking for the need to call filemap_write_and_wait_range() when doing O_DIRECT reads or writes. This avoids falling back to the slow path for IOCB_NOWAIT, if there are no pages to wait for (or write out). Signed-off-by: Jens Axboe --- mm/filemap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 1ed7acac8a1b..3bc76f99ddc3 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2646,8 +2646,8 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) size = i_size_read(inode); if (iocb->ki_flags & IOCB_NOWAIT) { - if (filemap_range_has_page(mapping, iocb->ki_pos, - iocb->ki_pos + count - 1)) + if (filemap_range_needs_writeback(mapping, iocb->ki_pos, + iocb->ki_pos + count - 1)) return -EAGAIN; } else { retval = filemap_write_and_wait_range(mapping, @@ -3326,7 +3326,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from) if (iocb->ki_flags & IOCB_NOWAIT) { /* If there are pages to writeback, return */ - if (filemap_range_has_page(file->f_mapping, pos, + if (filemap_range_needs_writeback(file->f_mapping, pos, pos + write_len - 1)) return -EAGAIN; } else { From patchwork Mon Feb 8 22:18:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 12076611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 697A4C433E0 for ; Mon, 8 Feb 2021 22:18:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F2C4464E9A for ; Mon, 8 Feb 2021 22:18:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2C4464E9A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9FA646B0070; Mon, 8 Feb 2021 17:18:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 95D406B0071; Mon, 8 Feb 2021 17:18:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 763386B0072; Mon, 8 Feb 2021 17:18:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0169.hostedemail.com [216.40.44.169]) by kanga.kvack.org (Postfix) with ESMTP id 5CC1E6B0070 for ; Mon, 8 Feb 2021 17:18:41 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 1C607181C34ED for ; Mon, 8 Feb 2021 22:18:41 +0000 (UTC) X-FDA: 77796516042.30.roll69_611560627602 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id EB260181D0AB1 for ; Mon, 8 Feb 2021 22:18:40 +0000 (UTC) X-HE-Tag: roll69_611560627602 X-Filterd-Recvd-Size: 4188 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf50.hostedemail.com (Postfix) with ESMTP for ; Mon, 8 Feb 2021 22:18:40 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id e9so8612675plh.3 for ; Mon, 08 Feb 2021 14:18:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AtwT2ZfoQKaKnaabpu4kFZ0j7fEVsXXg7Hy23jxR6Pw=; b=XmLr2CKghggmDeCSd5heWb4BPbgYpjgCBFjyGVpMGkKuw0vapjlCDgYeqtIhPGAjCK BZAQRcsiw03nXg8BtJvGnPx/CUYZd6jfu9/uaQtm5Mclrkp2RIBtUYf7NowfHS24NOp6 waPVpXtm1hKAoNMLw9gcuEueTXC6+inn1ZAA5pxKhoOu9vO2hpVPsVc9GsNF/21E/ksG kmb7ZvR98qkO16507A7eSSoPpV9y+rdXNpy56tRsXuNyrsWkTjDbTV+VTmV7kub+F6+3 CIc6+3PGNpOMC+RjKBwVyObhxtDFvP740bOfwpEkkTFDU/8HXbTNmldZoANNV734U1t7 ZEKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AtwT2ZfoQKaKnaabpu4kFZ0j7fEVsXXg7Hy23jxR6Pw=; b=Kk2+yeigcVn9lr4oLqjXH/8HzQhRse6bdZYBopdhu7Vv29KjCrls2wI/dZ8DMeFD+J mLQZPn4O7t32BGNEwGrhfPVjgXiA8EmQ0OPsRYAjKBlGGAe9w1Ss1sf+UOh5uMxyD6BD 09JSMA7+LImzFqs2p3q4gEY7FbT79Y52Ac8+3quBYcpB1Q+2jtSSaXpObMDt3I6xSdqr tqeH0qL1Ee0MAh6a8Ga0JKjYX9iJNTAY1KKPf1VrlwQ60zyKXIbMEFXDgALSC+gB6C84 cWehmCVdW2dftSCnjIVgwxskuYOXu+6zr8QFgO92m07kjaoCqrm0umpGO/H4nOnerkKZ iRdQ== X-Gm-Message-State: AOAM532FdMAXPLB/u9dO2Ct3yWd4Wi2jzj3x/irCvUpmW64EfqbyeOTK J6/0qd30g5HgHFoWvDHyjz3/7w== X-Google-Smtp-Source: ABdhPJxOdCSPAs/K5CvefCqaIjsci+duFqzpTsXJG3UqGOHWM/ef3x/ClRU21S5b0HiKKoAX3OYAKw== X-Received: by 2002:a17:90a:d3d5:: with SMTP id d21mr893477pjw.228.1612822719725; Mon, 08 Feb 2021 14:18:39 -0800 (PST) Received: from localhost.localdomain ([2600:380:4a36:d38a:f60:a5d4:5474:9bbc]) by smtp.gmail.com with ESMTPSA id o10sm19324472pfp.87.2021.02.08.14.18.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 14:18:39 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: hch@infradead.org, akpm@linux-foundation.org, Jens Axboe Subject: [PATCH 3/3] iomap: use filemap_range_needs_writeback() for O_DIRECT IO Date: Mon, 8 Feb 2021 15:18:29 -0700 Message-Id: <20210208221829.17247-4-axboe@kernel.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208221829.17247-1-axboe@kernel.dk> References: <20210208221829.17247-1-axboe@kernel.dk> MIME-Version: 1.0 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: For the generic page cache read/write helpers, use the better variant of checking for the need to call filemap_write_and_wait_range() when doing O_DIRECT reads or writes. This avoids falling back to the slow path for IOCB_NOWAIT, if there are no pages to wait for (or write out). Signed-off-by: Jens Axboe --- fs/iomap/direct-io.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 933f234d5bec..2561e50c763a 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -479,17 +479,17 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, } if (iocb->ki_flags & IOCB_NOWAIT) { - if (filemap_range_has_page(mapping, pos, end)) { + if (filemap_range_needs_writeback(mapping, pos, end)) { ret = -EAGAIN; goto out_free_dio; } flags |= IOMAP_NOWAIT; + } else { + ret = filemap_write_and_wait_range(mapping, pos, end); + if (ret) + goto out_free_dio; } - ret = filemap_write_and_wait_range(mapping, pos, end); - if (ret) - goto out_free_dio; - if (iov_iter_rw(iter) == WRITE) { /* * Try to invalidate cache pages for the range we are writing.