On 1/30/20 3:29 AM, Leon Romanovsky wrote: > From: Leon Romanovsky <leonro@xxxxxxxxxxxx> > > Compilation of mlx5 driver without CONFIG_INFINIBAND_USER_ACCESS generates > the following error. > > on x86_64: > > ld: drivers/infiniband/hw/mlx5/main.o: in function `mlx5_ib_handler_MLX5_IB_METHOD_VAR_OBJ_ALLOC': > main.c:(.text+0x186d): undefined reference to `ib_uverbs_get_ucontext_file' > ld: drivers/infiniband/hw/mlx5/main.o:(.rodata+0x2480): undefined reference to `uverbs_idr_class' > ld: drivers/infiniband/hw/mlx5/main.o:(.rodata+0x24d8): undefined reference to `uverbs_destroy_def_handler' > > Guard the problematic code, so VAR objects API won't be compiled without CONFIG_INFINIBAND_USER_ACCESS. > > Fixes: 7be76bef320b ("IB/mlx5: Introduce VAR object and its alloc/destroy methods") > Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> # build-tested Thanks. > --- > drivers/infiniband/hw/mlx5/main.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c > index 41ccc19d229e..c2afe6929cbb 100644 > --- a/drivers/infiniband/hw/mlx5/main.c > +++ b/drivers/infiniband/hw/mlx5/main.c > @@ -2280,15 +2280,6 @@ static int mlx5_ib_mmap_offset(struct mlx5_ib_dev *dev, > return ret; > } > > -static u64 mlx5_entry_to_mmap_offset(struct mlx5_user_mmap_entry *entry) > -{ > - u16 cmd = entry->rdma_entry.start_pgoff >> 16; > - u16 index = entry->rdma_entry.start_pgoff & 0xFFFF; > - > - return (((index >> 8) << 16) | (cmd << MLX5_IB_MMAP_CMD_SHIFT) | > - (index & 0xFF)) << PAGE_SHIFT; > -} > - > static int mlx5_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma) > { > struct mlx5_ib_ucontext *context = to_mucontext(ibcontext); > @@ -6085,6 +6076,16 @@ static void mlx5_ib_cleanup_multiport_master(struct mlx5_ib_dev *dev) > mlx5_nic_vport_disable_roce(dev->mdev); > } > > +#if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS) > +static u64 mlx5_entry_to_mmap_offset(struct mlx5_user_mmap_entry *entry) > +{ > + u16 cmd = entry->rdma_entry.start_pgoff >> 16; > + u16 index = entry->rdma_entry.start_pgoff & 0xFFFF; > + > + return (((index >> 8) << 16) | (cmd << MLX5_IB_MMAP_CMD_SHIFT) | > + (index & 0xFF)) << PAGE_SHIFT; > +} > + > static int var_obj_cleanup(struct ib_uobject *uobject, > enum rdma_remove_reason why, > struct uverbs_attr_bundle *attrs) > @@ -6223,6 +6224,7 @@ static bool var_is_supported(struct ib_device *device) > return (MLX5_CAP_GEN_64(dev->mdev, general_obj_types) & > MLX5_GENERAL_OBJ_TYPES_CAP_VIRTIO_NET_Q); > } > +#endif > > ADD_UVERBS_ATTRIBUTES_SIMPLE( > mlx5_ib_dm, > @@ -6254,8 +6256,10 @@ static const struct uapi_definition mlx5_ib_defs[] = { > UAPI_DEF_CHAIN_OBJ_TREE(UVERBS_OBJECT_FLOW_ACTION, > &mlx5_ib_flow_action), > UAPI_DEF_CHAIN_OBJ_TREE(UVERBS_OBJECT_DM, &mlx5_ib_dm), > +#if IS_ENABLED(CONFIG_INFINIBAND_USER_ACCESS) > UAPI_DEF_CHAIN_OBJ_TREE_NAMED(MLX5_IB_OBJECT_VAR, > UAPI_DEF_IS_OBJ_SUPPORTED(var_is_supported)), > +#endif > {} > }; > > -- > 2.24.1 > -- ~Randy