From patchwork Mon Jan 8 19:15:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 10150393 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 92374601A1 for ; Mon, 8 Jan 2018 19:16:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B35928639 for ; Mon, 8 Jan 2018 19:16:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8FD5028688; Mon, 8 Jan 2018 19:16:33 +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 21CC728687 for ; Mon, 8 Jan 2018 19:16:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932562AbeAHTQS (ORCPT ); Mon, 8 Jan 2018 14:16:18 -0500 Received: from mail-qt0-f193.google.com ([209.85.216.193]:46435 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932506AbeAHTQQ (ORCPT ); Mon, 8 Jan 2018 14:16:16 -0500 Received: by mail-qt0-f193.google.com with SMTP id r39so14938164qtr.13; Mon, 08 Jan 2018 11:16:16 -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=cvTeqxdvZslMFmCAbxdrw79jy6G2056NGPHXeVlaCpI=; b=t3bciSh4EnMH3fYA96WHiprqS5hcF5mGwzKE5Nwr5N4OGtpmV08+aItCONWDCL2w2b kW48a7LQngrI9tyUS8alZkDnYZPNI3aGREdBGsGwkK63Joc0pqkKitkTLJxRDAV7GMZn laOa1Vg0iMcXNIzwL6LqK0hiZzHhJpvN9TVeJgwUxfDuVUEdCCBx5ied3c3T7AQe9mjV SoBgQlYpbVF9Y073ZfI8wtaUIFBcDX5ccsQumarh8JGQd6A/nO32+Aiw2WjxROpwT4PZ BlA6mV5/J5B3PX+wY3VI6dttTPfDW5bLfDbJrxFdQdReH/04uyVsVjctHjzfysQzWrNP Poog== 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=cvTeqxdvZslMFmCAbxdrw79jy6G2056NGPHXeVlaCpI=; b=H5SuQbjHtzXpXjtOL1ipH7HW3I06Ve74Wv8l9d1HCrj+tnQRVjKVmjaNP5hbpkTK60 36R8Cn/h4ZR/xNKjvRigKRD9SRGxNEYeKZUTFBjBJQXXNG9GMFOW3bKTeSEyZ6gYX2j+ CTyu67tvhBTfN31WZmTmUeb89HwWhMZwOkeTAMuTYGaerskZEgA2JvVLmZAHj5J9+TUO vCbMhToHCO0utirmXZJZ91v7uvhf3LCJ+RQ2AVHIrybTAt71kOLm18HupH1IWyyL4j5V f5X6IysLpac3dC9N1P89Q1K/BEUM08EhWjKevzsN+KqFHotR6FlyjS/c1B2d3mgp4tdj RHpQ== X-Gm-Message-State: AKwxytcHfvPxs+BZczRD+i0lrCZGt60tETeVcfBs4ywwJK1gu0rTqI9T KqObe/yDQEfNtp++WPhAU9owlmHI X-Google-Smtp-Source: ACJfBot3JVOrFI3RuhHHETTrUhVHDrXWfkO7oRMt1t+oTEBuLdWM15BqRjUFvmJHeTfgdXhhQmeozA== X-Received: by 10.237.38.229 with SMTP id q92mr18363738qtd.310.1515438975742; Mon, 08 Jan 2018 11:16:15 -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 d67sm8155991qkc.25.2018.01.08.11.16.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 11:16:15 -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 8/8] blk-mq: rename blk_mq_hw_ctx->queue_rq_srcu to ->srcu Date: Mon, 8 Jan 2018 11:15:42 -0800 Message-Id: <20180108191542.379478-9-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 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 Reviewed-by: Bart Van Assche --- block/blk-mq.c | 14 +++++++------- include/linux/blk-mq.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 54ecb2c..071f396 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; } @@ -564,7 +564,7 @@ static void hctx_unlock(struct blk_mq_hw_ctx *hctx, int srcu_idx) if (!(hctx->flags & BLK_MQ_F_BLOCKING)) rcu_read_unlock(); else - srcu_read_unlock(hctx->queue_rq_srcu, srcu_idx); + srcu_read_unlock(hctx->srcu, srcu_idx); } static void hctx_lock(struct blk_mq_hw_ctx *hctx, int *srcu_idx) @@ -572,7 +572,7 @@ static void hctx_lock(struct blk_mq_hw_ctx *hctx, int *srcu_idx) if (!(hctx->flags & BLK_MQ_F_BLOCKING)) rcu_read_lock(); else - *srcu_idx = srcu_read_lock(hctx->queue_rq_srcu); + *srcu_idx = srcu_read_lock(hctx->srcu); } static void blk_mq_rq_update_aborted_gstate(struct request *rq, u64 gstate) @@ -931,7 +931,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; } @@ -2094,7 +2094,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); @@ -2167,7 +2167,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); @@ -2456,7 +2456,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 {