Commit 26e990ba authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA: Check attr_mask during modify_qp 

Each driver should check that it can support the provided attr_mask during
modify_qp. IB_USER_VERBS_EX_CMD_MODIFY_QP was being used to block
modify_qp_ex because the driver didn't check RATE_LIMIT.

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


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

drivers/infiniband/core/device.c

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

		BIT_ULL(IB_USER_VERBS_EX_CMD_DESTROY_WQ) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_MODIFY_CQ) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_MODIFY_QP) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_MODIFY_WQ) |

		BIT_ULL(IB_USER_VERBS_EX_CMD_QUERY_DEVICE);

drivers/infiniband/core/uverbs_cmd.c

+2 −6
Original line number Diff line number Diff line
@@ -1906,8 +1906,7 @@ static int ib_uverbs_modify_qp(struct uverbs_attr_bundle *attrs) 
	if (ret)

		return ret;



	if (cmd.base.attr_mask &

	    ~((IB_USER_LEGACY_LAST_QP_ATTR_MASK << 1) - 1))

	if (cmd.base.attr_mask & ~IB_QP_ATTR_STANDARD_BITS)

		return -EOPNOTSUPP;



	return modify_qp(attrs, &cmd);
@@ -1929,10 +1928,7 @@ static int ib_uverbs_ex_modify_qp(struct uverbs_attr_bundle *attrs) 
	 * Last bit is reserved for extending the attr_mask by

	 * using another field.

	 */

	BUILD_BUG_ON(IB_USER_LAST_QP_ATTR_MASK == (1ULL << 31));



	if (cmd.base.attr_mask &

	    ~((IB_USER_LAST_QP_ATTR_MASK << 1) - 1))

	if (cmd.base.attr_mask & ~(IB_QP_ATTR_STANDARD_BITS | IB_QP_RATE_LIMIT))

		return -EOPNOTSUPP;



	ret = modify_qp(attrs, &cmd);

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+3 −0
Original line number Diff line number Diff line
@@ -1829,6 +1829,9 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, 
	unsigned int flags;

	u8 nw_type;



	if (qp_attr_mask & ~IB_QP_ATTR_STANDARD_BITS)

		return -EOPNOTSUPP;



	qp->qplib_qp.modify_flags = 0;

	if (qp_attr_mask & IB_QP_STATE) {

		curr_qp_state = __to_ib_qp_state(qp->qplib_qp.cur_qp_state);

drivers/infiniband/hw/cxgb4/qp.c

+3 −0
Original line number Diff line number Diff line
@@ -2374,6 +2374,9 @@ int c4iw_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 


	pr_debug("ib_qp %p\n", ibqp);



	if (attr_mask & ~IB_QP_ATTR_STANDARD_BITS)

		return -EOPNOTSUPP;



	/* iwarp does not support the RTR state */

	if ((attr_mask & IB_QP_STATE) && (attr->qp_state == IB_QPS_RTR))

		attr_mask &= ~IB_QP_STATE;

drivers/infiniband/hw/efa/efa_verbs.c

+3 −0
Original line number Diff line number Diff line
@@ -917,6 +917,9 @@ int efa_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, 
	enum ib_qp_state new_state;

	int err;



	if (qp_attr_mask & ~IB_QP_ATTR_STANDARD_BITS)

		return -EOPNOTSUPP;



	if (udata->inlen &&

	    !ib_is_udata_cleared(udata, 0, udata->inlen)) {

		ibdev_dbg(&dev->ibdev,