| Message ID | 20211019061602.3062196-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | [RFC] RDMA/mlx5: fix build error with INFINIBAND_USER_ACCESS=n | expand |
On Tue, Oct 19, 2021 at 08:15:45AM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/infiniband/hw/mlx5/counters.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > Thanks, Acked-by: Leon Romanovsky <leonro@nvidia.com>
On Tue, Oct 19, 2021 at 08:15:45AM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > 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") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Acked-by: Leon Romanovsky <leonro@nvidia.com> > --- > drivers/infiniband/hw/mlx5/counters.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Applied to for-next, thanks Jason
diff --git a/drivers/infiniband/hw/mlx5/counters.c b/drivers/infiniband/hw/mlx5/counters.c index 6f1c4b57110e..945758f39523 100644 --- a/drivers/infiniband/hw/mlx5/counters.c +++ b/drivers/infiniband/hw/mlx5/counters.c @@ -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 = {