Commit 04ba1e6a authored by Ming Lei's avatar Ming Lei Committed by Wen Zhiwei
Browse files

blk-mq: register cpuhp callback after hctx is added to xarray table 

stable inclusion
from stable-v6.6.69
commit 079fcc926b0bf5c0d2169f67254d43c8bfdcb054
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBNEPJ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=079fcc926b0bf5c0d2169f67254d43c8bfdcb054



--------------------------------

[ Upstream commit 4bf485a7db5d82ddd0f3ad2b299893199090375e ]

We need to retrieve 'hctx' from xarray table in the cpuhp callback, so the
callback should be registered after this 'hctx' is added to xarray table.

Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Peter Newman <peternewman@google.com>
Cc: Babu Moger <babu.moger@amd.com>
Cc: Luck Tony <tony.luck@intel.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Tested-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20241206111611.978870-2-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 43ea7095

block/blk-mq.c

+7 −8
Original line number Diff line number Diff line
@@ -3771,16 +3771,11 @@ static int blk_mq_init_hctx(struct request_queue *q, 
{

	hctx->queue_num = hctx_idx;



	if (!(hctx->flags & BLK_MQ_F_STACKING))

		cpuhp_state_add_instance_nocalls(CPUHP_AP_BLK_MQ_ONLINE,

				&hctx->cpuhp_online);

	cpuhp_state_add_instance_nocalls(CPUHP_BLK_MQ_DEAD, &hctx->cpuhp_dead);



	hctx->tags = set->tags[hctx_idx];



	if (set->ops->init_hctx &&

	    set->ops->init_hctx(hctx, set->driver_data, hctx_idx))

		goto unregister_cpu_notifier;

		goto fail;



	if (blk_mq_init_request(set, hctx->fq->flush_rq, hctx_idx,

				hctx->numa_node))
@@ -3789,6 +3784,11 @@ static int blk_mq_init_hctx(struct request_queue *q, 
	if (xa_insert(&q->hctx_table, hctx_idx, hctx, GFP_KERNEL))

		goto exit_flush_rq;



	if (!(hctx->flags & BLK_MQ_F_STACKING))

		cpuhp_state_add_instance_nocalls(CPUHP_AP_BLK_MQ_ONLINE,

				&hctx->cpuhp_online);

	cpuhp_state_add_instance_nocalls(CPUHP_BLK_MQ_DEAD, &hctx->cpuhp_dead);



	return 0;



 exit_flush_rq:
@@ -3797,8 +3797,7 @@ static int blk_mq_init_hctx(struct request_queue *q, 
 exit_hctx:

	if (set->ops->exit_hctx)

		set->ops->exit_hctx(hctx, hctx_idx);

 unregister_cpu_notifier:

	blk_mq_remove_cpuhp(hctx);

 fail:

	return -1;

}