Commit e945c653 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA: Split kernel-only global device caps from uverbs device caps 

Split out flags from ib_device::device_cap_flags that are only used
internally to the kernel into kernel_cap_flags that is not part of the
uapi. This limits the device_cap_flags to being the same bitmap that will
be copied to userspace.

This cleanly splits out the uverbs flags from the kernel flags to avoid
confusion in the flags bitmap.

Add some short comments describing which each of the kernel flags is
connected to. Remove unused kernel flags.

Link: https://lore.kernel.org/r/0-v2-22c19e565eef+139a-kern_caps_jgg@nvidia.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 22cbc6c2

drivers/infiniband/core/nldev.c

+1 −1
Original line number Diff line number Diff line
@@ -1739,7 +1739,7 @@ static int nldev_dellink(struct sk_buff *skb, struct nlmsghdr *nlh, 
	if (!device)

		return -EINVAL;



	if (!(device->attrs.device_cap_flags & IB_DEVICE_ALLOW_USER_UNREG)) {

	if (!(device->attrs.kernel_cap_flags & IBK_ALLOW_USER_UNREG)) {

		ib_device_put(device);

		return -EINVAL;

	}

drivers/infiniband/core/uverbs_cmd.c

+2 −4
Original line number Diff line number Diff line
@@ -337,8 +337,7 @@ static void copy_query_dev_fields(struct ib_ucontext *ucontext, 
	resp->hw_ver		= attr->hw_ver;

	resp->max_qp		= attr->max_qp;

	resp->max_qp_wr		= attr->max_qp_wr;

	resp->device_cap_flags	= lower_32_bits(attr->device_cap_flags &

		IB_UVERBS_DEVICE_CAP_FLAGS_MASK);

	resp->device_cap_flags  = lower_32_bits(attr->device_cap_flags);

	resp->max_sge		= min(attr->max_send_sge, attr->max_recv_sge);

	resp->max_sge_rd	= attr->max_sge_rd;

	resp->max_cq		= attr->max_cq;
@@ -3619,8 +3618,7 @@ static int ib_uverbs_ex_query_device(struct uverbs_attr_bundle *attrs) 


	resp.timestamp_mask = attr.timestamp_mask;

	resp.hca_core_clock = attr.hca_core_clock;

	resp.device_cap_flags_ex = attr.device_cap_flags &

		IB_UVERBS_DEVICE_CAP_FLAGS_MASK;

	resp.device_cap_flags_ex = attr.device_cap_flags;

	resp.rss_caps.supported_qpts = attr.rss_caps.supported_qpts;

	resp.rss_caps.max_rwq_indirection_tables =

		attr.rss_caps.max_rwq_indirection_tables;

drivers/infiniband/core/verbs.c

+4 −4
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ struct ib_pd *__ib_alloc_pd(struct ib_device *device, unsigned int flags, 
	}

	rdma_restrack_add(&pd->res);



	if (device->attrs.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY)

	if (device->attrs.kernel_cap_flags & IBK_LOCAL_DMA_LKEY)

		pd->local_dma_lkey = device->local_dma_lkey;

	else

		mr_access_flags |= IB_ACCESS_LOCAL_WRITE;
@@ -308,7 +308,7 @@ struct ib_pd *__ib_alloc_pd(struct ib_device *device, unsigned int flags, 


		pd->__internal_mr = mr;



		if (!(device->attrs.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY))

		if (!(device->attrs.kernel_cap_flags & IBK_LOCAL_DMA_LKEY))

			pd->local_dma_lkey = pd->__internal_mr->lkey;



		if (flags & IB_PD_UNSAFE_GLOBAL_RKEY)
@@ -2131,8 +2131,8 @@ struct ib_mr *ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	struct ib_mr *mr;



	if (access_flags & IB_ACCESS_ON_DEMAND) {

		if (!(pd->device->attrs.device_cap_flags &

		      IB_DEVICE_ON_DEMAND_PAGING)) {

		if (!(pd->device->attrs.kernel_cap_flags &

		      IBK_ON_DEMAND_PAGING)) {

			pr_debug("ODP support not available\n");

			return ERR_PTR(-EINVAL);

		}

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -146,13 +146,13 @@ int bnxt_re_query_device(struct ib_device *ibdev, 
				    | IB_DEVICE_RC_RNR_NAK_GEN

				    | IB_DEVICE_SHUTDOWN_PORT

				    | IB_DEVICE_SYS_IMAGE_GUID

				    | IB_DEVICE_LOCAL_DMA_LKEY

				    | IB_DEVICE_RESIZE_MAX_WR

				    | IB_DEVICE_PORT_ACTIVE_EVENT

				    | IB_DEVICE_N_NOTIFY_CQ

				    | IB_DEVICE_MEM_WINDOW

				    | IB_DEVICE_MEM_WINDOW_TYPE_2B

				    | IB_DEVICE_MEM_MGT_EXTENSIONS;

	ib_attr->kernel_cap_flags = IBK_LOCAL_DMA_LKEY;

	ib_attr->max_send_sge = dev_attr->max_qp_sges;

	ib_attr->max_recv_sge = dev_attr->max_qp_sges;

	ib_attr->max_sge_rd = dev_attr->max_qp_sges;

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+0 −1
Original line number Diff line number Diff line
@@ -314,7 +314,6 @@ enum db_state { 
struct c4iw_dev {

	struct ib_device ibdev;

	struct c4iw_rdev rdev;

	u32 device_cap_flags;

	struct xarray cqs;

	struct xarray qps;

	struct xarray mrs;