From patchwork Tue Feb 9 02:30:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 12077053 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 24060C433DB for ; Tue, 9 Feb 2021 02:30:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9F1FC64EAC for ; Tue, 9 Feb 2021 02:30:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F1FC64EAC 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 C99FB6B006E; Mon, 8 Feb 2021 21:30:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BAB376B0070; Mon, 8 Feb 2021 21:30:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D4216B0075; Mon, 8 Feb 2021 21:30:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0004.hostedemail.com [216.40.44.4]) by kanga.kvack.org (Postfix) with ESMTP id 814176B006E for ; Mon, 8 Feb 2021 21:30:18 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 4EBE1824805A for ; Tue, 9 Feb 2021 02:30:18 +0000 (UTC) X-FDA: 77797150116.19.heat81_5f1495727603 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 2F8511ACC3C for ; Tue, 9 Feb 2021 02:30:18 +0000 (UTC) X-HE-Tag: heat81_5f1495727603 X-Filterd-Recvd-Size: 3954 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Feb 2021 02:30:17 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id 18so8812127pfz.3 for ; Mon, 08 Feb 2021 18:30:17 -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=NeAk3PJLifKVqc2Uhcs4FSpHilknKrj5z1MFAaW43Ag=; b=1ias4FnzK1VNFg9SZDY3ZUQe4V9wOj9t9t9923MKJpPj4Sogo47GefH2KPemZbZsox IfaITZ1qCeBJu/ZhxPyhuFhs9u8v0hk01hGMSC16iv9eahk8oyAZ2xGU1N/IUdxrtQqW B+ouKmxnuPJoERPIiXefe6b5cM9xlm6EPqr1aZ5GqG1H5O4bsST+CTLPGrhgkLMRII7P 3RdnxMkp0b/EFTk7h6S0PVBqf3kRtzEnGoYS5FfdU5d0OO6OaJM9Qrr2Bgyt/+ZDAkmN qZMd+smoKKXipq4SNPfR5FGk4iQPca47fR6SipLXy3SCcwBNSE1wslLJ8TUTnN4Ohqm9 rHoQ== 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=NeAk3PJLifKVqc2Uhcs4FSpHilknKrj5z1MFAaW43Ag=; b=lm8w0I4MACSX7SREhG2Eii9aSKwNgeh7lZgpPNMe7qM5lT4VyJ2gT8rruNYC1CyXtk HyxeosUXRArpX5eDzsQmaDeQVHWzSMwvljTabOzB0ldYmU7XzGbuU/otXy9n4XHZrcpy 2dQ+KqZrwM5Y5d72fIeh9aqMnv45tVSorgEpIYOk6GROakme6tgSlv/qpd/+8OPv67ms VHhrUCLZ4nNodI2jdDyGlYQ/SMAq90Se7BvrRdX83qrfniuoN7XDw4JuK/7wHkGg0zj8 FoZoGs9rVEHpkOglqV3p2+Wx0vsYKdY7euQ9PsBwhduEe3GGVOZtl5R0m0GN2OvUWzfz A+FQ== X-Gm-Message-State: AOAM530sCREPiXtqR+E6TKNt2jtsjQTcRtb3fhXnCzDmK2ooGWUcJnpZ MlC5F4t/gJ8mhr2Dii3YIsGn8A== X-Google-Smtp-Source: ABdhPJzIodUg5PR3R81qsg3WhYeJzNk6dOAQUyTI4+Gq/PEaHHOneG01zD8/fBvd5h7Imb7eWrJ4vg== X-Received: by 2002:a05:6a00:a8d:b029:1ba:71d1:fe3c with SMTP id b13-20020a056a000a8db02901ba71d1fe3cmr20553833pfl.51.1612837816706; Mon, 08 Feb 2021 18:30:16 -0800 (PST) Received: from localhost.localdomain ([66.219.217.173]) by smtp.gmail.com with ESMTPSA id y2sm19070597pfe.118.2021.02.08.18.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 18:30:16 -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 reads Date: Mon, 8 Feb 2021 19:30:07 -0700 Message-Id: <20210209023008.76263-3-axboe@kernel.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210209023008.76263-1-axboe@kernel.dk> References: <20210209023008.76263-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 helper, use the better variant of checking for the need to call filemap_write_and_wait_range() when doing O_DIRECT reads. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 6a58d50fbd31..c80acb80e8f7 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2643,8 +2643,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,