Fix incorrect atomic retry behavior
Subsystems (2)
cover Fix incorrect atomic retry behavior
Restructure the design of the atomic retries in rxe_resp.c modeled on the design of RDMA read reply. This fixes failures which occur when an atomic ack packet is lost as observed in the pyverbs test suite with a patch to randomly drop packets.
---
Bob Pearson (5):
RDMA/rxe: Move code to rxe_prepare_atomic_res() RDMA/rxe: Add a responder state for atomic reply RDMA/rxe: Move atomic responder res to atomic_reply RDMA/rxe: Move atomic original value to res RDMA/rxe: Merge normal and retry atomic flows
drivers/infiniband/sw/rxe/rxe_qp.c | 2 - drivers/infiniband/sw/rxe/rxe_resp.c | 132 ++++++++++++++++---------- drivers/infiniband/sw/rxe/rxe_verbs.h | 3 +- 3 files changed, 81 insertions(+), 56 deletions(-)
base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56
Signature · 1 line
2.34.1
PATCH 1/5 RDMA/rxe: Move code to rxe_prepare_atomic_res()
Separate the code that prepares the atomic responder resource into a subroutine. This is preparation for merging the normal and retry atomic responder flows.
--- drivers/infiniband/sw/rxe/rxe_resp.c | 37 ++++++++++++++++++---------- 1 file changed, 24 insertions(+), 13 deletions(-)
drivers/infiniband/sw/rxe/rxe_resp.c +24 -13
@@ -1019,10 +1019,27 @@ static int send_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt,return err; } +static struct resp_res *rxe_prepare_atomic_res (struct rxe_qp *qp, +struct rxe_pkt_info *pkt) +{ +struct resp_res *res; + + res = &qp->resp.resources[qp->resp.res_head]; +rxe_advance_resp_resource (qp); +free_rd_atomic_resource (qp, res); + + res->type =RXE_ATOMIC_MASK ; + res->first_psn = pkt->psn; + res->last_psn = pkt->psn; + res->cur_psn = pkt->psn; + +return res; +} +static int send_atomic_ack (struct rxe_qp *qp,struct rxe_pkt_info *pkt,u8 syndrome) { -int rc =0 ; +int err =0 ;struct rxe_pkt_info ack_pkt;struct sk_buff *skb;struct resp_res *res;
@@ -1031,28 +1048,22 @@ static int send_atomic_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt,IB_OPCODE_RC_ATOMIC_ACKNOWLEDGE ,0 , pkt->psn, syndrome);if (!skb) { - rc = -ENOMEM ; + err = -ENOMEM ; goto out; } - res = &qp->resp.resources[qp->resp.res_head]; -free_rd_atomic_resource (qp, res); -rxe_advance_resp_resource (qp); -skb_get (skb); - res->type =RXE_ATOMIC_MASK ; + + res =rxe_prepare_atomic_res (qp, pkt); res->atomic.skb = skb; - res->first_psn = ack_pkt.psn; - res->last_psn = ack_pkt.psn; - res->cur_psn = ack_pkt.psn; - rc =rxe_xmit_packet (qp, &ack_pkt, skb); -if (rc) { + err =rxe_xmit_packet (qp, &ack_pkt, skb); +if (err) {pr_err_ratelimited ("Failed sending ack\n" );rxe_put (qp); } out: -return rc; +return err; } static enum resp_states acknowledge(struct rxe_qp *qp,
Signature · 1 line
2.34.1
PATCH 2/5 RDMA/rxe: Add a responder state for atomic reply
In reply to Bob PearsonAdd a responder state for atomic reply similar to read reply and rename process_atomic() rxe_atomic_reply(). In preparation for merging the normal and retry atomic responder flows.
--- drivers/infiniband/sw/rxe/rxe_resp.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
drivers/infiniband/sw/rxe/rxe_resp.c +18 -6
@@ -21,6 +21,7 @@ enum resp_states {RESPST_CHK_RKEY ,RESPST_EXECUTE ,RESPST_READ_REPLY , +RESPST_ATOMIC_REPLY ,RESPST_COMPLETE ,RESPST_ACKNOWLEDGE , RESPST_CLEANUP,
@@ -55,6 +56,7 @@ static char *resp_state_name[] = { [RESPST_CHK_RKEY] = "CHK_RKEY", [RESPST_EXECUTE] = "EXECUTE", [RESPST_READ_REPLY] = "READ_REPLY", + [RESPST_ATOMIC_REPLY] = "ATOMIC_REPLY", [RESPST_COMPLETE] = "COMPLETE", [RESPST_ACKNOWLEDGE] = "ACKNOWLEDGE", [RESPST_CLEANUP] = "CLEANUP",
@@ -552,8 +554,8 @@ static enum resp_states write_data_in(struct rxe_qp *qp,/* Guarantee atomicity of atomic operations at the machine level. */ static DEFINE_SPINLOCK (atomic_ops_lock); -static enum resp_states process_atomic (struct rxe_qp *qp, -struct rxe_pkt_info *pkt) +static enum resp_states rxe_atomic_reply (struct rxe_qp *qp, +struct rxe_pkt_info *pkt) {u64 *vaddr;enum resp_states ret;
@@ -585,7 +587,16 @@ static enum resp_states process_atomic(struct rxe_qp *qp,spin_unlock_bh (&atomic_ops_lock); - ret =RESPST_NONE ; + qp->resp.msn++; + +/* next expected psn, read handles this separately */ + qp->resp.psn = (pkt->psn +1 ) &BTH_PSN_MASK ; + qp->resp.ack_psn = qp->resp.psn; + + qp->resp.opcode = pkt->opcode; + qp->resp.status =IB_WC_SUCCESS ; + + ret =RESPST_ACKNOWLEDGE ; out:return ret; }
@@ -858,9 +869,7 @@ static enum resp_states execute(struct rxe_qp *qp, struct rxe_pkt_info *pkt) qp->resp.msn++;return RESPST_READ_REPLY ; }else if (pkt->mask &RXE_ATOMIC_MASK ) { - err =process_atomic (qp, pkt); -if (err) -return err; +return RESPST_ATOMIC_REPLY ; }else {/* Unreachable */ WARN_ON_ONCE (1 );
@@ -1327,6 +1336,9 @@ int rxe_responder(void *arg)case RESPST_READ_REPLY : state =read_reply (qp, pkt);break ; +case RESPST_ATOMIC_REPLY : + state =rxe_atomic_reply (qp, pkt); +break ;case RESPST_ACKNOWLEDGE : state =acknowledge (qp, pkt);break ;
Signature · 1 line
2.34.1
PATCH 3/5 RDMA/rxe: Move atomic responder res to atomic_reply
In reply to Bob PearsonMove the allocation of the atomic responder resource up into rxe_atomic_reply() from send_atomic_ack(). In preparation for merging the normal and retry atomic responder flows.
--- drivers/infiniband/sw/rxe/rxe_resp.c | 49 +++++++++++++++++----------- 1 file changed, 30 insertions(+), 19 deletions(-)
drivers/infiniband/sw/rxe/rxe_resp.c +30 -19
@@ -554,12 +554,36 @@ static enum resp_states write_data_in(struct rxe_qp *qp,/* Guarantee atomicity of atomic operations at the machine level. */ static DEFINE_SPINLOCK (atomic_ops_lock); +static struct resp_res *rxe_prepare_atomic_res (struct rxe_qp *qp, +struct rxe_pkt_info *pkt) +{ +struct resp_res *res; + + res = &qp->resp.resources[qp->resp.res_head]; +rxe_advance_resp_resource (qp); +free_rd_atomic_resource (qp, res); + + res->type =RXE_ATOMIC_MASK ; + res->first_psn = pkt->psn; + res->last_psn = pkt->psn; + res->cur_psn = pkt->psn; + res->replay =0 ; + +return res; +} +static enum resp_states rxe_atomic_reply (struct rxe_qp *qp,struct rxe_pkt_info *pkt) {u64 *vaddr;enum resp_states ret;struct rxe_mr *mr = qp->resp.mr; +struct resp_res *res = qp->resp.res; + +if (!res) { + res =rxe_prepare_atomic_res (qp, pkt); + qp->resp.res = res; + }if (mr->state !=RXE_MR_STATE_VALID ) { ret =RESPST_ERR_RKEY_VIOLATION ;
@@ -1028,30 +1052,13 @@ static int send_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt,return err; } -static struct resp_res *rxe_prepare_atomic_res (struct rxe_qp *qp, -struct rxe_pkt_info *pkt) -{ -struct resp_res *res; - - res = &qp->resp.resources[qp->resp.res_head]; -rxe_advance_resp_resource (qp); -free_rd_atomic_resource (qp, res); - - res->type =RXE_ATOMIC_MASK ; - res->first_psn = pkt->psn; - res->last_psn = pkt->psn; - res->cur_psn = pkt->psn; - -return res; -} -static int send_atomic_ack (struct rxe_qp *qp,struct rxe_pkt_info *pkt,u8 syndrome) {int err =0 ;struct rxe_pkt_info ack_pkt;struct sk_buff *skb; -struct resp_res *res; +struct resp_res *res = qp->resp.res; skb = prepare_ack_packet(qp, pkt, &ack_pkt, IB_OPCODE_RC_ATOMIC_ACKNOWLEDGE, 0, pkt->psn,
@@ -1063,7 +1070,6 @@ static int send_atomic_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt,skb_get (skb); - res =rxe_prepare_atomic_res (qp, pkt); res->atomic.skb = skb; err =rxe_xmit_packet (qp, &ack_pkt, skb);
@@ -1071,6 +1077,11 @@ static int send_atomic_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt,pr_err_ratelimited ("Failed sending ack\n" );rxe_put (qp); } + +/* have to clear this since it is used to trigger +* long read replies +*/ + qp->resp.res =NULL ; out:return err; }
Signature · 1 line
2.34.1
PATCH 4/5 RDMA/rxe: Move atomic original value to res
In reply to Bob PearsonMove the saved original value to the atomic responder resource. This replaces saving it in the qp. In preparation for merging the normal and retry atomic responder flows.
--- drivers/infiniband/sw/rxe/rxe_resp.c | 13 +++++++------ drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-)
drivers/infiniband/sw/rxe/rxe_resp.c +7 -6
@@ -579,6 +579,7 @@ static enum resp_states rxe_atomic_reply(struct rxe_qp *qp,enum resp_states ret;struct rxe_mr *mr = qp->resp.mr;struct resp_res *res = qp->resp.res; +u64 value;if (!res) { res =rxe_prepare_atomic_res (qp, pkt);
@@ -599,16 +600,16 @@ static enum resp_states rxe_atomic_reply(struct rxe_qp *qp, }spin_lock_bh (&atomic_ops_lock); - - qp->resp.atomic_orig = *vaddr; + res->atomic.orig_val = value = *vaddr;if (pkt->opcode ==IB_OPCODE_RC_COMPARE_SWAP ) { -if (*vaddr ==atmeth_comp (pkt)) - *vaddr =atmeth_swap_add (pkt); +if (value ==atmeth_comp (pkt)) + value =atmeth_swap_add (pkt); }else { - *vaddr +=atmeth_swap_add (pkt); + value +=atmeth_swap_add (pkt); } + *vaddr = value;spin_unlock_bh (&atomic_ops_lock); qp->resp.msn++;
@@ -664,7 +665,7 @@ static struct sk_buff *prepare_ack_packet(struct rxe_qp *qp, }if (ack->mask &RXE_ATMACK_MASK ) -atmack_set_orig (ack, qp->resp.atomic_orig); +atmack_set_orig (ack, qp->resp.res->atomic.orig_val); err =rxe_prepare (&qp->pri_av, ack, skb);if (err) {
drivers/infiniband/sw/rxe/rxe_verbs.h +1 -1
@@ -156,6 +156,7 @@ struct resp_res {union {struct {struct sk_buff *skb; +u64 orig_val; } atomic;struct {u64 va_org;
@@ -189,7 +190,6 @@ struct rxe_resp_info {u32 resid;u32 rkey;u32 length; -u64 atomic_orig;/* SRQ only */ struct {
Signature · 1 line
2.34.1
PATCH 5/5 RDMA/rxe: Merge normal and retry atomic flows
In reply to Bob PearsonMake 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.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 2 - drivers/infiniband/sw/rxe/rxe_resp.c | 79 ++++++++++++--------------- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 - 3 files changed, 36 insertions(+), 46 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +0 -2
@@ -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
112 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_verbs.h +0 -1
@@ -155,7 +155,6 @@ struct resp_res {union {struct { -struct sk_buff *skb;u64 orig_val; } atomic;struct {
Signature · 1 line
2.34.1
Quoted 4 lines · Bob Pearson
Restructure the design of the atomic retries in
rxe_resp.cmodeled on the design of RDMA read reply. This fixes failures which occur when an atomic ack packet is lost as observed in the pyverbs test suite with a patch to randomly drop packets.
Applied to for-next
Thanks,
Jason
Quoted 10 lines · Jason Gunthorpe
Quoted 4 lines · Bob Pearson
Restructure the design of the atomic retries in
rxe_resp.cmodeled on the design of RDMA read reply. This fixes failures which occur when an atomic ack packet is lost as observed in the pyverbs test suite with a patch to randomly drop packets.Applied to for-next
Thanks,
Jason
Thanks.
I think this will commute with the other fixes I just sent. If it doesn't I can rebase them. Bob