From patchwork Sat Dec 16 12:07:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 10116931 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 23C2E603B5 for ; Sat, 16 Dec 2017 12:08:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 158C829508 for ; Sat, 16 Dec 2017 12:08:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A41829699; Sat, 16 Dec 2017 12:08:57 +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 A536229508 for ; Sat, 16 Dec 2017 12:08:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756987AbdLPMIo (ORCPT ); Sat, 16 Dec 2017 07:08:44 -0500 Received: from mail-qt0-f194.google.com ([209.85.216.194]:33288 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756861AbdLPMHp (ORCPT ); Sat, 16 Dec 2017 07:07:45 -0500 Received: by mail-qt0-f194.google.com with SMTP id e2so15181280qti.0; Sat, 16 Dec 2017 04:07:44 -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=rGiJqyVMNruLABuW9To82t/dqVlmt3kV2FiSOeuZBkE=; b=A24K/JjVPQDZpi+HCtbLYpXrDYIciHulxuBg5LuBa+ndNlX/Ssrtnst06aUIFuZsWG xj7PHdjDcjAGLt7sPQ5slbAIicTEOPuXYctLkzlauLC4UVLuhQpk4SRxnVLAK7tr7RDh BAvTaHJAAkGla2+8/TyNnR6d5XMz6WOS9aSvIit6H/nUpS6wW4E4gRe1Wm4Ulwopfzak uRDrow7TXtkfMnSqkGl5VzhmhADMMwpkvlYX8y4+qTeWOUO+ZMPHR9PNHGKvQuy+1q3J IBKRlyDFpQcGOjkJcIRwgZECFwuCFmynkiGy7ft9EcNz4jHY8oIuUlTW6BQVTtMKhu27 9Vfw== 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=rGiJqyVMNruLABuW9To82t/dqVlmt3kV2FiSOeuZBkE=; b=ubu5GyHdtqSJL6HKsYi7nuRlOpJEWr/UUj8lzKcnkgYnKaGvcwYvinjnOWsuMC59Tg AlsovEQE009BXRwRiZ8jyHs3iGqpWI9pY8sE46Kk4EP7hYElOwkADdBrrWyVWbc28ZPN Fw6AHQRh6MuiZVYoXIvNy7xpILsrfiJODnhTKmjaWB1n82rcELHm0+EIdBSxwdG4Ty4e k3GO068ayMgIba4CyHhWgoTBiXwcffCfYZwNLvsUtGMAyWw3J68JOLnevvtBZpL9xHL2 xvQ2X5bJMOwtjVB7u1djhzB3lx7kl9d4Fkjfor5HV/cP95qX7eHNEzSDlO4atO6Dtkt/ qXQQ== X-Gm-Message-State: AKGB3mIyf4O9Ua7IfSsS2jfdabHC76aP/XWB6CgRNA4rug4doukYwvMS WsXi8dcKk8mzi1wGGc562B0= X-Google-Smtp-Source: ACJfBotgr51tXy2MwqO19fFQqn99Din3h2ER2YPmZJYaus5msJSqNWZmry9ON9T4wuswDQiSeSWJUw== X-Received: by 10.200.39.48 with SMTP id g45mr26392467qtg.313.1513426063903; Sat, 16 Dec 2017 04:07:43 -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 5sm3545463qtv.23.2017.12.16.04.07.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 04:07:43 -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 5/7] blk-mq: remove REQ_ATOM_COMPLETE usages from blk-mq Date: Sat, 16 Dec 2017 04:07:24 -0800 Message-Id: <20171216120726.517153-6-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 After the recent updates to use generation number and state based synchronization, blk-mq no longer depends on REQ_ATOM_COMPLETE except to avoid firing the same timeout multiple times. Remove all REQ_ATOM_COMPLETE usages and use a new rq_flags flag RQF_MQ_TIMEOUT_EXPIRED to avoid firing the same timeout multiple times. This removes atomic bitops from hot paths too. v2: Removed blk_clear_rq_complete() from blk_mq_rq_timed_out(). v3: Added RQF_MQ_TIMEOUT_EXPIRED flag. Signed-off-by: Tejun Heo Cc: "jianchao.wang" --- block/blk-mq.c | 18 ++++++++---------- block/blk-timeout.c | 1 + include/linux/blkdev.h | 2 ++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 88baa82..47e722b 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -607,14 +607,12 @@ void blk_mq_complete_request(struct request *rq) */ if (!(hctx->flags & BLK_MQ_F_BLOCKING)) { rcu_read_lock(); - if (blk_mq_rq_aborted_gstate(rq) != rq->gstate && - !blk_mark_rq_complete(rq)) + if (blk_mq_rq_aborted_gstate(rq) != rq->gstate) __blk_mq_complete_request(rq); rcu_read_unlock(); } else { srcu_idx = srcu_read_lock(hctx->queue_rq_srcu); - if (blk_mq_rq_aborted_gstate(rq) != rq->gstate && - !blk_mark_rq_complete(rq)) + if (blk_mq_rq_aborted_gstate(rq) != rq->gstate) __blk_mq_complete_request(rq); srcu_read_unlock(hctx->queue_rq_srcu, srcu_idx); } @@ -665,8 +663,6 @@ void blk_mq_start_request(struct request *rq) preempt_enable(); set_bit(REQ_ATOM_STARTED, &rq->atomic_flags); - if (test_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags)) - clear_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags); if (q->dma_drain_size && blk_rq_bytes(rq)) { /* @@ -817,6 +813,8 @@ static void blk_mq_rq_timed_out(struct request *req, bool reserved) if (!test_bit(REQ_ATOM_STARTED, &req->atomic_flags)) return; + req->rq_flags |= RQF_MQ_TIMEOUT_EXPIRED; + if (ops->timeout) ret = ops->timeout(req, reserved); @@ -832,7 +830,6 @@ static void blk_mq_rq_timed_out(struct request *req, bool reserved) */ blk_mq_rq_update_aborted_gstate(req, 0); blk_add_timer(req); - blk_clear_rq_complete(req); break; case BLK_EH_NOT_HANDLED: break; @@ -851,7 +848,8 @@ static void blk_mq_check_expired(struct blk_mq_hw_ctx *hctx, might_sleep(); - if (!test_bit(REQ_ATOM_STARTED, &rq->atomic_flags)) + if ((rq->rq_flags & RQF_MQ_TIMEOUT_EXPIRED) || + !test_bit(REQ_ATOM_STARTED, &rq->atomic_flags)) return; /* read coherent snapshots of @rq->state_gen and @rq->deadline */ @@ -886,8 +884,8 @@ static void blk_mq_terminate_expired(struct blk_mq_hw_ctx *hctx, * now guaranteed to see @rq->aborted_gstate and yield. If * @rq->aborted_gstate still matches @rq->gstate, @rq is ours. */ - if (READ_ONCE(rq->gstate) == rq->aborted_gstate && - !blk_mark_rq_complete(rq)) + if (!(rq->rq_flags & RQF_MQ_TIMEOUT_EXPIRED) && + READ_ONCE(rq->gstate) == rq->aborted_gstate) blk_mq_rq_timed_out(rq, reserved); } diff --git a/block/blk-timeout.c b/block/blk-timeout.c index d580af3..25c4ffa 100644 --- a/block/blk-timeout.c +++ b/block/blk-timeout.c @@ -209,6 +209,7 @@ void blk_add_timer(struct request *req) req->timeout = q->rq_timeout; req->deadline = jiffies + req->timeout; + req->rq_flags &= ~RQF_MQ_TIMEOUT_EXPIRED; /* * Only the non-mq case needs to add the request to a protected list. diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 2d6fd11..13186a7 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -123,6 +123,8 @@ typedef __u32 __bitwise req_flags_t; /* Look at ->special_vec for the actual data payload instead of the bio chain. */ #define RQF_SPECIAL_PAYLOAD ((__force req_flags_t)(1 << 18)) +/* timeout is expired */ +#define RQF_MQ_TIMEOUT_EXPIRED ((__force req_flags_t)(1 << 19)) /* flags that prevent us from merging requests: */ #define RQF_NOMERGE_FLAGS \