From patchwork Mon Jan 8 19:15:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 10150395 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 C64FD601A1 for ; Mon, 8 Jan 2018 19:17:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF46928639 for ; Mon, 8 Jan 2018 19:17:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3DE128687; Mon, 8 Jan 2018 19:17:01 +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 45B3028639 for ; Mon, 8 Jan 2018 19:17:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932509AbeAHTQO (ORCPT ); Mon, 8 Jan 2018 14:16:14 -0500 Received: from mail-qt0-f196.google.com ([209.85.216.196]:32875 "EHLO mail-qt0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932506AbeAHTQL (ORCPT ); Mon, 8 Jan 2018 14:16:11 -0500 Received: by mail-qt0-f196.google.com with SMTP id e2so14962049qti.0; Mon, 08 Jan 2018 11:16:10 -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=kSkStpDC7gywCRTMi0oZR44mUiE+Gzvp8VKD3wdLvFE=; b=a7qBPwmWCs1mBax+nuIddYBNhDy+ITe7Thpn0aq+RNP1GUQnygoAuSUUqA3HTVk5kp xbrYwk9UGw604rcAw7dRnnrZvUGmFLmwjTIFzFOelYNSh9xS2fyPcTSmou8ooMtUu3Ds ffzSX/N8xLnH2IdZoB/u4eSRqoZdEYo7jTedCfS0gVbtAQWmKVYt90ggKNwWQtV4GSzh jxuVaLnCpWLat3kj0Xsq0Z6jhfTZ0GolNmXBlW9hqPyhyLAljkPXgX0+a3K4vkSoL9yX A8zOIXUifmhk22a5x6/hVpQg/5MySyjG3PucguA8HVCsb4aevr34NUTf6jg81OAHVhll OxxA== 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=kSkStpDC7gywCRTMi0oZR44mUiE+Gzvp8VKD3wdLvFE=; b=OhYOdEptgOPFaagmQLYBGoEYGqcdGvF5kZCsS9BRGdme8iYHRK0GIWEln8yxptpiJ1 EPDhGW7czAMK/xt0h0jdkoFkmu9TBeVMSsAGaWej3hojgW2XiBCNZ2RHLT3dq7IabmCl eTR8jwMdTOVIYu97fYwYVhRxatO1tyqnhRGu7sSNCsU08PCiujcDrBXqknXJN39iVXVZ QKi/zyyM/wtBHHKVkSCeKx8AdovPjAtZebiJo0e7zyM/BG9FverW8pdf1I6nenVRpl9g RwDtEDMydOF8ANffm8rhNMXtboA8hjnZeKFDo+ovOxaQoXn/RhLn1QfkFT/2pnZhxyt4 ClBQ== X-Gm-Message-State: AKwxytcm2Ohc10UxugyKb0Kwgxp3KBXUiGxNYTzcSMdLE+q1qCNxMUR6 teEnSQ/ZrEXfkAYU89/rLPc= X-Google-Smtp-Source: ACJfBoudC0qhlbHQyxRVJxIGKgW78rmw8cLfZ2SIQe+Xtv7bOVk5AyAzvTymF2/jZnMkrJu14CrceQ== X-Received: by 10.237.53.166 with SMTP id c35mr12495607qte.215.1515438970115; Mon, 08 Jan 2018 11:16:10 -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 d6sm7992521qte.4.2018.01.08.11.16.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 11:16:09 -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, linux-block@vger.kernel.org, Tejun Heo Subject: [PATCH 6/8] blk-mq: remove REQ_ATOM_COMPLETE usages from blk-mq Date: Mon, 8 Jan 2018 11:15:40 -0800 Message-Id: <20180108191542.379478-7-tj@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180108191542.379478-1-tj@kernel.org> References: <20180108191542.379478-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 | 15 +++++++-------- block/blk-timeout.c | 1 + include/linux/blkdev.h | 2 ++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index bed4cb8..050d982 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -628,8 +628,7 @@ void blk_mq_complete_request(struct request *rq) * hctx_lock() covers both issue and completion paths. */ hctx_lock(hctx, &srcu_idx); - 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); hctx_unlock(hctx, srcu_idx); } @@ -679,8 +678,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)) { /* @@ -831,6 +828,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); @@ -846,7 +845,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; @@ -865,7 +863,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 */ @@ -900,8 +899,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 2206607..e2a4afc 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -125,6 +125,8 @@ typedef __u32 __bitwise req_flags_t; #define RQF_SPECIAL_PAYLOAD ((__force req_flags_t)(1 << 18)) /* The per-zone write lock is held for this request */ #define RQF_ZONE_WRITE_LOCKED ((__force req_flags_t)(1 << 19)) +/* timeout is expired */ +#define RQF_MQ_TIMEOUT_EXPIRED ((__force req_flags_t)(1 << 20)) /* flags that prevent us from merging requests: */ #define RQF_NOMERGE_FLAGS \