RDMA/rxe: Fix compile warnings on 32-bit

Move the conditional code into a function, with two varients so it is
harder to make these kinds of mistakes.

 drivers/infiniband/sw/rxe/rxe_resp.c: In function 'atomic_write_reply':
 drivers/infiniband/sw/rxe/rxe_resp.c:794:13: error: unused variable 'payload' [-Werror=unused-variable]
   794 |         int payload = payload_size(pkt);
       |             ^~~~~~~
 drivers/infiniband/sw/rxe/rxe_resp.c:793:24: error: unused variable 'mr' [-Werror=unused-variable]
   793 |         struct rxe_mr *mr = qp->resp.mr;
       |                        ^~
 drivers/infiniband/sw/rxe/rxe_resp.c:791:19: error: unused variable 'dst' [-Werror=unused-variable]
   791 |         u64 src, *dst;
       |                   ^~~
 drivers/infiniband/sw/rxe/rxe_resp.c:791:13: error: unused variable 'src' [-Werror=unused-variable]
   791 |         u64 src, *dst;

Fixes: 034e285f8b99 ("RDMA/rxe: Make responder support atomic write on RC service")
Link: https://lore.kernel.org/linux-rdma/Y5s+EVE7eLWQqOwv@nvidia.com/
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c
index 7a60c77..c749722 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@ -785,53 +785,61 @@ out:
        return ret;
 }
 
-static enum resp_states atomic_write_reply(struct rxe_qp *qp,
-                                               struct rxe_pkt_info *pkt)
+#ifdef CONFIG_64BIT
+static enum resp_states do_atomic_write(struct rxe_qp *qp,
+                                       struct rxe_pkt_info *pkt)
 {
-       u64 src, *dst;
-       struct resp_res *res = qp->resp.res;
        struct rxe_mr *mr = qp->resp.mr;
        int payload = payload_size(pkt);
+       u64 src, *dst;
 
-       if (!res) {
-               res = rxe_prepare_res(qp, pkt, RXE_ATOMIC_WRITE_MASK);
-               qp->resp.res = res;
-       }
-
-       if (!res->replay) {
-#ifdef CONFIG_64BIT
-               if (mr->state != RXE_MR_STATE_VALID)
-                       return RESPST_ERR_RKEY_VIOLATION;
-
-               memcpy(&src, payload_addr(pkt), payload);
+       if (mr->state != RXE_MR_STATE_VALID)
+               return RESPST_ERR_RKEY_VIOLATION;
 
-               dst = iova_to_vaddr(mr, qp->resp.va + qp->resp.offset, payload);
-               /* check vaddr is 8 bytes aligned. */
-               if (!dst || (uintptr_t)dst & 7)
-                       return RESPST_ERR_MISALIGNED_ATOMIC;
+       memcpy(&src, payload_addr(pkt), payload);
 
-               /* Do atomic write after all prior operations have completed */
-               smp_store_release(dst, src);
+       dst = iova_to_vaddr(mr, qp->resp.va + qp->resp.offset, payload);
+       /* check vaddr is 8 bytes aligned. */
+       if (!dst || (uintptr_t)dst & 7)
+               return RESPST_ERR_MISALIGNED_ATOMIC;
 
-               /* decrease resp.resid to zero */
-               qp->resp.resid -= sizeof(payload);
+       /* Do atomic write after all prior operations have completed */
+       smp_store_release(dst, src);
 
-               qp->resp.msn++;
+       /* decrease resp.resid to zero */
+       qp->resp.resid -= sizeof(payload);
 
-               /* 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.msn++;
 
-               qp->resp.opcode = pkt->opcode;
-               qp->resp.status = IB_WC_SUCCESS;
+       /* next expected psn, read handles this separately */
+       qp->resp.psn = (pkt->psn + 1) & BTH_PSN_MASK;
+       qp->resp.ack_psn = qp->resp.psn;
 
-               return RESPST_ACKNOWLEDGE;
+       qp->resp.opcode = pkt->opcode;
+       qp->resp.status = IB_WC_SUCCESS;
+       return RESPST_ACKNOWLEDGE;
+}
 #else
-               return RESPST_ERR_UNSUPPORTED_OPCODE;
+static enum resp_states do_atomic_write(struct rxe_qp *qp,
+                                       struct rxe_pkt_info *pkt)
+{
+       return RESPST_ERR_UNSUPPORTED_OPCODE;
+}
 #endif /* CONFIG_64BIT */
+
+static enum resp_states atomic_write_reply(struct rxe_qp *qp,
+                                          struct rxe_pkt_info *pkt)
+{
+       struct resp_res *res = qp->resp.res;
+
+       if (!res) {
+               res = rxe_prepare_res(qp, pkt, RXE_ATOMIC_WRITE_MASK);
+               qp->resp.res = res;
        }
 
-       return RESPST_ACKNOWLEDGE;
+       if (res->replay)
+               return RESPST_ACKNOWLEDGE;
+       return do_atomic_write(qp, pkt);
 }
 
 static struct sk_buff *prepare_ack_packet(struct rxe_qp *qp,