From patchwork Wed Oct 6 11:06:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen-chien Jesse Sung X-Patchwork-Id: 1537053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=MvS6drtU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HPWqs29Zdz9sP7 for ; Wed, 6 Oct 2021 22:07:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mY4lD-0003ct-MW; Wed, 06 Oct 2021 11:06:55 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mY4l8-0003cY-KA for kernel-team@lists.ubuntu.com; Wed, 06 Oct 2021 11:06:50 +0000 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 472963FFDD for ; Wed, 6 Oct 2021 11:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1633518410; bh=+Il0IqVllM5bgdyVHGZuyHu6iaJEb1XX8SWihyDciR4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MvS6drtUTDHykB+4QFBzTn5IT1G1LIhe0kjcCaKCfjYiU2r1+Th7yP0NsaM7CVXPz YVhhxaHed6N/IKkH3MgxzTvklYcmPSH1jUNp4pYohwu5JZSZYcRM3P5pNr65ITbN4K 6l7sT9IW3JyZ15fb7MsSumQOGmX9UQ2XP7scAbL3Iar4cEI1AbSbH4rfOsTi1BjbJN dWoIFArQtfu0yLkLFdWb4k0vpCUiL2Df+XBmSMcekjQUgLEEbV4UtbYzdGW/KMDUZ2 0vwMpttlYKY8+Mg+UbttzZJgGA8RlMXS2nN4wP/uR4Z7xcLMLHrZm6MyVhv5228UOq cRW5vImIZMS6g== Received: by mail-pj1-f72.google.com with SMTP id o4-20020a17090ad24400b0019fc1b0342dso1563635pjw.9 for ; Wed, 06 Oct 2021 04:06:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+Il0IqVllM5bgdyVHGZuyHu6iaJEb1XX8SWihyDciR4=; b=cvJl8KrRfgULNs21sSpyT60pxy6IYX32Dzi5uGweqZbKe9HZS1nTeP6+F/+Z9iYW0v kxiM5q3/Ejz2eHpp2/NzGtKOmMaTEEVFf0QpIZYjDzEACC/oH8A+MvFy6YBI7Mrjy7ns 5j5GxcaEvfG0krmbReWgBMSZWXYuMlbURasnFRxwNezqVLlLOIbdR8l+hmfEW9ICbuJZ /7WXiUYDea4/KoXmconBECh5wjyAuee9sS3rBaztup0T5ats7YTGfHrA3wkjKUAy/ska +j7ERbForz0r18agk1if+u6AU5y2i3VwxC6x86h8cQ/iSfAwe2nQeMllxorbWcU7o+IN GBog== X-Gm-Message-State: AOAM531Xn+w2vsEsvYkmcnU2rQNx+xWOeOzPfyxeV1Am8jwK0QVA0nKx R5EpTbk2jLv8qzjhRkRtl6Rfv3J6qeH+axsle466jLT3Oe1c4h946qEghmibOQvI4zr9vyi1GTr GgkyVhWFDP9QMb71qgvMnNKs4z27Knw9cgsxBS5kw7A== X-Received: by 2002:a17:902:7e05:b0:13d:e01a:be5f with SMTP id b5-20020a1709027e0500b0013de01abe5fmr10348958plm.56.1633518408143; Wed, 06 Oct 2021 04:06:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyoRuhV1cTBFeB7KlBsE/C+eyIJgMrDL+rWxCUqfVBz8U2AbBvmLZ8p5jy+p253lG827ZBsPQ== X-Received: by 2002:a17:902:7e05:b0:13d:e01a:be5f with SMTP id b5-20020a1709027e0500b0013de01abe5fmr10348944plm.56.1633518407881; Wed, 06 Oct 2021 04:06:47 -0700 (PDT) Received: from localhost.localdomain (2001-b011-6c05-1dbb-14e9-81ff-fe92-246e.dynamic-ip6.hinet.net. [2001:b011:6c05:1dbb:14e9:81ff:fe92:246e]) by smtp.gmail.com with ESMTPSA id p17sm21919521pfo.9.2021.10.06.04.06.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 04:06:47 -0700 (PDT) From: Wen-chien Jesse Sung To: kernel-team@lists.ubuntu.com Subject: [focal:linux-bluefield][PATCH 1/1] UBUNTU: SAUCE: Revert "block: don't ignore REQ_NOWAIT for direct IO" Date: Wed, 6 Oct 2021 19:06:43 +0800 Message-Id: <20211006110643.3359608-2-jesse.sung@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211006110643.3359608-1-jesse.sung@canonical.com> References: <20211006110643.3359608-1-jesse.sung@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://launchpad.net/bugs/1946219 This reverts commit d6757b3e34831b7615edd3268b878536761f8b2e. After configuration multipath with io uring virtio_blk module is stuck with that commit applied. Revert it for now. Signed-off-by: Wen-chien Jesse Sung --- fs/block_dev.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index fa329c7eddf02..2ab29da9b4bc3 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -246,8 +246,6 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, bio.bi_opf = dio_bio_write_op(iocb); task_io_account_write(ret); } - if (iocb->ki_flags & IOCB_NOWAIT) - bio.bi_opf |= REQ_NOWAIT; if (iocb->ki_flags & IOCB_HIPRI) bio_set_polled(&bio, iocb); @@ -401,8 +399,6 @@ __blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, int nr_pages) bio->bi_opf = dio_bio_write_op(iocb); task_io_account_write(bio->bi_iter.bi_size); } - if (iocb->ki_flags & IOCB_NOWAIT) - bio->bi_opf |= REQ_NOWAIT; dio->size += bio->bi_iter.bi_size; pos += bio->bi_iter.bi_size;