On Thu, Sep 02, 2021 at 04:46:36PM +0800, Xiao Yang wrote:
> 1) post_one_send() always processes kernel's send queue.
> 2) rxe_poll_cq() always processes kernel's completion queue.
>
> Fixes: 5bcf5a59c41e ("RDMA/rxe: Protext kernel index from user space")
> Signed-off-by: Xiao Yang <yangx.jy@xxxxxxxxxxx>
> drivers/infiniband/sw/rxe/rxe_verbs.c | 29 ++++++---------------------
> 1 file changed, 6 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index c223959ac174..cdded9f64910 100644
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -632,7 +632,6 @@ static int post_one_send(struct rxe_qp *qp, const struct ib_send_wr *ibwr,
> struct rxe_sq *sq = &qp->sq;
> struct rxe_send_wqe *send_wqe;
> unsigned long flags;
> - int full;
>
> err = validate_send_wr(qp, ibwr, mask, length);
> if (err)
> @@ -640,27 +639,16 @@ static int post_one_send(struct rxe_qp *qp, const struct ib_send_wr *ibwr,
>
> spin_lock_irqsave(&qp->sq.sq_lock, flags);
>
> - if (qp->is_user)
> - full = queue_full(sq->queue, QUEUE_TYPE_FROM_USER);
> - else
> - full = queue_full(sq->queue, QUEUE_TYPE_KERNEL);
> -
> - if (unlikely(full)) {
> + if (unlikely(queue_full(sq->queue, QUEUE_TYPE_KERNEL))) {
> spin_unlock_irqrestore(&qp->sq.sq_lock, flags);
> return -ENOMEM;
> }
>
> - if (qp->is_user)
> - send_wqe = producer_addr(sq->queue, QUEUE_TYPE_FROM_USER);
> - else
> - send_wqe = producer_addr(sq->queue, QUEUE_TYPE_KERNEL);
> + send_wqe = producer_addr(sq->queue, QUEUE_TYPE_KERNEL);
>
> init_send_wqe(qp, ibwr, mask, length, send_wqe);
>
> - if (qp->is_user)
> - advance_producer(sq->queue, QUEUE_TYPE_FROM_USER);
> - else
> - advance_producer(sq->queue, QUEUE_TYPE_KERNEL);
> + advance_producer(sq->queue, QUEUE_TYPE_KERNEL);
>
> spin_unlock_irqrestore(&qp->sq.sq_lock, flags);
This bit looks OK
> @@ -852,18 +840,13 @@ static int rxe_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc)
>
> spin_lock_irqsave(&cq->cq_lock, flags);
> for (i = 0; i < num_entries; i++) {
> - if (cq->is_user)
> - cqe = queue_head(cq->queue, QUEUE_TYPE_TO_USER);
> - else
> - cqe = queue_head(cq->queue, QUEUE_TYPE_KERNEL);
> + cqe = queue_head(cq->queue, QUEUE_TYPE_KERNEL);
> if (!cqe)
> break;
>
> memcpy(wc++, &cqe->ibwc, sizeof(*wc));
> - if (cq->is_user)
> - advance_consumer(cq->queue, QUEUE_TYPE_TO_USER);
> - else
> - advance_consumer(cq->queue, QUEUE_TYPE_KERNEL);
> +
> + advance_consumer(cq->queue, QUEUE_TYPE_KERNEL);
> }
But why is this OK?
It is used here:
.poll_cq = rxe_poll_cq,
Which is part of:
static int ib_uverbs_poll_cq(struct uverbs_attr_bundle *attrs)
[..]
ret = ib_poll_cq(cq, 1, &wc);
That is used called?
Jason
