From patchwork Sat Dec 16 12:07:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 10116925 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 4A50C603B5 for ; Sat, 16 Dec 2017 12:08:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A2AB29508 for ; Sat, 16 Dec 2017 12:08:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F0E929699; Sat, 16 Dec 2017 12:08:25 +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 7C94B29508 for ; Sat, 16 Dec 2017 12:08:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756969AbdLPMIX (ORCPT ); Sat, 16 Dec 2017 07:08:23 -0500 Received: from mail-qk0-f193.google.com ([209.85.220.193]:33328 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756888AbdLPMHt (ORCPT ); Sat, 16 Dec 2017 07:07:49 -0500 Received: by mail-qk0-f193.google.com with SMTP id 63so13395374qke.0; Sat, 16 Dec 2017 04:07:49 -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=pDxPHm2ahpPVusmhU8sI0Ud7UvB7rQTuaoO9fY8MiAs=; b=oE17I9Towen8sPnMXyALwgTuJcCZN13k67MG/zWR+T4y28zQ4RurrZ2E4FL1lLqK7p i5WzFix6mfLJXdQhwxTyt0en9jKEFsTtW0VCYYzilZs2wlVIku9s0hhyJcjVV6gUHF2K PdSu/rqwW7j/0ouV5G4jJf+h/i4T3RwA0e6YsC5iafDzx152tIpmqiZtefUxgfuK2vWZ FhyWP+8ftRkzhbxQwlZmTzQ+goRQP/Vtr2kaQpQHWqMluzEQVgfMGUbEYnPanw22ykea ciCtL7bYTxdHph0i4y4dmiGBv+i6hfmOUoOqt75Oxq8uq3Q6NIC9kVGmVPrXrsab6GrS sYwA== 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=pDxPHm2ahpPVusmhU8sI0Ud7UvB7rQTuaoO9fY8MiAs=; b=SMk6TaMcXYHipgj2lEEd4m7rtwu4OVDdZX9tCFCeK1JgPSDmPDipYeUKTkARv5C8LG oCk2Em+L3wz2uDYTA6yuFpl8q5W4aJzTDlLslPWUDF559uRK/P0TAq3HefbGttD4v2Xx E8VKuIcOQhkcd9cwL1h8RJIvwnuyVm3hZTMDqhPkFr1AON8oh8aik7eeqQNgLTtiL3eY KhXHh4KnXr/sUHSLnOO5LBH4JrRvSdB5uYY5cN0Wj1MU0zbejxwxjeh76Hq0mGAl2Tfc nMgGv6FWwHFOkKh9B0oY3RlZ28YuGaHR+g31vGTFbc9l96zFBuS+6QDJoxCRHab+difP 9Opg== X-Gm-Message-State: AKGB3mInspStcKIKD5YcvcbR3ili+8fZUF4+kLrKOXFJaf8N9eO7nXV9 susd8Pel52Tkd9l61P7DKk4= X-Google-Smtp-Source: ACJfBos12Ku6LCd0OFZAFAYyg5D3ls3hMLziiBvQDzAcEdoWEGH7NhofelNx/HpK1Q+zNwqFtubHaQ== X-Received: by 10.55.119.70 with SMTP id s67mr26742077qkc.45.1513426068859; Sat, 16 Dec 2017 04:07:48 -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 d9sm5352579qti.94.2017.12.16.04.07.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 04:07:48 -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 7/7] blk-mq: rename blk_mq_hw_ctx->queue_rq_srcu to ->srcu Date: Sat, 16 Dec 2017 04:07:26 -0800 Message-Id: <20171216120726.517153-8-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 The RCU protection has been expanded to cover both queueing and completion paths making ->queue_rq_srcu a misnomer. Rename it to ->srcu as suggested by Bart. Signed-off-by: Tejun Heo Cc: Bart Van Assche --- block/blk-mq.c | 22 +++++++++++----------- include/linux/blk-mq.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 724d340..872d4ee 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -219,7 +219,7 @@ void blk_mq_quiesce_queue(struct request_queue *q) queue_for_each_hw_ctx(q, hctx, i) { if (hctx->flags & BLK_MQ_F_BLOCKING) - synchronize_srcu(hctx->queue_rq_srcu); + synchronize_srcu(hctx->srcu); else rcu = true; } @@ -611,10 +611,10 @@ void blk_mq_complete_request(struct request *rq) __blk_mq_complete_request(rq); rcu_read_unlock(); } else { - srcu_idx = srcu_read_lock(hctx->queue_rq_srcu); + srcu_idx = srcu_read_lock(hctx->srcu); if (blk_mq_rq_aborted_gstate(rq) != rq->gstate) __blk_mq_complete_request(rq); - srcu_read_unlock(hctx->queue_rq_srcu, srcu_idx); + srcu_read_unlock(hctx->srcu, srcu_idx); } } EXPORT_SYMBOL(blk_mq_complete_request); @@ -916,7 +916,7 @@ static void blk_mq_timeout_work(struct work_struct *work) if (!(hctx->flags & BLK_MQ_F_BLOCKING)) has_rcu = true; else - synchronize_srcu(hctx->queue_rq_srcu); + synchronize_srcu(hctx->srcu); hctx->nr_expired = 0; } @@ -1279,9 +1279,9 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx) } else { might_sleep(); - srcu_idx = srcu_read_lock(hctx->queue_rq_srcu); + srcu_idx = srcu_read_lock(hctx->srcu); blk_mq_sched_dispatch_requests(hctx); - srcu_read_unlock(hctx->queue_rq_srcu, srcu_idx); + srcu_read_unlock(hctx->srcu, srcu_idx); } } @@ -1718,9 +1718,9 @@ static void blk_mq_try_issue_directly(struct blk_mq_hw_ctx *hctx, might_sleep(); - srcu_idx = srcu_read_lock(hctx->queue_rq_srcu); + srcu_idx = srcu_read_lock(hctx->srcu); __blk_mq_try_issue_directly(hctx, rq, cookie, true); - srcu_read_unlock(hctx->queue_rq_srcu, srcu_idx); + srcu_read_unlock(hctx->srcu, srcu_idx); } } @@ -2074,7 +2074,7 @@ static void blk_mq_exit_hctx(struct request_queue *q, set->ops->exit_hctx(hctx, hctx_idx); if (hctx->flags & BLK_MQ_F_BLOCKING) - cleanup_srcu_struct(hctx->queue_rq_srcu); + cleanup_srcu_struct(hctx->srcu); blk_mq_remove_cpuhp(hctx); blk_free_flush_queue(hctx->fq); @@ -2147,7 +2147,7 @@ static int blk_mq_init_hctx(struct request_queue *q, goto free_fq; if (hctx->flags & BLK_MQ_F_BLOCKING) - init_srcu_struct(hctx->queue_rq_srcu); + init_srcu_struct(hctx->srcu); blk_mq_debugfs_register_hctx(q, hctx); @@ -2436,7 +2436,7 @@ static int blk_mq_hw_ctx_size(struct blk_mq_tag_set *tag_set) { int hw_ctx_size = sizeof(struct blk_mq_hw_ctx); - BUILD_BUG_ON(ALIGN(offsetof(struct blk_mq_hw_ctx, queue_rq_srcu), + BUILD_BUG_ON(ALIGN(offsetof(struct blk_mq_hw_ctx, srcu), __alignof__(struct blk_mq_hw_ctx)) != sizeof(struct blk_mq_hw_ctx)); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 460798d..8efcf49 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -66,7 +66,7 @@ struct blk_mq_hw_ctx { #endif /* Must be the last member - see also blk_mq_hw_ctx_size(). */ - struct srcu_struct queue_rq_srcu[0]; + struct srcu_struct srcu[0]; }; struct blk_mq_tag_set {