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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,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 BCB83C56202 for ; Wed, 18 Nov 2020 11:12:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77456238E6 for ; Wed, 18 Nov 2020 11:12:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726913AbgKRLMJ (ORCPT ); Wed, 18 Nov 2020 06:12:09 -0500 Received: from out30-130.freemail.mail.aliyun.com ([115.124.30.130]:49958 "EHLO out30-130.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726795AbgKRLMI (ORCPT ); Wed, 18 Nov 2020 06:12:08 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=alimailimapcm10staff010182156082;MF=haoxu@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0UFnjLBq_1605697916; Received: from e18g09479.et15sqa.tbsite.net(mailfrom:haoxu@linux.alibaba.com fp:SMTPD_---0UFnjLBq_1605697916) by smtp.aliyun-inc.com(127.0.0.1); Wed, 18 Nov 2020 19:12:04 +0800 From: Hao Xu To: Alexander Viro , Christoph Hellwig Cc: "Darrick J. Wong" , linux-fsdevel@vger.kernel.org Subject: [RFC RESEND] iomap: set REQ_NOWAIT according to IOCB_NOWAIT in Direct IO Date: Wed, 18 Nov 2020 19:11:56 +0800 Message-Id: <1605697916-47833-1-git-send-email-haoxu@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1605685931-207023-1-git-send-email-haoxu@linux.alibaba.com> References: <1605685931-207023-1-git-send-email-haoxu@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Currently, IOCB_NOWAIT is ignored in direct io, REQ_NOWAIT is only set when IOCB_HIPRI is set. But REQ_NOWAIT should be set as well when IOCB_NOWAIT is set. Signed-off-by: Hao Xu --- Hi all, I tested fio io_uring direct read for a file on ext4 filesystem on a nvme ssd. I found that IOCB_NOWAIT is ignored in iomap layer, which means REQ_NOWAIT is not set in bio->bi_opf. This makes nowait IO a normal IO. Since I'm new to iomap and block layer, I sincerely ask yours opinions in case I misunderstand the code which is very likely to happen.:) fs/block_dev.c | 3 +++ fs/iomap/direct-io.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/fs/block_dev.c b/fs/block_dev.c index 9e84b1928b94..b7db3b7e2ba1 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -424,6 +424,9 @@ static void blkdev_bio_end_io(struct bio *bio) if (!nr_pages) { bool polled = false; + if (iocb->ki_flags & IOCB_NOWAIT) + bio->bi_opf |= REQ_NOWAIT; + if (iocb->ki_flags & IOCB_HIPRI) { bio_set_polled(bio, iocb); polled = true; diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 933f234d5bec..22f7488bf5e5 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -64,6 +64,9 @@ static void iomap_dio_submit_bio(struct iomap_dio *dio, struct iomap *iomap, { atomic_inc(&dio->ref); + if (dio->iocb->ki_flags & IOCB_NOWAIT) + bio->bi_opf |= REQ_NOWAIT; + if (dio->iocb->ki_flags & IOCB_HIPRI) bio_set_polled(bio, dio->iocb); -- 1.8.3.1