Commit e502b8b0 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/core: Don't depend device ODP capabilities on kconfig option 



Device capability bits are exposing what specific device supports from HW
perspective. Those bits are not dependent on kernel configurations and
RDMA/core should ensure that proper interfaces to users will be disabled
if CONFIG_INFINIBAND_ON_DEMAND_PAGING is not set.

Fixes: f4056bfd ("IB/core: Add on demand paging caps to ib_uverbs_ex_query_device")
Fixes: 8cdd312c ("IB/mlx5: Implement the ODP capability query verb")
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 96f87ee1

drivers/infiniband/core/uverbs_cmd.c

+0 −2
Original line number Diff line number Diff line
@@ -3609,7 +3609,6 @@ static int ib_uverbs_ex_query_device(struct uverbs_attr_bundle *attrs) 


	copy_query_dev_fields(ucontext, &resp.base, &attr);



#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING

	resp.odp_caps.general_caps = attr.odp_caps.general_caps;

	resp.odp_caps.per_transport_caps.rc_odp_caps =

		attr.odp_caps.per_transport_caps.rc_odp_caps;
@@ -3617,7 +3616,6 @@ static int ib_uverbs_ex_query_device(struct uverbs_attr_bundle *attrs) 
		attr.odp_caps.per_transport_caps.uc_odp_caps;

	resp.odp_caps.per_transport_caps.ud_odp_caps =

		attr.odp_caps.per_transport_caps.ud_odp_caps;

#endif



	resp.timestamp_mask = attr.timestamp_mask;

	resp.hca_core_clock = attr.hca_core_clock;

drivers/infiniband/hw/mlx5/main.c

+5 −5
Original line number Diff line number Diff line
@@ -923,11 +923,11 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, 
	props->hca_core_clock = MLX5_CAP_GEN(mdev, device_frequency_khz);

	props->timestamp_mask = 0x7FFFFFFFFFFFFFFFULL;



#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING

	if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING)) {

		if (MLX5_CAP_GEN(mdev, pg))

			props->device_cap_flags |= IB_DEVICE_ON_DEMAND_PAGING;

		props->odp_caps = dev->odp_caps;

#endif

	}



	if (MLX5_CAP_GEN(mdev, cd))

		props->device_cap_flags |= IB_DEVICE_CROSS_CHANNEL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE