From patchwork Tue Jan 9 16:29:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 10152843 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 0869860223 for ; Tue, 9 Jan 2018 16:30:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17F3E28767 for ; Tue, 9 Jan 2018 16:30:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 166302876E; Tue, 9 Jan 2018 16:30:46 +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 8F8632876A for ; Tue, 9 Jan 2018 16:30:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759568AbeAIQa3 (ORCPT ); Tue, 9 Jan 2018 11:30:29 -0500 Received: from mail-qt0-f195.google.com ([209.85.216.195]:42365 "EHLO mail-qt0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759470AbeAIQa0 (ORCPT ); Tue, 9 Jan 2018 11:30:26 -0500 Received: by mail-qt0-f195.google.com with SMTP id g9so18487988qth.9; Tue, 09 Jan 2018 08:30:25 -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=eM9aUujQci0YF7o48IeBYmIse28u0Cnhj6Ctpmx1bRA=; b=FMakfEwi1uQDuSlZBDI/rXbYDVaw1lAB74qxtoX4MMyIrLckb+xJ92/UJb36QyOtM1 E4yDaU9WBnlCZ7bFg2lu3s33JE4mgaR40v2JRbhAah3PEFql3Jky3has1g9IX8fp82ZL vvsQvppMNjVRBMMIjIYi76cv9phV6iaG+gmIr2Nzr8pRYoKig93TwsXR+A0FwfESFDbn ZNkK4BRCyfpDbVnA8U940YkNQyek50qrJWyK3rLgqcOQprtuuFnAGOk6W9fNvNY6iTzi JGaE8KRHWCkfM5T4BlQDT1lkMY4PExyPnRZcJhLLz7/Z1nVRVxFwtNhg1lHYMsBE/8J7 slRw== 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=eM9aUujQci0YF7o48IeBYmIse28u0Cnhj6Ctpmx1bRA=; b=a8vRRUFRaKGuJ52+7+tyervMZQZ+ELiHd5914TMQuMHN6Kei65eIf01B6gREo/NWGd t70XNCPxrokq1bwcnKP+LVPJ7Ehg9czzd1+KHgcrhedrbKKv5PWznB0c9JP/VvrKizUe qX1bDfthSwe7gnMP4182fuY7V2T9t3Ox9w/8Y3IJB5ZMXBHtNsDQ+O0tbqUDmSLChtnN omkzlzWYL8boHvTyHiWn+i3ISrxGGwxjyVvENSsHqQSuu6TwLc91NL1FzaU6fJRISIXL 2iJLIdGyV8lnHiIwuUv7aSqu4qRiwA+HGKrWIgNldpu/CnUISHmN8z2u7uPitj6qTQeN AshA== X-Gm-Message-State: AKwxytfiKyb48epGa+Vn3cedpgI1H2Prtg++76yEKzF+UDrdA4mVUkDB aqCo/N417Kii7yH4dg2P+TQ= X-Google-Smtp-Source: ACJfBovqCF0ocePUTZtkPUUsgYhxCS21WFID8JVk+08ushF/XbGg8L1KJVNrMp//9HAMAOBLI4uPLg== X-Received: by 10.200.58.2 with SMTP id w2mr22935801qte.156.1515515425195; Tue, 09 Jan 2018 08:30:25 -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 s7sm379467qke.4.2018.01.09.08.30.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 08:30:24 -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: Tue, 9 Jan 2018 08:29:53 -0800 Message-Id: <20180109162953.1211451-9-tj@kernel.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180109162953.1211451-1-tj@kernel.org> References: <20180109162953.1211451-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 | 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 e6e74c0..5fb25e6 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) @@ -937,7 +937,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; } @@ -2100,7 +2100,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); @@ -2173,7 +2173,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); @@ -2462,7 +2462,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 {