Commit 652caba5 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA: Check srq_type during create_srq 

uverbs was blocking srq_types the driver doesn't support based on the
CREATE_XSRQ cmd_mask. Fix all drivers to check for supported srq_types
during create_srq and move CREATE_XSRQ to the core code.

Link: https://lore.kernel.org/r/5-v1-caa70ba3d1ab+1436e-ucmd_mask_jgg@nvidia.com


Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 44ce37bc

drivers/infiniband/core/device.c

+1 −0
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ struct ib_device *_ib_alloc_device(size_t size) 
		BIT_ULL(IB_USER_VERBS_CMD_CREATE_CQ) |

		BIT_ULL(IB_USER_VERBS_CMD_CREATE_QP) |

		BIT_ULL(IB_USER_VERBS_CMD_CREATE_SRQ) |

		BIT_ULL(IB_USER_VERBS_CMD_CREATE_XSRQ) |

		BIT_ULL(IB_USER_VERBS_CMD_DEALLOC_MW) |

		BIT_ULL(IB_USER_VERBS_CMD_DEALLOC_PD) |

		BIT_ULL(IB_USER_VERBS_CMD_DEREG_MR) |

drivers/infiniband/hw/cxgb4/qp.c

+3 −0
Original line number Diff line number Diff line
@@ -2680,6 +2680,9 @@ int c4iw_create_srq(struct ib_srq *ib_srq, struct ib_srq_init_attr *attrs, 
	int ret;

	int wr_len;



	if (attrs->srq_type != IB_SRQT_BASIC)

		return -EOPNOTSUPP;



	pr_debug("%s ib_pd %p\n", __func__, pd);



	php = to_c4iw_pd(pd);

drivers/infiniband/hw/hns/hns_roce_srq.c

+4 −0
Original line number Diff line number Diff line
@@ -288,6 +288,10 @@ int hns_roce_create_srq(struct ib_srq *ib_srq, 
	int ret;

	u32 cqn;



	if (init_attr->srq_type != IB_SRQT_BASIC &&

	    init_attr->srq_type != IB_SRQT_XRC)

		return -EOPNOTSUPP;



	/* Check the actual SRQ wqe and SRQ sge num */

	if (init_attr->attr.max_wr >= hr_dev->caps.max_srq_wrs ||

	    init_attr->attr.max_sge > hr_dev->caps.max_srq_sges)

drivers/infiniband/hw/mlx4/main.c

+0 −3
Original line number Diff line number Diff line
@@ -2657,9 +2657,6 @@ static void *mlx4_ib_add(struct mlx4_dev *dev) 
	ibdev->ib_dev.num_comp_vectors	= dev->caps.num_comp_vectors;

	ibdev->ib_dev.dev.parent	= &dev->persist->pdev->dev;



	ibdev->ib_dev.uverbs_cmd_mask |=

		(1ull << IB_USER_VERBS_CMD_CREATE_XSRQ);



	ib_set_device_ops(&ibdev->ib_dev, &mlx4_ib_dev_ops);

	ibdev->ib_dev.uverbs_ex_cmd_mask |=

		(1ull << IB_USER_VERBS_EX_CMD_CREATE_CQ) |

drivers/infiniband/hw/mlx4/srq.c

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ int mlx4_ib_create_srq(struct ib_srq *ib_srq, 
	int err;

	int i;



	if (init_attr->srq_type != IB_SRQT_BASIC &&

	    init_attr->srq_type != IB_SRQT_XRC)

		return -EOPNOTSUPP;



	/* Sanity check SRQ size before proceeding */

	if (init_attr->attr.max_wr  >= dev->dev->caps.max_srq_wqes ||

	    init_attr->attr.max_sge >  dev->dev->caps.max_srq_sge)