From patchwork Sat Dec 16 12:07:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 10116915 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 D0ADF6057C for ; Sat, 16 Dec 2017 12:07:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2DBC29508 for ; Sat, 16 Dec 2017 12:07:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7EF929D39; Sat, 16 Dec 2017 12:07:51 +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=ham 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 6F97A2950A for ; Sat, 16 Dec 2017 12:07:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756881AbdLPMHq (ORCPT ); Sat, 16 Dec 2017 07:07:46 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:45112 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756824AbdLPMHj (ORCPT ); Sat, 16 Dec 2017 07:07:39 -0500 Received: by mail-qt0-f196.google.com with SMTP id g10so15098263qtj.12; Sat, 16 Dec 2017 04:07:38 -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=M+O+0VrQs+CUPggpcVJy7vC0H4gy1sulFzwUHf9UyQs=; b=C9Xv98GsaXefPuZPrFXl6cA32l6QPoJhZfVG6iNw48qXd22gEcVK0eoClrbYarpC4B vjW2VpOspuO2tpaSnYWD5b+vZCpAX5WF2GWc4ea1uZjmNZeOxQrBZHoYSYTl7kwUiawI imvYwmH8R0RUqiaamh4M5RQ0f6tMKKJcqrdMLVQzbovvp+SUBn5aZ+jZqYeXIVclVBbj h6QsVMSVXpjPn0ZCyipJ1HRHZk2vJrCJU5FOL9TsMO6LUBlnoHewtY1e4U4n2lr44KN7 BY6CYSQkqNPCNi1FLVeKQxT2fx3jmyPH3rzHFnc54Krf7Lr1VXEP5FoLaG1Z8wduAjQS 8BIw== 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=M+O+0VrQs+CUPggpcVJy7vC0H4gy1sulFzwUHf9UyQs=; b=IVJwSbe7vHdAq4ygo6U+zPXuF4P9L74FfDVxlvCT6naoRnKRW+4teSiPPUW1toVdnq l775SzfKhBbIVY7/U+HzDcMecHldC4SyHH6JwK2ntjEjCalu1yDrmoUsLQfJr19dtf3u WK+IldJAGAz6A4v8WnITMSERSkaZPNrfvXHE4TEer6cTrxOB3kssAcmlsw/cVsfeFqZD TDtnyZtMY477ArV6keRLevbMpuAQOcIhu7dWjNObNwVaSXXhM9VslG6Zr5QkCvi/wEmX SnMgfYpO2iY4uwJc34wIt+evL1jOtSvR6gNJEP9n66O4PJlqXjbj7v6PVMeNefsFV44L GxsQ== X-Gm-Message-State: AKGB3mJHbQidjN2xslBiy0GCSQl8xCIJ6yCri/b70J2RlNMmGouVcgQ/ aJV5KQxa8Xj9nOLu6ulF5wA= X-Google-Smtp-Source: ACJfBoveI7KxzpmQMBXJgHYCnEFYnmOj8L/oiiTQb10MnwMWenW4zHJr8px0iuSJ6Tm3UnzBdvdheg== X-Received: by 10.237.60.129 with SMTP id d1mr4222120qtf.288.1513426058559; Sat, 16 Dec 2017 04:07:38 -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 136sm938933qkl.1.2017.12.16.04.07.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 04:07:38 -0800 (PST) From: Tejun Heo To: jack@suse.cz, axboe@kernel.dk, clm@fb.com, jbacik@fb.com Cc: kernel-team@fb.com, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, peterz@infradead.org, jianchao.w.wang@oracle.com, Bart.VanAssche@wdc.com, Tejun Heo Subject: [PATCH 3/7] blk-mq: use blk_mq_rq_state() instead of testing REQ_ATOM_COMPLETE Date: Sat, 16 Dec 2017 04:07:22 -0800 Message-Id: <20171216120726.517153-4-tj@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171216120726.517153-1-tj@kernel.org> References: <20171216120726.517153-1-tj@kernel.org> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@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 abd5d01..643a38d 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 @@ -2974,7 +2973,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);