IB/hfi1, IB/rdmavt: Move r_adefered to r_lock cache line

This field is causing excessive cache line bouncing.

There are spare bytes in the r_lock cache line so the best approach
is to make an rvt QP field and remove from the hfi1 priv field.

Signed-off-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

4 files changed, 6 insertions, 13 deletions

diff --git a/drivers/infiniband/hw/hfi1/qp.c b/drivers/infiniband/hw/hfi1/qp.c
index 4573e4c9f35c..650305cc0373 100644
--- a/drivers/infiniband/hw/hfi1/qp.c
+++ b/drivers/infiniband/hw/hfi1/qp.c
@@ -731,9 +731,7 @@ void quiesce_qp(struct rvt_qp *qp)
 
 void notify_qp_reset(struct rvt_qp *qp)
 {
-        struct hfi1_qp_priv *priv = qp->priv;
-
-        priv->r_adefered = 0;
+        qp->r_adefered = 0;
         clear_ahg(qp);
 }
 
diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c
index 75a729cd0c3d..069bdaf061ab 100644
--- a/drivers/infiniband/hw/hfi1/rc.c
+++ b/drivers/infiniband/hw/hfi1/rc.c
@@ -727,10 +727,9 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp,
         struct ib_header hdr;
         struct ib_other_headers *ohdr;
         unsigned long flags;
-        struct hfi1_qp_priv *priv = qp->priv;
 
         /* clear the defer count */
-        priv->r_adefered = 0;
+        qp->r_adefered = 0;
 
         /* Don't send ACK or NAK if a RDMA read or atomic is pending. */
         if (qp->s_flags & RVT_S_RESP_PENDING)
@@ -1604,9 +1603,7 @@ static inline void rc_defered_ack(struct hfi1_ctxtdata *rcd,
 
 static inline void rc_cancel_ack(struct rvt_qp *qp)
 {
-        struct hfi1_qp_priv *priv = qp->priv;
-
-        priv->r_adefered = 0;
+        qp->r_adefered = 0;
         if (list_empty(&qp->rspwait))
                 return;
         list_del_init(&qp->rspwait);
@@ -2314,13 +2311,11 @@ send_last:
         qp->r_nak_state = 0;
         /* Send an ACK if requested or required. */
         if (psn & IB_BTH_REQ_ACK) {
-                struct hfi1_qp_priv *priv = qp->priv;
-
                 if (packet->numpkt == 0) {
                         rc_cancel_ack(qp);
                         goto send_ack;
                 }
-                if (priv->r_adefered >= HFI1_PSN_CREDIT) {
+                if (qp->r_adefered >= HFI1_PSN_CREDIT) {
                         rc_cancel_ack(qp);
                         goto send_ack;
                 }
@@ -2328,7 +2323,7 @@ send_last:
                         rc_cancel_ack(qp);
                         goto send_ack;
                 }
-                priv->r_adefered++;
+                qp->r_adefered++;
                 rc_defered_ack(rcd, qp);
         }
         return;
diff --git a/drivers/infiniband/hw/hfi1/verbs.h b/drivers/infiniband/hw/hfi1/verbs.h
index 52ff275caf54..c0913c6c8002 100644
--- a/drivers/infiniband/hw/hfi1/verbs.h
+++ b/drivers/infiniband/hw/hfi1/verbs.h
@@ -125,7 +125,6 @@ struct hfi1_qp_priv {
         struct sdma_engine *s_sde;                /* current sde */
         struct send_context *s_sendcontext;       /* current sendcontext */
         u8 s_sc;                                  /* SC[0..4] for next packet */
-        u8 r_adefered;                            /* number of acks defered */
         struct iowait s_iowait;
         struct rvt_qp *owner;
 };
diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h
index 1d8141a88d3c..be6472e5b06b 100644
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
@@ -324,6 +324,7 @@ struct rvt_qp {
         u8 r_state;             /* opcode of last packet received */
         u8 r_flags;
         u8 r_head_ack_queue;    /* index into s_ack_queue[] */
+        u8 r_adefered;          /* defered ack count */
 
         struct list_head rspwait;       /* link for waiting to respond */