From patchwork Mon Sep 13 15:12:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 509775 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp654913jao; Mon, 13 Sep 2021 08:17:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyk6Oa8Q/Nssaln4/zJBJNAvNJ92AkHEYmR3CsbssRn4nRu3TLi35bxcUoOc/aPQzRYXShF X-Received: by 2002:aa7:d0c9:: with SMTP id u9mr13507337edo.167.1631546262393; Mon, 13 Sep 2021 08:17:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631546262; cv=none; d=google.com; s=arc-20160816; b=nnt+DZ8AQ2GomgDvYyP5fWnsB9bEAhSfOz9YGWZmifCLHWZiRqmr7VV4PKTMGP1UgP G/UQ790kUbkwHS05QEdsFHJsT3cul6+0lnR/hLpu8x+HDvuywN1dyeTyzg15IMl7WuJB bVxCWP1mDl+D6nZhJlg8zEOo0x6qpXh7KLWPPm3k2FDF5+97J+t+/oVa27v5k8xd+w8t C43Aof2iBqyzLMt1Re4LJXXCpR3spgQmDa0XisOsvYLMWWzm5E3DKoFeyLk2aSpvi0jw EClwFSih0jXLAxlIVQuuCBYBbu35iwwxveXPNz3B6n4wew2g/5peODK3GkRyCnoaZ4az iThw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=g87XVBV5e5D6Xo/92hyeaVaYALMmJj6zkhYadnG4Zoo=; b=phVLO2GFX8g+ScFeZm8jVWmG9v1xyk30DDWiGZ86zuFwFULr8csyKoSyGtsZLUYb8t WfxcU9qEGnWpBOALnkZ0pJE8c9Pq8qbTY4T8eiCSJhF6ePue1dw262EmeWvkxzQKttl8 rbrJ9+lrGRGCZ7KDHh6UsqiZHqKOiAZOFFvkRNrGg5XNT3cuBFKPYus8dBj3rJCZUbM+ f6vf91lXcFpDFZkRuC1Kfqbe6zU33I9TnEX7yhcPh2tCUL082HUXGsxLVHwPfp5e1Hn3 uNYk3iT+/guQq1nD0nncDDTVPbHjCVCRF5A20wZsxdFUn+7YqbKRa8DLgEMQthJmfeTC 1D+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bl4si9658754ejb.689.2021.09.13.08.17.42 for ; Mon, 13 Sep 2021 08:17:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-scsi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-scsi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345587AbhIMPSw (ORCPT ); Mon, 13 Sep 2021 11:18:52 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3774 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345634AbhIMPSn (ORCPT ); Mon, 13 Sep 2021 11:18:43 -0400 Received: from fraeml743-chm.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4H7VQw26n7z684Jd; Mon, 13 Sep 2021 23:15:20 +0800 (CST) Received: from lhreml724-chm.china.huawei.com (10.201.108.75) by fraeml743-chm.china.huawei.com (10.206.15.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Mon, 13 Sep 2021 17:17:26 +0200 Received: from localhost.localdomain (10.69.192.58) by lhreml724-chm.china.huawei.com (10.201.108.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Mon, 13 Sep 2021 16:17:24 +0100 From: John Garry To: CC: , , , , John Garry Subject: [PATCH RESEND v3 02/13] block: Rename BLKDEV_MAX_RQ -> BLKDEV_DEFAULT_RQ Date: Mon, 13 Sep 2021 23:12:19 +0800 Message-ID: <1631545950-56586-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1631545950-56586-1-git-send-email-john.garry@huawei.com> References: <1631545950-56586-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.58] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To lhreml724-chm.china.huawei.com (10.201.108.75) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org It is a bit confusing that there is BLKDEV_MAX_RQ and MAX_SCHED_RQ, as the name BLKDEV_MAX_RQ would imply the max requests always, which it is not. Rename to BLKDEV_MAX_RQ to BLKDEV_DEFAULT_RQ, matching it's usage - that being the default number of requests assigned when allocating a request queue. Signed-off-by: John Garry Reviewed-by: Ming Lei --- block/blk-core.c | 2 +- block/blk-mq-sched.c | 2 +- block/blk-mq-sched.h | 2 +- drivers/block/rbd.c | 2 +- include/linux/blkdev.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.26.2 Reviewed-by: Hannes Reinecke diff --git a/block/blk-core.c b/block/blk-core.c index 5454db2fa263..5d7137bec48e 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -568,7 +568,7 @@ struct request_queue *blk_alloc_queue(int node_id) blk_queue_dma_alignment(q, 511); blk_set_default_limits(&q->limits); - q->nr_requests = BLKDEV_MAX_RQ; + q->nr_requests = BLKDEV_DEFAULT_RQ; return q; diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 0f006cabfd91..2231fb0d4c35 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c @@ -606,7 +606,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) * Additionally, this is a per-hw queue depth. */ q->nr_requests = 2 * min_t(unsigned int, q->tag_set->queue_depth, - BLKDEV_MAX_RQ); + BLKDEV_DEFAULT_RQ); queue_for_each_hw_ctx(q, hctx, i) { ret = blk_mq_sched_alloc_tags(q, hctx, i); diff --git a/block/blk-mq-sched.h b/block/blk-mq-sched.h index 5246ae040704..1e46be6c5178 100644 --- a/block/blk-mq-sched.h +++ b/block/blk-mq-sched.h @@ -5,7 +5,7 @@ #include "blk-mq.h" #include "blk-mq-tag.h" -#define MAX_SCHED_RQ (16 * BLKDEV_MAX_RQ) +#define MAX_SCHED_RQ (16 * BLKDEV_DEFAULT_RQ) void blk_mq_sched_assign_ioc(struct request *rq); diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index e65c9d706f6f..bf60aebd0cfb 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -836,7 +836,7 @@ struct rbd_options { u32 alloc_hint_flags; /* CEPH_OSD_OP_ALLOC_HINT_FLAG_* */ }; -#define RBD_QUEUE_DEPTH_DEFAULT BLKDEV_MAX_RQ +#define RBD_QUEUE_DEPTH_DEFAULT BLKDEV_DEFAULT_RQ #define RBD_ALLOC_SIZE_DEFAULT (64 * 1024) #define RBD_LOCK_TIMEOUT_DEFAULT 0 /* no timeout */ #define RBD_READ_ONLY_DEFAULT false diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 12b9dbcc980e..4baf9435232d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -40,7 +40,7 @@ struct blk_stat_callback; struct blk_keyslot_manager; #define BLKDEV_MIN_RQ 4 -#define BLKDEV_MAX_RQ 128 /* Default maximum */ +#define BLKDEV_DEFAULT_RQ 128 /* Must be consistent with blk_mq_poll_stats_bkt() */ #define BLK_MQ_POLL_STATS_BKTS 16