RDMA/mlx5: fix build error with INFINIBAND_USER_ACCESS=n
authorArnd Bergmann <arnd@arndb.de>
Tue, 19 Oct 2021 06:15:45 +0000 (08:15 +0200)
committerJason Gunthorpe <jgg@nvidia.com>
Mon, 25 Oct 2021 17:16:05 +0000 (14:16 -0300)
The mlx5_ib_fs_add_op_fc/mlx5_ib_fs_remove_op_fc functions are only
available when user access is enabled, without that we run into a link
error:

ERROR: modpost: "mlx5_ib_fs_add_op_fc" [drivers/infiniband/hw/mlx5/mlx5_ib.ko] undefined!
ERROR: modpost: "mlx5_ib_fs_remove_op_fc" [drivers/infiniband/hw/mlx5/mlx5_ib.ko] undefined!

Conditionally compiling the newly added code section makes it build,
though this is probably not a correct fix.

Fixes: a29b934ceb4c ("RDMA/mlx5: Add modify_op_stat() support")
Link: https://lore.kernel.org/r/20211019061602.3062196-1-arnd@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/hw/mlx5/counters.c

index 6f1c4b5..945758f 100644 (file)
@@ -641,9 +641,9 @@ static void mlx5_ib_dealloc_counters(struct mlx5_ib_dev *dev)
                        if (!dev->port[i].cnts.opfcs[j].fc)
                                continue;
 
-                       mlx5_ib_fs_remove_op_fc(dev,
-                                               &dev->port[i].cnts.opfcs[j],
-                                               j);
+                       if (IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS))
+                               mlx5_ib_fs_remove_op_fc(dev,
+                                       &dev->port[i].cnts.opfcs[j], j);
                        mlx5_fc_destroy(dev->mdev,
                                        dev->port[i].cnts.opfcs[j].fc);
                        dev->port[i].cnts.opfcs[j].fc = NULL;
@@ -885,7 +885,8 @@ static const struct ib_device_ops hw_stats_ops = {
        .counter_dealloc = mlx5_ib_counter_dealloc,
        .counter_alloc_stats = mlx5_ib_counter_alloc_stats,
        .counter_update_stats = mlx5_ib_counter_update_stats,
-       .modify_hw_stat = mlx5_ib_modify_stat,
+       .modify_hw_stat = IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS) ?
+                         mlx5_ib_modify_stat : NULL,
 };
 
 static const struct ib_device_ops hw_switchdev_stats_ops = {