> @@ -175,7 +175,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev,
> int entries, int vector
> if (entries < 1 || entries > dev->dev->caps.max_cqes)
> return ERR_PTR(-EINVAL);
>
> - cq = kmalloc(sizeof *cq, GFP_KERNEL);
> + cq = kzalloc(sizeof *cq, GFP_KERNEL);
What's the reason for this change?
> @@ -477,23 +483,51 @@ static struct ib_xrcd *mlx4_ib_alloc_xrcd(struct
> ib_device *ibdev,
> + pd = mlx4_ib_alloc_pd(ibdev, NULL, NULL);
> + cq = mlx4_ib_create_cq(ibdev, 1, 0, NULL, NULL);
Why does every xrcd get a PD and a CQ now? Just in case someone wants
to create a rcv QP? (The spec is unclear on this -- for "create XRC
target QP" it says "A set of initial QP attributes must be specified by
the Consumer," but then doesn't mention anything in the input modifiers,
so it's not clear what PD/CQ is supposed to be used)
> + (1ull << IB_USER_VERBS_CMD_DESTROY_XRC_RCV_QP);
> }
>
> -
This seems to be repairing whitespace damage from the previous patch.
> +int mlx4_ib_reg_xrc_rcv_qp(struct ib_xrcd *xrcd, void *context, u32 qp_num)
> + mutex_lock(&mibqp->mutex);
> + list_for_each_entry(tmp, &mibqp->xrc_reg_list, list)
> + if (tmp->context == context) {
> + mutex_unlock(&mibqp->mutex);
> + kfree(ctx_entry);
> + mutex_unlock(&to_mdev(xrcd->device)->xrc_reg_mutex);
> + return 0;
> + }
> +
> + ctx_entry->context = context;
> + list_add_tail(&ctx_entry->list, &mibqp->xrc_reg_list);
> + mutex_unlock(&mibqp->mutex);
This list handling looks completely generic and is what I was saying
should probably be in the core uverbs module.
> +int mlx4_ib_query_xrc_rcv_qp(struct ib_xrcd *ibxrcd, u32 qp_num,
> + struct ib_qp_attr *qp_attr, int qp_attr_mask,
> + struct ib_qp_init_attr *qp_init_attr)
Virtually all of this function seems identical to the existing query QP
operation. We should avoid the mass duplication of code.
Also I'm not clear why this function takes a qp_num instead of a QP
handle. Why does the consumer have to pass in the XRCD? The IB spec
XRC annex just shows the QP handle as input to this verb. Is it because
the reg_xrc_rcv_qp doesn't give a QP handle back?
Finally, in this implementation, what happens if the consumer passes in
a QP that isn't an XRC rcv QP?
> + mqp = __mlx4_qp_lookup(dev->dev, qp_num);
> + if (unlikely(!mqp)) {
> + printk(KERN_WARNING "mlx4_ib_reg_xrc_rcv_qp: "
> + "unknown QPN %06x\n", qp_num);
> + goto err_out;
> + }
> +
> + qp = to_mibqp(mqp);
> + if (xrcd->xrcdn != to_mxrcd(qp->ibqp.xrcd)->xrcdn)
> + goto err_out;
In other words is that dereference of ->xrcdn safe if ibqp.xrcd is not set?
(And the error message talks about reg_xrc_rcv_qp instead of query)
--
Roland Dreier <[email protected]> || For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/index.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
