From: Mike Marciniszyn Date: Sun, 14 Feb 2016 20:44:26 +0000 (-0800) Subject: IB/rdmvt: close send engine struct holes X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d2421a82f6d8ad407d3f4acdbacedfb06d9f47f5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git IB/rdmvt: close send engine struct holes pahole noted the wasted 4 bytes after s_lock and r_lock. Move s_flags and r_psn to fill the holes. Reviewed-by: Dennis Dalessandro Signed-off-by: Mike Marciniszyn Signed-off-by: Doug Ledford --- diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h index 933f14f92da6..5c307ed4d195 100644 --- a/include/rdma/rdmavt_qp.h +++ b/include/rdma/rdmavt_qp.h @@ -283,12 +283,12 @@ struct rvt_qp { struct rvt_sge_state s_rdma_read_sge; spinlock_t r_lock ____cacheline_aligned_in_smp; /* used for APM */ + u32 r_psn; /* expected rcv packet sequence number */ unsigned long r_aflags; u64 r_wr_id; /* ID for current receive WQE */ u32 r_ack_psn; /* PSN for next ACK or atomic ACK */ u32 r_len; /* total length of r_sge */ u32 r_rcv_len; /* receive data len processed */ - u32 r_psn; /* expected rcv packet sequence number */ u32 r_msn; /* message sequence number */ u8 r_state; /* opcode of last packet received */ @@ -308,8 +308,8 @@ struct rvt_qp { u32 s_ssn; /* SSN of tail entry */ spinlock_t s_lock ____cacheline_aligned_in_smp; - struct rvt_sge_state *s_cur_sge; u32 s_flags; + struct rvt_sge_state *s_cur_sge; struct rvt_swqe *s_wqe; struct rvt_sge_state s_sge; /* current send request data */ struct rvt_mregion *s_rdma_mr;