RDMA/mlx4: Do not fail the registration on port stats
Subsystems (2)
PATCH 1/1 RDMA/mlx4: Do not fail the registration on port stats
If the FW doesn't support MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT, mlx4 driver will fail the ib_setup_port_attrs, which is called from ib_register_device/enable_device_and_get, in the end leads to device not detected[1][2]
To fix it, add a new mlx4_ib_hw_stats_ops1, w/o alloc_hw_port_stats if FW does not support MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT.
[1] https://bugzilla.redhat.com/show_bug.cgi?id=2014094
[2] https://lore.kernel.org/linux-rdma/CAMGffEn2wvEnmzc0xe=xYiCLqpphiHDBxCxqAELrBofbUAMQxw@mail.gmail.com/T/#t
--- drivers/infiniband/hw/mlx4/main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/infiniband/hw/mlx4/main.c +15 -3
@@ -2217,6 +2217,12 @@ static const struct ib_device_ops mlx4_ib_hw_stats_ops = { .get_hw_stats = mlx4_ib_get_hw_stats, }; + +static const struct ib_device_ops mlx4_ib_hw_stats_ops1 = { + .alloc_hw_device_stats = mlx4_ib_alloc_hw_device_stats, + .get_hw_stats = mlx4_ib_get_hw_stats, +}; +static int mlx4_ib_alloc_diag_counters (struct mlx4_ib_dev *ibdev) {struct mlx4_ib_diag_counters *diag = ibdev->diag_counters;
@@ -2229,9 +2235,15 @@ static int mlx4_ib_alloc_diag_counters(struct mlx4_ib_dev *ibdev)return 0 ;for (i =0 ; i <MLX4_DIAG_COUNTERS_TYPES ; i++) { -/* i == 1 means we are building port counters */ -if (i && !per_port) -continue ; +/* i == 1 means we are building port counters, set a different +* stats ops without port stats callback. +*/ +if (i && !per_port) { +ib_set_device_ops (&ibdev->ib_dev, + &mlx4_ib_hw_stats_ops1); + +return 0 ; + } ret = __mlx4_ib_alloc_diag_counters(ibdev, &diag[i].name, &diag[i].offset,
Signature · 1 line
2.25.1
Quoted 11 lines · Jack Wang
If the FW doesn't support
MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT, mlx4 driver will fail theib_setup_port_attrs, which is called from ib_register_device/enable_device_and_get, in the end leads to device not detected[1][2]To fix it, add a new
mlx4_ib_hw_stats_ops1, w/oalloc_hw_port_statsif FW does not supportMLX4_DEV_CAP_FLAG2_DIAG_PER_PORT.[1] https://bugzilla.redhat.com/show_bug.cgi?id=2014094
[2] https://lore.kernel.org/linux-rdma/CAMGffEn2wvEnmzc0xe=xYiCLqpphiHDBxCxqAELrBofbUAMQxw@mail.gmail.com/T/#t
Quoted 6 lines
Fixes 4b5f4d3fb408 ("RDMA: Split the alloc_hw_stats() ops to port and device variants")Signed-off-by Jack Wang <[email protected]>--- drivers/infiniband/hw/mlx4/main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
Just a nitpick, no need for a blank line between Fixes line and SOB.
Thanks,
Quoted 20 lines · Leon Romanovsky
Quoted 11 lines · Jack Wang
If the FW doesn't support
MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT, mlx4 driver will fail theib_setup_port_attrs, which is called from ib_register_device/enable_device_and_get, in the end leads to device not detected[1][2]To fix it, add a new
mlx4_ib_hw_stats_ops1, w/oalloc_hw_port_statsif FW does not supportMLX4_DEV_CAP_FLAG2_DIAG_PER_PORT.[1] https://bugzilla.redhat.com/show_bug.cgi?id=2014094
[2] https://lore.kernel.org/linux-rdma/CAMGffEn2wvEnmzc0xe=xYiCLqpphiHDBxCxqAELrBofbUAMQxw@mail.gmail.com/T/#tQuoted 6 lines
Fixes 4b5f4d3fb408 ("RDMA: Split the alloc_hw_stats() ops to port and device variants")Signed-off-by Jack Wang <[email protected]>--- drivers/infiniband/hw/mlx4/main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
Quoted 4 lines
Just a nitpick, no need for a blank line between Fixes line and SOB.
Thanks,
Reviewed-by Leon Romanovsky <[email protected]>
Thanks for the review, I will remember not to add the blank line next time.
Quoted 11 lines · Jack Wang
If the FW doesn't support
MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT, mlx4 driver will fail theib_setup_port_attrs, which is called from ib_register_device/enable_device_and_get, in the end leads to device not detected[1][2]To fix it, add a new
mlx4_ib_hw_stats_ops1, w/oalloc_hw_port_statsif FW does not supportMLX4_DEV_CAP_FLAG2_DIAG_PER_PORT.[1] https://bugzilla.redhat.com/show_bug.cgi?id=2014094
[2] https://lore.kernel.org/linux-rdma/CAMGffEn2wvEnmzc0xe=xYiCLqpphiHDBxCxqAELrBofbUAMQxw@mail.gmail.com/T/#t
Quoted 7 lines
Fixes 4b5f4d3fb408 ("RDMA: Split the alloc_hw_stats() ops to port and device variants")Signed-off-by Jack Wang <[email protected]>Reviewed-by Leon Romanovsky <[email protected]>--- drivers/infiniband/hw/mlx4/main.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
Applied to for-rc, thanks
Jason