Skip to content

Commit ede132a

Browse files
PatrisiousHaddadrleon
authored andcommitted
RDMA/mlx5: Move events notifier registration to be after device registration
Move pkey change work initialization and cleanup from device resources stage to notifier stage, since this is the stage which handles this work events. Fix a race between the device deregistration and pkey change work by moving MLX5_IB_STAGE_DEVICE_NOTIFIER to be after MLX5_IB_STAGE_IB_REG in order to ensure that the notifier is deregistered before the device during cleanup. Which ensures there are no works that are being executed after the device has already unregistered which can cause the panic below. BUG: kernel NULL pointer dereference, address: 0000000000000000 PGD 0 P4D 0 Oops: 0000 [#1] PREEMPT SMP PTI CPU: 1 PID: 630071 Comm: kworker/1:2 Kdump: loaded Tainted: G W OE --------- --- 5.14.0-162.6.1.el9_1.x86_64 #1 Hardware name: Microsoft Corporation Virtual Machine/Virtual Machine, BIOS 090008 02/27/2023 Workqueue: events pkey_change_handler [mlx5_ib] RIP: 0010:setup_qp+0x38/0x1f0 [mlx5_ib] Code: ee 41 54 45 31 e4 55 89 f5 53 48 89 fb 48 83 ec 20 8b 77 08 65 48 8b 04 25 28 00 00 00 48 89 44 24 18 48 8b 07 48 8d 4c 24 16 <4c> 8b 38 49 8b 87 80 0b 00 00 4c 89 ff 48 8b 80 08 05 00 00 8b 40 RSP: 0018:ffffbcc54068be20 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffff954054494128 RCX: ffffbcc54068be36 RDX: ffff954004934000 RSI: 0000000000000001 RDI: ffff954054494128 RBP: 0000000000000023 R08: ffff954001be2c20 R09: 0000000000000001 R10: ffff954001be2c20 R11: ffff9540260133c0 R12: 0000000000000000 R13: 0000000000000023 R14: 0000000000000000 R15: ffff9540ffcb0905 FS: 0000000000000000(0000) GS:ffff9540ffc80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 000000010625c001 CR4: 00000000003706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: mlx5_ib_gsi_pkey_change+0x20/0x40 [mlx5_ib] process_one_work+0x1e8/0x3c0 worker_thread+0x50/0x3b0 ? rescuer_thread+0x380/0x380 kthread+0x149/0x170 ? set_kthread_struct+0x50/0x50 ret_from_fork+0x22/0x30 Modules linked in: rdma_ucm(OE) rdma_cm(OE) iw_cm(OE) ib_ipoib(OE) ib_cm(OE) ib_umad(OE) mlx5_ib(OE) mlx5_fwctl(OE) fwctl(OE) ib_uverbs(OE) mlx5_core(OE) mlxdevm(OE) ib_core(OE) mlx_compat(OE) psample mlxfw(OE) tls knem(OE) netconsole nfsv3 nfs_acl nfs lockd grace fscache netfs qrtr rfkill sunrpc intel_rapl_msr intel_rapl_common rapl hv_balloon hv_utils i2c_piix4 pcspkr joydev fuse ext4 mbcache jbd2 sr_mod sd_mod cdrom t10_pi sg ata_generic pci_hyperv pci_hyperv_intf hyperv_drm drm_shmem_helper drm_kms_helper hv_storvsc syscopyarea hv_netvsc sysfillrect sysimgblt hid_hyperv fb_sys_fops scsi_transport_fc hyperv_keyboard drm ata_piix crct10dif_pclmul crc32_pclmul crc32c_intel libata ghash_clmulni_intel hv_vmbus serio_raw [last unloaded: ib_core] CR2: 0000000000000000 ---[ end trace f6f8be4eae12f7bc ]--- Fixes: 7722f47 ("IB/mlx5: Create GSI transmission QPs when P_Key table is changed") Signed-off-by: Patrisious Haddad <[email protected]> Reviewed-by: Michael Guralnik <[email protected]> Link: https://patch.msgid.link/d271ceeff0c08431b3cbbbb3e2d416f09b6d1621.1731496944.git.leon@kernel.org Signed-off-by: Leon Romanovsky <[email protected]>
1 parent 31bad59 commit ede132a

File tree

2 files changed

+20
-22
lines changed

2 files changed

+20
-22
lines changed

drivers/infiniband/hw/mlx5/main.c

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3005,7 +3005,6 @@ int mlx5_ib_dev_res_srq_init(struct mlx5_ib_dev *dev)
30053005
static int mlx5_ib_dev_res_init(struct mlx5_ib_dev *dev)
30063006
{
30073007
struct mlx5_ib_resources *devr = &dev->devr;
3008-
int port;
30093008
int ret;
30103009

30113010
if (!MLX5_CAP_GEN(dev->mdev, xrc))
@@ -3021,10 +3020,6 @@ static int mlx5_ib_dev_res_init(struct mlx5_ib_dev *dev)
30213020
return ret;
30223021
}
30233022

3024-
for (port = 0; port < ARRAY_SIZE(devr->ports); ++port)
3025-
INIT_WORK(&devr->ports[port].pkey_change_work,
3026-
pkey_change_handler);
3027-
30283023
mutex_init(&devr->cq_lock);
30293024
mutex_init(&devr->srq_lock);
30303025

@@ -3034,16 +3029,6 @@ static int mlx5_ib_dev_res_init(struct mlx5_ib_dev *dev)
30343029
static void mlx5_ib_dev_res_cleanup(struct mlx5_ib_dev *dev)
30353030
{
30363031
struct mlx5_ib_resources *devr = &dev->devr;
3037-
int port;
3038-
3039-
/*
3040-
* Make sure no change P_Key work items are still executing.
3041-
*
3042-
* At this stage, the mlx5_ib_event should be unregistered
3043-
* and it ensures that no new works are added.
3044-
*/
3045-
for (port = 0; port < ARRAY_SIZE(devr->ports); ++port)
3046-
cancel_work_sync(&devr->ports[port].pkey_change_work);
30473032

30483033
/* After s0/s1 init, they are not unset during the device lifetime. */
30493034
if (devr->s1) {
@@ -4480,6 +4465,13 @@ static void mlx5_ib_stage_delay_drop_cleanup(struct mlx5_ib_dev *dev)
44804465

44814466
static int mlx5_ib_stage_dev_notifier_init(struct mlx5_ib_dev *dev)
44824467
{
4468+
struct mlx5_ib_resources *devr = &dev->devr;
4469+
int port;
4470+
4471+
for (port = 0; port < ARRAY_SIZE(devr->ports); ++port)
4472+
INIT_WORK(&devr->ports[port].pkey_change_work,
4473+
pkey_change_handler);
4474+
44834475
dev->mdev_events.notifier_call = mlx5_ib_event;
44844476
mlx5_notifier_register(dev->mdev, &dev->mdev_events);
44854477

@@ -4490,8 +4482,14 @@ static int mlx5_ib_stage_dev_notifier_init(struct mlx5_ib_dev *dev)
44904482

44914483
static void mlx5_ib_stage_dev_notifier_cleanup(struct mlx5_ib_dev *dev)
44924484
{
4485+
struct mlx5_ib_resources *devr = &dev->devr;
4486+
int port;
4487+
44934488
mlx5r_macsec_event_unregister(dev);
44944489
mlx5_notifier_unregister(dev->mdev, &dev->mdev_events);
4490+
4491+
for (port = 0; port < ARRAY_SIZE(devr->ports); ++port)
4492+
cancel_work_sync(&devr->ports[port].pkey_change_work);
44954493
}
44964494

44974495
void mlx5_ib_data_direct_bind(struct mlx5_ib_dev *ibdev,
@@ -4581,9 +4579,6 @@ static const struct mlx5_ib_profile pf_profile = {
45814579
STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,
45824580
mlx5_ib_dev_res_init,
45834581
mlx5_ib_dev_res_cleanup),
4584-
STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,
4585-
mlx5_ib_stage_dev_notifier_init,
4586-
mlx5_ib_stage_dev_notifier_cleanup),
45874582
STAGE_CREATE(MLX5_IB_STAGE_ODP,
45884583
mlx5_ib_odp_init_one,
45894584
mlx5_ib_odp_cleanup_one),
@@ -4608,6 +4603,9 @@ static const struct mlx5_ib_profile pf_profile = {
46084603
STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
46094604
mlx5_ib_stage_ib_reg_init,
46104605
mlx5_ib_stage_ib_reg_cleanup),
4606+
STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,
4607+
mlx5_ib_stage_dev_notifier_init,
4608+
mlx5_ib_stage_dev_notifier_cleanup),
46114609
STAGE_CREATE(MLX5_IB_STAGE_POST_IB_REG_UMR,
46124610
mlx5_ib_stage_post_ib_reg_umr_init,
46134611
NULL),
@@ -4644,9 +4642,6 @@ const struct mlx5_ib_profile raw_eth_profile = {
46444642
STAGE_CREATE(MLX5_IB_STAGE_DEVICE_RESOURCES,
46454643
mlx5_ib_dev_res_init,
46464644
mlx5_ib_dev_res_cleanup),
4647-
STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,
4648-
mlx5_ib_stage_dev_notifier_init,
4649-
mlx5_ib_stage_dev_notifier_cleanup),
46504645
STAGE_CREATE(MLX5_IB_STAGE_COUNTERS,
46514646
mlx5_ib_counters_init,
46524647
mlx5_ib_counters_cleanup),
@@ -4668,6 +4663,9 @@ const struct mlx5_ib_profile raw_eth_profile = {
46684663
STAGE_CREATE(MLX5_IB_STAGE_IB_REG,
46694664
mlx5_ib_stage_ib_reg_init,
46704665
mlx5_ib_stage_ib_reg_cleanup),
4666+
STAGE_CREATE(MLX5_IB_STAGE_DEVICE_NOTIFIER,
4667+
mlx5_ib_stage_dev_notifier_init,
4668+
mlx5_ib_stage_dev_notifier_cleanup),
46714669
STAGE_CREATE(MLX5_IB_STAGE_POST_IB_REG_UMR,
46724670
mlx5_ib_stage_post_ib_reg_umr_init,
46734671
NULL),

drivers/infiniband/hw/mlx5/mlx5_ib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,6 @@ enum mlx5_ib_stages {
973973
MLX5_IB_STAGE_QP,
974974
MLX5_IB_STAGE_SRQ,
975975
MLX5_IB_STAGE_DEVICE_RESOURCES,
976-
MLX5_IB_STAGE_DEVICE_NOTIFIER,
977976
MLX5_IB_STAGE_ODP,
978977
MLX5_IB_STAGE_COUNTERS,
979978
MLX5_IB_STAGE_CONG_DEBUGFS,
@@ -982,6 +981,7 @@ enum mlx5_ib_stages {
982981
MLX5_IB_STAGE_PRE_IB_REG_UMR,
983982
MLX5_IB_STAGE_WHITELIST_UID,
984983
MLX5_IB_STAGE_IB_REG,
984+
MLX5_IB_STAGE_DEVICE_NOTIFIER,
985985
MLX5_IB_STAGE_POST_IB_REG_UMR,
986986
MLX5_IB_STAGE_DELAY_DROP,
987987
MLX5_IB_STAGE_RESTRACK,

0 commit comments

Comments
 (0)