Re: [PATCH] RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs

[Leon Romanovsky <leon@kernel.org>]

On Mon, Jun 24, 2024 at 10:03:48AM +0800, Honggang LI wrote:
> BTH_ACK_MASK bit is used to indicate that an acknowledge
> (for this packet) should be scheduled by the responder.
> Both UC and UD QPs are unacknowledged, so don't set
> BTH_ACK_MASK for UC or UD QPs.
> 
> Fixes: 8700e3e7c485 ("Soft RoCE driver")
> Signed-off-by: Honggang LI <honggangli@163.com>
> ---
>  drivers/infiniband/sw/rxe/rxe_req.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c
> index cd14c4c2dff9..ffd7ed712a02 100644
> --- a/drivers/infiniband/sw/rxe/rxe_req.c
> +++ b/drivers/infiniband/sw/rxe/rxe_req.c
> @@ -445,8 +445,12 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,
>  	qp_num = (pkt->mask & RXE_DETH_MASK) ? ibwr->wr.ud.remote_qpn :
>  					 qp->attr.dest_qp_num;
>  
> -	ack_req = ((pkt->mask & RXE_END_MASK) ||
> -		(qp->req.noack_pkts++ > RXE_MAX_PKT_PER_ACK));
> +	if (qp_type(qp) == IB_QPT_UD || qp_type(qp) == IB_QPT_UC)
> +		ack_req = 0;
> +	else {
> +		ack_req = ((pkt->mask & RXE_END_MASK) ||
> +			(qp->req.noack_pkts++ > RXE_MAX_PKT_PER_ACK));
> +	}
>  	if (ack_req)
>  		qp->req.noack_pkts = 0;


Applied the patch with the following change:
diff --git a/drivers/infiniband/sw/rxe/rxe_req.c b/drivers/infiniband/sw/rxe/rxe_req.c
index ffd7ed712a02..479c07e6e4ed 100644
--- a/drivers/infiniband/sw/rxe/rxe_req.c
+++ b/drivers/infiniband/sw/rxe/rxe_req.c
@@ -424,7 +424,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,
        int                     paylen;
        int                     solicited;
        u32                     qp_num;
-       int                     ack_req;
+       int                     ack_req = 0;

        /* length from start of bth to end of icrc */
        paylen = rxe_opcode[opcode].length + payload + pad + RXE_ICRC_SIZE;
@@ -445,12 +445,9 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,
        qp_num = (pkt->mask & RXE_DETH_MASK) ? ibwr->wr.ud.remote_qpn :
                                         qp->attr.dest_qp_num;

-       if (qp_type(qp) == IB_QPT_UD || qp_type(qp) == IB_QPT_UC)
-               ack_req = 0;
-       else {
+       if (qp_type(qp) != IB_QPT_UD && qp_type(qp) != IB_QPT_UC)
                ack_req = ((pkt->mask & RXE_END_MASK) ||
-                       (qp->req.noack_pkts++ > RXE_MAX_PKT_PER_ACK));
-       }
+                          (qp->req.noack_pkts++ > RXE_MAX_PKT_PER_ACK));
        if (ack_req)
                qp->req.noack_pkts = 0;



>  
> -- 
> 2.45.2
>