From mboxrd@z Thu Jan 1 00:00:00 1970 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.5 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 A5A1BC433E0 for ; Wed, 24 Feb 2021 16:45:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1F03864ECB for ; Wed, 24 Feb 2021 16:45:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F03864ECB 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 A22866B0071; Wed, 24 Feb 2021 11:45:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9D2E66B0072; Wed, 24 Feb 2021 11:45:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C1E46B0073; Wed, 24 Feb 2021 11:45:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0223.hostedemail.com [216.40.44.223]) by kanga.kvack.org (Postfix) with ESMTP id 741D96B0071 for ; Wed, 24 Feb 2021 11:45:23 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 15F64A77A for ; Wed, 24 Feb 2021 16:45:23 +0000 (UTC) X-FDA: 77853736926.16.6E646D6 Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by imf01.hostedemail.com (Postfix) with ESMTP id E985A20053D0 for ; Wed, 24 Feb 2021 16:45:06 +0000 (UTC) Received: by mail-il1-f174.google.com with SMTP id f7so2252588ilk.12 for ; Wed, 24 Feb 2021 08:45:07 -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=4g79Wmg8HssdJE1RJFj1xs5Uw0vA1HddswvKOPj7R1c=; b=DkLjVfUkguWaeFLE9AhCxvUdXSBU0OTGcMJaMx+3ID1I9uA7hXf9W9q8nqi7wqtwVF /FpzzWFMDl44NRXBrvcwlOnyUE2dsX3rxEBpBDowXWcp87ExSVjSysLiPU5LQHqNBM+Y osHATKreCyqupnk3K5AJHzE1y6FFM+yVK5KjxRUA7a4LRSySq27pp9JtLAo/pOuWOAjW 2C9xLWqtMLKz0icTCYEomt3TkFvmDrT7IxlN3j2yjOD6sV977/2pjpRoi0xBMIiD+3la 1ufbCW9sMUyxrKXIzujZOdASCb22RjXDLqMumtqUMuRYNXstr/2sBYW7WlLSCGPVVuDg qXqQ== 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=4g79Wmg8HssdJE1RJFj1xs5Uw0vA1HddswvKOPj7R1c=; b=J2mupxB0E8mB00h6Ierh3F6LmyWZyady/NbXg3alJbrRGGcv8bhHt4Sgo8C2OSkOl1 8y6gkSiSeVpWplT8lKlUCspxc/qPJpw+v7zrSBkLj7SC4DTtLgxHf/VsOYDqQ4B73nXh SX2ZmycUgxBJRBeYuDsbsT8icVHkAbSUADmeHK5ly6DM5nGGW2m5dlYtXVpEgviYCXdR tW8Wjyfl1pCxXB8YJtZZfUEGXE7w+fu5HZ0xVCaJHxEe/qykfxzt/0CEpeSmKmjHvwf8 KP+VI+lZJi3sXdoRx2TNtlDYveemnlaa3FsEq6G0IxgpX+sYUHHW5+CTcHTB6vgv9KFZ 64xw== X-Gm-Message-State: AOAM530rlvY2bHqmW5bvfVMMJctcwws7no86uMo2GQEQ9aVZy2k60RG5 U0CILEgTNrXBg954wDzE3GnFjQ== X-Google-Smtp-Source: ABdhPJxEPgjN8zxQ212St/12AqeiWIWDjQI3YqfduoU93Dcr2prsac+4S/oGDBcIqaN1gg3rLi2aGg== X-Received: by 2002:a92:1a4a:: with SMTP id z10mr22531390ill.4.1614185101811; Wed, 24 Feb 2021 08:45:01 -0800 (PST) Received: from p1.localdomain ([65.144.74.34]) by smtp.gmail.com with ESMTPSA id f1sm2273652iov.3.2021.02.24.08.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 08:45:00 -0800 (PST) From: Jens Axboe To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, Jens Axboe Subject: [PATCH 3/3] iomap: use filemap_range_needs_writeback() for O_DIRECT reads Date: Wed, 24 Feb 2021 09:44:55 -0700 Message-Id: <20210224164455.1096727-4-axboe@kernel.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210224164455.1096727-1-axboe@kernel.dk> References: <20210224164455.1096727-1-axboe@kernel.dk> MIME-Version: 1.0 X-Stat-Signature: a151b4waey7q3uiq5hfb6daghpnk4cfj X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: E985A20053D0 Received-SPF: none (kernel.dk>: No applicable sender policy available) receiver=imf01; identity=mailfrom; envelope-from=""; helo=mail-il1-f174.google.com; client-ip=209.85.166.174 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614185106-501801 Content-Transfer-Encoding: quoted-printable 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 reads, use the better variant of checking for the need to call filemap_write_and_wait_range() when doing O_DIRECT. 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 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index e2c4991833b8..8c35a0041f0f 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -487,12 +487,28 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter = *iter, if (pos >=3D dio->i_size) goto out_free_dio; =20 + if (iocb->ki_flags & IOCB_NOWAIT) { + if (filemap_range_needs_writeback(mapping, pos, end)) { + ret =3D -EAGAIN; + goto out_free_dio; + } + iomap_flags |=3D IOMAP_NOWAIT; + } + if (iter_is_iovec(iter)) dio->flags |=3D IOMAP_DIO_DIRTY; } else { iomap_flags |=3D IOMAP_WRITE; dio->flags |=3D IOMAP_DIO_WRITE; =20 + if (iocb->ki_flags & IOCB_NOWAIT) { + if (filemap_range_has_page(mapping, pos, end)) { + ret =3D -EAGAIN; + goto out_free_dio; + } + iomap_flags |=3D IOMAP_NOWAIT; + } + /* for data sync or sync, we need sync completion processing */ if (iocb->ki_flags & IOCB_DSYNC) dio->flags |=3D IOMAP_DIO_NEED_SYNC; @@ -507,14 +523,6 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *= iter, dio->flags |=3D IOMAP_DIO_WRITE_FUA; } =20 - if (iocb->ki_flags & IOCB_NOWAIT) { - if (filemap_range_has_page(mapping, pos, end)) { - ret =3D -EAGAIN; - goto out_free_dio; - } - iomap_flags |=3D IOMAP_NOWAIT; - } - if (dio_flags & IOMAP_DIO_OVERWRITE_ONLY) { ret =3D -EAGAIN; if (pos >=3D dio->i_size || pos + count > dio->i_size) --=20 2.30.0