RDMA/ocrdma: Reorg structures to avoid padding

Reorg structures to better packing to avoid cacheline padding.

Signed-off-by: Naresh Gottumukkala <bgottumukkala@emulex.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index 7aa7f0f15f8e..d540180a8e42 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -236,15 +236,16 @@ struct ocrdma_srq {
         struct ib_srq ibsrq;
         struct ocrdma_dev *dev;
         u8 __iomem *db;
+        struct ocrdma_qp_hwq_info rq;
+        u64 *rqe_wr_id_tbl;
+        u32 *idx_bit_fields;
+        u32 bit_fields_len;
+
         /* provide synchronization to multiple context(s) posting rqe */
         spinlock_t q_lock ____cacheline_aligned;
 
-        struct ocrdma_qp_hwq_info rq;
         struct ocrdma_pd *pd;
         u32 id;
-        u64 *rqe_wr_id_tbl;
-        u32 *idx_bit_fields;
-        u32 bit_fields_len;
 };
 
 struct ocrdma_qp {
@@ -252,8 +253,6 @@ struct ocrdma_qp {
         struct ocrdma_dev *dev;
 
         u8 __iomem *sq_db;
-        /* provide synchronization to multiple context(s) posting wqe, rqe */
-        spinlock_t q_lock ____cacheline_aligned;
         struct ocrdma_qp_hwq_info sq;
         struct {
                 uint64_t wrid;
@@ -263,6 +262,9 @@ struct ocrdma_qp {
                 uint8_t  rsvd[3];
         } *wqe_wr_id_tbl;
         u32 max_inline_data;
+
+        /* provide synchronization to multiple context(s) posting wqe, rqe */
+        spinlock_t q_lock ____cacheline_aligned;
         struct ocrdma_cq *sq_cq;
         /* list maintained per CQ to flush SQ errors */
         struct list_head sq_entry;