From nobody Tue Feb 10 01:16:29 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D28B02571D4; Sun, 16 Nov 2025 04:10:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763266240; cv=none; b=JT4ODMWAAotw8eEqK6IXzpz5YCZgIENKkFUNdKkYWOy1dLip6ygBYcAMP+wj9ewX7ufhylOkLSek4wYiBs4mhLO5Bm1X2gt0RGfKV64XDeAkyL0boHcLHq4ujQRKSv08BrsrPqbY6IJBSC6EsPqDJZBagW2y0/ONf6cTUIapIsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763266240; c=relaxed/simple; bh=bp2OCGjuLR9VSuQ6uIMPbUSycqO5C4T7uB7lILXZWMs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L/LzAb9OckM8Pa/Ns3640jdpyNZka3kO6bOTTxJzq0ibYaCL0ymuUy00+hXkOkNgXE635cpum+lOLPbowM4Qht77M7SgUbuCOKNVLmfilzu3rcWMaWsGUjvDQVnEqQK0rTtmHwQzQ845rgiEBumV+qTkQxucQymUqF0KqAuWoso= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A67A4C4CEFB; Sun, 16 Nov 2025 04:10:38 +0000 (UTC) From: Yu Kuai To: axboe@kernel.dk, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, tj@kernel.org, nilay@linux.ibm.com, ming.lei@redhat.com Cc: yukuai@fnnas.com Subject: [PATCH RESEND 5/5] block/blk-rq-qos: cleanup rq_qos_add() Date: Sun, 16 Nov 2025 12:10:24 +0800 Message-ID: <20251116041024.120500-6-yukuai@fnnas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251116041024.120500-1-yukuai@fnnas.com> References: <20251116041024.120500-1-yukuai@fnnas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now that there is no caller of rq_qos_add(), remove it, and also rename rq_qos_add_freezed() back to rq_qos_add(). Signed-off-by: Yu Kuai Reviewed-by: Nilay Shroff --- block/blk-iocost.c | 2 +- block/blk-iolatency.c | 4 ++-- block/blk-rq-qos.c | 42 ++---------------------------------------- block/blk-rq-qos.h | 6 ++---- block/blk-wbt.c | 2 +- 5 files changed, 8 insertions(+), 48 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 233c9749bfc9..0948f628386f 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -2927,7 +2927,7 @@ static int blk_iocost_init(struct gendisk *disk) * called before policy activation completion, can't assume that the * target bio has an iocg associated and need to test for NULL iocg. */ - ret =3D rq_qos_add_freezed(&ioc->rqos, disk, RQ_QOS_COST, &ioc_rqos_ops); + ret =3D rq_qos_add(&ioc->rqos, disk, RQ_QOS_COST, &ioc_rqos_ops); if (ret) goto err_free_ioc; =20 diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index 1565352b176d..5b18125e21c9 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -764,8 +764,8 @@ static int blk_iolatency_init(struct gendisk *disk) if (!blkiolat) return -ENOMEM; =20 - ret =3D rq_qos_add_freezed(&blkiolat->rqos, disk, RQ_QOS_LATENCY, - &blkcg_iolatency_ops); + ret =3D rq_qos_add(&blkiolat->rqos, disk, RQ_QOS_LATENCY, + &blkcg_iolatency_ops); if (ret) goto err_free; ret =3D blkcg_activate_policy(disk, &blkcg_policy_iolatency); diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c index 353397d7e126..3a49af00b738 100644 --- a/block/blk-rq-qos.c +++ b/block/blk-rq-qos.c @@ -322,8 +322,8 @@ void rq_qos_exit(struct request_queue *q) mutex_unlock(&q->rq_qos_mutex); } =20 -int rq_qos_add_freezed(struct rq_qos *rqos, struct gendisk *disk, - enum rq_qos_id id, const struct rq_qos_ops *ops) +int rq_qos_add(struct rq_qos *rqos, struct gendisk *disk, + enum rq_qos_id id, const struct rq_qos_ops *ops) { struct request_queue *q =3D disk->queue; =20 @@ -349,44 +349,6 @@ int rq_qos_add_freezed(struct rq_qos *rqos, struct gen= disk *disk, return 0; } =20 -int rq_qos_add(struct rq_qos *rqos, struct gendisk *disk, enum rq_qos_id i= d, - const struct rq_qos_ops *ops) -{ - struct request_queue *q =3D disk->queue; - unsigned int memflags; - - lockdep_assert_held(&q->rq_qos_mutex); - - rqos->disk =3D disk; - rqos->id =3D id; - rqos->ops =3D ops; - - /* - * No IO can be in-flight when adding rqos, so freeze queue, which - * is fine since we only support rq_qos for blk-mq queue. - */ - memflags =3D blk_mq_freeze_queue(q); - - if (rq_qos_id(q, rqos->id)) - goto ebusy; - rqos->next =3D q->rq_qos; - q->rq_qos =3D rqos; - blk_queue_flag_set(QUEUE_FLAG_QOS_ENABLED, q); - - blk_mq_unfreeze_queue(q, memflags); - - if (rqos->ops->debugfs_attrs) { - mutex_lock(&q->debugfs_mutex); - blk_mq_debugfs_register_rqos(rqos); - mutex_unlock(&q->debugfs_mutex); - } - - return 0; -ebusy: - blk_mq_unfreeze_queue(q, memflags); - return -EBUSY; -} - void rq_qos_del(struct rq_qos *rqos) { struct request_queue *q =3D rqos->disk->queue; diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index 4a7fec01600b..8bbf178c16b0 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -85,10 +85,8 @@ static inline void rq_wait_init(struct rq_wait *rq_wait) init_waitqueue_head(&rq_wait->wait); } =20 -int rq_qos_add(struct rq_qos *rqos, struct gendisk *disk, enum rq_qos_id i= d, - const struct rq_qos_ops *ops); -int rq_qos_add_freezed(struct rq_qos *rqos, struct gendisk *disk, - enum rq_qos_id id, const struct rq_qos_ops *ops); +int rq_qos_add(struct rq_qos *rqos, struct gendisk *disk, + enum rq_qos_id id, const struct rq_qos_ops *ops); void rq_qos_del(struct rq_qos *rqos); =20 typedef bool (acquire_inflight_cb_t)(struct rq_wait *rqw, void *private_da= ta); diff --git a/block/blk-wbt.c b/block/blk-wbt.c index a784f6d338b4..d7f1e6ba1790 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -926,7 +926,7 @@ int wbt_init(struct gendisk *disk) * Assign rwb and add the stats callback. */ mutex_lock(&q->rq_qos_mutex); - ret =3D rq_qos_add_freezed(&rwb->rqos, disk, RQ_QOS_WBT, &wbt_rqos_ops); + ret =3D rq_qos_add(&rwb->rqos, disk, RQ_QOS_WBT, &wbt_rqos_ops); mutex_unlock(&q->rq_qos_mutex); if (ret) goto err_free; --=20 2.51.0