From patchwork Tue Dec 12 19:01:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 10108187 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AF18E602C2 for ; Tue, 12 Dec 2017 19:03:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3F3223B24 for ; Tue, 12 Dec 2017 19:03:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98EB9284E4; Tue, 12 Dec 2017 19:03:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4652E23B24 for ; Tue, 12 Dec 2017 19:03:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752172AbdLLTCy (ORCPT ); Tue, 12 Dec 2017 14:02:54 -0500 Received: from mail-qt0-f193.google.com ([209.85.216.193]:40391 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752602AbdLLTBv (ORCPT ); Tue, 12 Dec 2017 14:01:51 -0500 Received: by mail-qt0-f193.google.com with SMTP id u42so49932760qte.7; Tue, 12 Dec 2017 11:01:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=s+Sjny9oT+pSHpdumLrrxXsQqkx1ELbjdDRA5a0EOng=; b=WjLxPmVupbHjJYnR2H0v1FYgiIfcKAgE6IDIcH4Vrc0tVHknU08C9zDuTU3mFffYjR E3ui/QlMa7KGaPcd3ZnlDXpbh4H5ZJe8OgxqUEunLW9jb62Z8cve7s459FK9DdRA2f2G JxapQDGmaFeR/O9ZtKcJxIXD5Oooy14SkIPFaHGQ/dSnm255jgwbrQH88CnC0078tCue NG0rfLF+CceMxV1VZwYVbhaKoon7CzNkuemnp4fCFfrhGWxbdKbnOy9yXNZkDHXnlW0o BiZmo3gycXAEcq/t1bwKlgI01g56wplDCkhAiUEYjFVQZyEr1NZLW5zddBjRR9NRy5Tl 336A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=s+Sjny9oT+pSHpdumLrrxXsQqkx1ELbjdDRA5a0EOng=; b=cQgD1SVyC7Q4vjLDHASi+5lkjdbntUlyIqmBSRBNBgXnITQblUgFzW6VDCwG5khnce b3hbWdMNP3QKkb9d9aZM9PNeEMyFkVkJ7H7LxMLwseyXkLm2qrOeQ59QgFFXLFiEkMIn rhpdxHQq6hWIlZkA9mXgyBOpxC/Irdmvt8W7BFAOwJEC7yBh3GK77myH4kLOVpbnZmYv 9TNYNyIjNB8kVoTEjbl1RJLgMiBJWzpbp4Irwc68TYEE2IVJSwJQIxVRGNghwmp3Kic6 Tg+RkoU+CD/zTY9/Gmj9/lDrHNzc2rNYO1l/adjIkoGKbG9J+sOID0bS2jP5v79hrKcq /FQg== X-Gm-Message-State: AKGB3mJlbJL4aMlnZlIFTfthgkxUCyzrsWNqtIo+lQw+3rEt0Dk3J60i sE6X5LBrAVfkVIhWK8DpXms= X-Google-Smtp-Source: ACJfBouBrZ2tttzIMAENhhf8u3/4VYPTpQInOtMkX6Xgny+ff5AXHDj6nGdq+ikg3avpKZzNqvBj9A== X-Received: by 10.55.214.25 with SMTP id t25mr3180607qki.43.1513105309471; Tue, 12 Dec 2017 11:01:49 -0800 (PST) Received: from localhost (dhcp-ec-8-6b-ed-7a-cf.cpe.echoes.net. [72.28.5.223]) by smtp.gmail.com with ESMTPSA id q37sm6208057qtj.66.2017.12.12.11.01.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 11:01:48 -0800 (PST) From: Tejun Heo To: axboe@kernel.dk Cc: linux-kernel@vger.kernel.org, oleg@redhat.com, peterz@infradead.org, kernel-team@fb.com, osandov@fb.com, linux-block@vger.kernel.org, hch@lst.de, Tejun Heo Subject: [PATCH 3/6] blk-mq: use blk_mq_rq_state() instead of testing REQ_ATOM_COMPLETE Date: Tue, 12 Dec 2017 11:01:31 -0800 Message-Id: <20171212190134.535941-4-tj@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171212190134.535941-1-tj@kernel.org> References: <20171212190134.535941-1-tj@kernel.org> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP blk_mq_check_inflight() and blk_mq_poll_hybrid_sleep() test REQ_ATOM_COMPLETE to determine the request state. Both uses are speculative and we can test REQ_ATOM_STARTED and blk_mq_rq_state() for equivalent results. Replace the tests. This will allow removing REQ_ATOM_COMPLETE usages from blk-mq. Signed-off-by: Tejun Heo --- block/blk-mq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index b4e733b..3a08d7a 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -95,8 +95,7 @@ static void blk_mq_check_inflight(struct blk_mq_hw_ctx *hctx, { struct mq_inflight *mi = priv; - if (test_bit(REQ_ATOM_STARTED, &rq->atomic_flags) && - !test_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags)) { + if (blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT) { /* * index[0] counts the specific partition that was asked * for. index[1] counts the ones that are active on the @@ -2958,7 +2957,8 @@ static bool blk_mq_poll_hybrid_sleep(struct request_queue *q, hrtimer_init_sleeper(&hs, current); do { - if (test_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags)) + if (test_bit(REQ_ATOM_STARTED, &rq->atomic_flags) && + blk_mq_rq_state(rq) != MQ_RQ_IN_FLIGHT) break; set_current_state(TASK_UNINTERRUPTIBLE); hrtimer_start_expires(&hs.timer, mode);