Commit dc184838 authored by Bob Pearson's avatar Bob Pearson Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Merge normal and retry atomic flows 

Make the execution of the atomic operation in rxe_atomic_reply()
conditional on res->replay and make duplicate_request() call into
rxe_atomic_reply() to merge the two flows. This is modeled on the behavior
of read reply. Delete the skb from the atomic responder resource since it
is no longer used. Adjust the reference counting of the qp in
send_atomic_ack() for this flow.

Fixes: 8700e3e7 ("Soft RoCE driver")
Link: https://lore.kernel.org/r/20220606143836.3323-6-rpearsonhpe@gmail.com


Signed-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 82644115

drivers/infiniband/sw/rxe/rxe_qp.c

+0 −2
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ static void free_rd_atomic_resources(struct rxe_qp *qp) 


void free_rd_atomic_resource(struct rxe_qp *qp, struct resp_res *res)

{

	if (res->type == RXE_ATOMIC_MASK)

		kfree_skb(res->atomic.skb);

	res->type = 0;

}

drivers/infiniband/sw/rxe/rxe_resp.c

+36 −43
Original line number Diff line number Diff line
@@ -586,12 +586,14 @@ static enum resp_states rxe_atomic_reply(struct rxe_qp *qp, 
		qp->resp.res = res;

	}



	if (!res->replay) {

		if (mr->state != RXE_MR_STATE_VALID) {

			ret = RESPST_ERR_RKEY_VIOLATION;

			goto out;

		}



	vaddr = iova_to_vaddr(mr, qp->resp.va + qp->resp.offset, sizeof(u64));

		vaddr = iova_to_vaddr(mr, qp->resp.va + qp->resp.offset,

					sizeof(u64));



		/* check vaddr is 8 bytes aligned. */

		if (!vaddr || (uintptr_t)vaddr & 7) {
@@ -620,6 +622,7 @@ static enum resp_states rxe_atomic_reply(struct rxe_qp *qp, 


		qp->resp.opcode = pkt->opcode;

		qp->resp.status = IB_WC_SUCCESS;

	}



	ret = RESPST_ACKNOWLEDGE;

out:
@@ -1056,7 +1059,6 @@ static int send_atomic_ack(struct rxe_qp *qp, u8 syndrome, u32 psn) 
	int err = 0;

	struct rxe_pkt_info ack_pkt;

	struct sk_buff *skb;

	struct resp_res *res = qp->resp.res;



	skb = prepare_ack_packet(qp, &ack_pkt, IB_OPCODE_RC_ATOMIC_ACKNOWLEDGE,

				 0, psn, syndrome);
@@ -1065,15 +1067,9 @@ static int send_atomic_ack(struct rxe_qp *qp, u8 syndrome, u32 psn) 
		goto out;

	}



	skb_get(skb);



	res->atomic.skb = skb;



	err = rxe_xmit_packet(qp, &ack_pkt, skb);

	if (err) {

		pr_err_ratelimited("Failed sending ack\n");

		rxe_put(qp);

	}

	if (err)

		pr_err_ratelimited("Failed sending atomic ack\n");



	/* have to clear this since it is used to trigger

	 * long read replies
@@ -1201,15 +1197,12 @@ static enum resp_states duplicate_request(struct rxe_qp *qp, 
		/* Find the operation in our list of responder resources. */

		res = find_resource(qp, pkt->psn);

		if (res) {

			skb_get(res->atomic.skb);

			/* Resend the result. */

			rc = rxe_xmit_packet(qp, pkt, res->atomic.skb);

			if (rc) {

				pr_err("Failed resending result. This flow is not handled - skb ignored\n");

				rc = RESPST_CLEANUP;

			res->replay = 1;

			res->cur_psn = pkt->psn;

			qp->resp.res = res;

			rc = RESPST_ATOMIC_REPLY;

			goto out;

		}

		}



		/* Resource not found. Class D error. Drop the request. */

		rc = RESPST_CLEANUP;

drivers/infiniband/sw/rxe/rxe_verbs.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ struct resp_res { 


	union {

		struct {

			struct sk_buff	*skb;

			u64		orig_val;

		} atomic;

		struct {