Unverified Commit 2aaaee0c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14535 RDMA/mlx5: Move events notifier registration to be after device registration 

Merge Pull Request from: @ci-robot 
 
PR sync from: Pu Lehui <pulehui@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ACWO4W42ZCHGIA3SOUJCYRO5SOQMGWHF/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBEADY 
 
Link:https://gitee.com/openeuler/kernel/pulls/14535

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents d0bc137f 49f2efce

drivers/infiniband/hw/mlx5/main.c

+19 −16
Original line number Diff line number Diff line
@@ -3045,7 +3045,6 @@ static int mlx5_ib_dev_res_init(struct mlx5_ib_dev *dev) 
	struct ib_srq_init_attr attr;

	struct ib_device *ibdev;

	struct ib_cq_init_attr cq_attr = {.cqe = 1};

	int port;

	int ret = 0;



	ibdev = &dev->ib_dev;
@@ -3134,10 +3133,6 @@ static int mlx5_ib_dev_res_init(struct mlx5_ib_dev *dev) 
	atomic_inc(&devr->p0->usecnt);

	atomic_set(&devr->s1->usecnt, 0);



	for (port = 0; port < ARRAY_SIZE(devr->ports); ++port)

		INIT_WORK(&devr->ports[port].pkey_change_work,

			  pkey_change_handler);



	return 0;



error6:
@@ -3164,7 +3159,6 @@ static int mlx5_ib_dev_res_init(struct mlx5_ib_dev *dev) 
static void mlx5_ib_dev_res_cleanup(struct mlx5_ib_dev *dev)

{

	struct mlx5_ib_resources *devr = &dev->devr;

	int port;



	mlx5_ib_destroy_srq(devr->s1, NULL);

	kfree(devr->s1);
@@ -3176,10 +3170,6 @@ static void mlx5_ib_dev_res_cleanup(struct mlx5_ib_dev *dev) 
	kfree(devr->c0);

	mlx5_ib_dealloc_pd(devr->p0, NULL);

	kfree(devr->p0);



	/* Make sure no change P_Key work items are still executing */

	for (port = 0; port < ARRAY_SIZE(devr->ports); ++port)

		cancel_work_sync(&devr->ports[port].pkey_change_work);

}



static u32 get_core_cap_flags(struct ib_device *ibdev,
@@ -4578,6 +4568,13 @@ static void mlx5_ib_stage_delay_drop_cleanup(struct mlx5_ib_dev *dev) 


static int mlx5_ib_stage_dev_notifier_init(struct mlx5_ib_dev *dev)

{

	struct mlx5_ib_resources *devr = &dev->devr;

	int port;



	for (port = 0; port < ARRAY_SIZE(devr->ports); ++port)

		INIT_WORK(&devr->ports[port].pkey_change_work,

			  pkey_change_handler);



	dev->mdev_events.notifier_call = mlx5_ib_event;

	mlx5_notifier_register(dev->mdev, &dev->mdev_events);

	return 0;
@@ -4585,7 +4582,13 @@ static int mlx5_ib_stage_dev_notifier_init(struct mlx5_ib_dev *dev) 


static void mlx5_ib_stage_dev_notifier_cleanup(struct mlx5_ib_dev *dev)

{

	struct mlx5_ib_resources *devr = &dev->devr;

	int port;



	mlx5_notifier_unregister(dev->mdev, &dev->mdev_events);



	for (port = 0; port < ARRAY_SIZE(devr->ports); ++port)

		cancel_work_sync(&devr->ports[port].pkey_change_work);

}



void __mlx5_ib_remove(struct mlx5_ib_dev *dev,
@@ -4656,9 +4659,6 @@ static const struct mlx5_ib_profile pf_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_dev_res_init,

		     mlx5_ib_dev_res_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,

		     mlx5_ib_stage_dev_notifier_init,

		     mlx5_ib_stage_dev_notifier_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_ODP,

		     mlx5_ib_odp_init_one,

		     mlx5_ib_odp_cleanup_one),
@@ -4683,6 +4683,9 @@ static const struct mlx5_ib_profile pf_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_IB_REG,

		     mlx5_ib_stage_ib_reg_init,

		     mlx5_ib_stage_ib_reg_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,

		     mlx5_ib_stage_dev_notifier_init,

		     mlx5_ib_stage_dev_notifier_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_POST_IB_REG_UMR,

		     mlx5_ib_stage_post_ib_reg_umr_init,

		     NULL),
@@ -4719,9 +4722,6 @@ const struct mlx5_ib_profile raw_eth_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,

		     mlx5_ib_dev_res_init,

		     mlx5_ib_dev_res_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,

		     mlx5_ib_stage_dev_notifier_init,

		     mlx5_ib_stage_dev_notifier_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_COUNTERS,

		     mlx5_ib_counters_init,

		     mlx5_ib_counters_cleanup),
@@ -4743,6 +4743,9 @@ const struct mlx5_ib_profile raw_eth_profile = { 
	STAGE_CREATE(MLX5_IB_STAGE_IB_REG,

		     mlx5_ib_stage_ib_reg_init,

		     mlx5_ib_stage_ib_reg_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,

		     mlx5_ib_stage_dev_notifier_init,

		     mlx5_ib_stage_dev_notifier_cleanup),

	STAGE_CREATE(MLX5_IB_STAGE_POST_IB_REG_UMR,

		     mlx5_ib_stage_post_ib_reg_umr_init,

		     NULL),

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,6 @@ enum mlx5_ib_stages { 
	MLX5_IB_STAGE_QP,

	MLX5_IB_STAGE_SRQ,

	MLX5_IB_STAGE_DEVICE_RESOURCES,

	MLX5_IB_STAGE_DEVICE_NOTIFIER,

	MLX5_IB_STAGE_ODP,

	MLX5_IB_STAGE_COUNTERS,

	MLX5_IB_STAGE_CONG_DEBUGFS,
@@ -835,6 +834,7 @@ enum mlx5_ib_stages { 
	MLX5_IB_STAGE_PRE_IB_REG_UMR,

	MLX5_IB_STAGE_WHITELIST_UID,

	MLX5_IB_STAGE_IB_REG,

	MLX5_IB_STAGE_DEVICE_NOTIFIER,

	MLX5_IB_STAGE_POST_IB_REG_UMR,

	MLX5_IB_STAGE_DELAY_DROP,

	MLX5_IB_STAGE_RESTRACK,