From: Greg Kroah-Hartman Date: Mon, 18 Dec 2023 11:50:08 +0000 (+0100) Subject: 6.6-stable patches X-Git-Tag: v5.15.144~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=698772ba6a93af47aae6e81b3fb37b6feac1791e;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: rdma-mlx5-change-the-key-being-sent-for-mpv-device-affiliation.patch --- diff --git a/queue-6.6/rdma-mlx5-change-the-key-being-sent-for-mpv-device-affiliation.patch b/queue-6.6/rdma-mlx5-change-the-key-being-sent-for-mpv-device-affiliation.patch new file mode 100644 index 00000000000..6389101efc3 --- /dev/null +++ b/queue-6.6/rdma-mlx5-change-the-key-being-sent-for-mpv-device-affiliation.patch @@ -0,0 +1,37 @@ +From 02e7d139e5e24abb5fde91934fc9dc0344ac1926 Mon Sep 17 00:00:00 2001 +From: Patrisious Haddad +Date: Thu, 19 Oct 2023 11:47:05 +0300 +Subject: RDMA/mlx5: Change the key being sent for MPV device affiliation + +From: Patrisious Haddad + +commit 02e7d139e5e24abb5fde91934fc9dc0344ac1926 upstream. + +Change the key that we send from IB driver to EN driver regarding the +MPV device affiliation, since at that stage the IB device is not yet +initialized, so its index would be zero for different IB devices and +cause wrong associations between unrelated master and slave devices. + +Instead use a unique value from inside the core device which is already +initialized at this stage. + +Fixes: 0d293714ac32 ("RDMA/mlx5: Send events from IB driver about device affiliation state") +Signed-off-by: Patrisious Haddad +Link: https://lore.kernel.org/r/ac7e66357d963fc68d7a419515180212c96d137d.1697705185.git.leon@kernel.org +Signed-off-by: Leon Romanovsky +Signed-off-by: Greg Kroah-Hartman +--- + drivers/infiniband/hw/mlx5/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/infiniband/hw/mlx5/main.c ++++ b/drivers/infiniband/hw/mlx5/main.c +@@ -3263,7 +3263,7 @@ static bool mlx5_ib_bind_slave_port(stru + + mlx5_ib_init_cong_debugfs(ibdev, port_num); + +- key = ibdev->ib_dev.index; ++ key = mpi->mdev->priv.adev_idx; + mlx5_core_mp_event_replay(mpi->mdev, + MLX5_DRIVER_EVENT_AFFILIATION_DONE, + &key); diff --git a/queue-6.6/series b/queue-6.6/series index a65ce66ed12..a9cb91f79b5 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -163,3 +163,4 @@ ring-buffer-fix-a-race-in-rb_time_cmpxchg-for-32-bit-archs.patch ring-buffer-do-not-try-to-put-back-write_stamp.patch ring-buffer-have-rb_time_cmpxchg-set-the-msb-counter-too.patch x86-speculation-objtool-use-absolute-relocations-for-annotations.patch +rdma-mlx5-change-the-key-being-sent-for-mpv-device-affiliation.patch