Commit 19b1a294 authored by Erez Alfasi's avatar Erez Alfasi Committed by Jason Gunthorpe
Browse files

RDMA: Use __packed annotation instead of __attribute__ ((packed)) 



"__attribute__" set of macros has been standardized, have became more
potentially portable and consistent code back in v2.6.21 by commit
82ddcb04 ("[PATCH] extend the set of "__attribute__" shortcut macros").
Moreover, nowadays checkpatch.pl warns about using __attribute__((packed))
instead of __packed.

This patch converts all the "__attribute__ ((packed))" annotations to
"__packed" within the RDMA subsystem.

Signed-off-by: default avatarErez Alfasi <ereza@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent d0a93556

drivers/infiniband/core/cm_msgs.h

+11 −11
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct cm_req_msg { 


	u32 private_data[IB_CM_REQ_PRIVATE_DATA_SIZE / sizeof(u32)];



} __attribute__ ((packed));

} __packed;



static inline __be32 cm_req_get_local_qpn(struct cm_req_msg *req_msg)

{
@@ -423,7 +423,7 @@ enum cm_msg_response { 


	u8 private_data[IB_CM_MRA_PRIVATE_DATA_SIZE];



} __attribute__ ((packed));

} __packed;



static inline u8 cm_mra_get_msg_mraed(struct cm_mra_msg *mra_msg)

{
@@ -461,7 +461,7 @@ struct cm_rej_msg { 


	u8 private_data[IB_CM_REJ_PRIVATE_DATA_SIZE];



} __attribute__ ((packed));

} __packed;



static inline u8 cm_rej_get_msg_rejected(struct cm_rej_msg *rej_msg)

{
@@ -506,7 +506,7 @@ struct cm_rep_msg { 


	u8 private_data[IB_CM_REP_PRIVATE_DATA_SIZE];



} __attribute__ ((packed));

} __packed;



static inline __be32 cm_rep_get_local_qpn(struct cm_rep_msg *rep_msg)

{
@@ -614,7 +614,7 @@ struct cm_rtu_msg { 


	u8 private_data[IB_CM_RTU_PRIVATE_DATA_SIZE];



} __attribute__ ((packed));

} __packed;



struct cm_dreq_msg {

	struct ib_mad_hdr hdr;
@@ -626,7 +626,7 @@ struct cm_dreq_msg { 


	u8 private_data[IB_CM_DREQ_PRIVATE_DATA_SIZE];



} __attribute__ ((packed));

} __packed;



static inline __be32 cm_dreq_get_remote_qpn(struct cm_dreq_msg *dreq_msg)

{
@@ -647,7 +647,7 @@ struct cm_drep_msg { 


	u8 private_data[IB_CM_DREP_PRIVATE_DATA_SIZE];



} __attribute__ ((packed));

} __packed;



struct cm_lap_msg {

	struct ib_mad_hdr hdr;
@@ -675,7 +675,7 @@ struct cm_lap_msg { 
	u8 offset63;



	u8 private_data[IB_CM_LAP_PRIVATE_DATA_SIZE];

} __attribute__  ((packed));

} __packed;



static inline __be32 cm_lap_get_remote_qpn(struct cm_lap_msg *lap_msg)

{
@@ -784,7 +784,7 @@ struct cm_apr_msg { 
	u8 info[IB_CM_APR_INFO_LENGTH];



	u8 private_data[IB_CM_APR_PRIVATE_DATA_SIZE];

} __attribute__ ((packed));

} __packed;



struct cm_sidr_req_msg {

	struct ib_mad_hdr hdr;
@@ -795,7 +795,7 @@ struct cm_sidr_req_msg { 
	__be64 service_id;



	u32 private_data[IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE / sizeof(u32)];

} __attribute__ ((packed));

} __packed;



struct cm_sidr_rep_msg {

	struct ib_mad_hdr hdr;
@@ -811,7 +811,7 @@ struct cm_sidr_rep_msg { 
	u8 info[IB_CM_SIDR_REP_INFO_LENGTH];



	u8 private_data[IB_CM_SIDR_REP_PRIVATE_DATA_SIZE];

} __attribute__ ((packed));

} __packed;



static inline __be32 cm_sidr_rep_get_qpn(struct cm_sidr_rep_msg *sidr_rep_msg)

{

drivers/infiniband/core/mad_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -73,14 +73,14 @@ struct ib_mad_private_header { 
	struct ib_mad_recv_wc recv_wc;

	struct ib_wc wc;

	u64 mapping;

} __attribute__ ((packed));

} __packed;



struct ib_mad_private {

	struct ib_mad_private_header header;

	size_t mad_size;

	struct ib_grh grh;

	u8 mad[0];

} __attribute__ ((packed));

} __packed;



struct ib_rmpp_segment {

	struct list_head list;

drivers/infiniband/hw/cxgb3/cxio_wr.h

+5 −5
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ enum t3_wr_flags { 
	T3_SOLICITED_EVENT_FLAG = 0x04,

	T3_READ_FENCE_FLAG = 0x08,

	T3_LOCAL_FENCE_FLAG = 0x10

} __attribute__ ((packed));

} __packed;



enum t3_wr_opcode {

	T3_WR_BP = FW_WROPCODE_RI_BYPASS,
@@ -77,7 +77,7 @@ enum t3_wr_opcode { 
	T3_WR_INIT = FW_WROPCODE_RI_RDMA_INIT,

	T3_WR_QP_MOD = FW_WROPCODE_RI_MODIFY_QP,

	T3_WR_FASTREG = FW_WROPCODE_RI_FASTREGISTER_MR

} __attribute__ ((packed));

} __packed;



enum t3_rdma_opcode {

	T3_RDMA_WRITE,		/* IETF RDMAP v1.0 ... */
@@ -95,7 +95,7 @@ enum t3_rdma_opcode { 
	T3_QP_MOD,

	T3_BYPASS,

	T3_RDMA_READ_REQ_WITH_INV,

} __attribute__ ((packed));

} __packed;



static inline enum t3_rdma_opcode wr2opcode(enum t3_wr_opcode wrop)

{
@@ -306,7 +306,7 @@ enum t3_mpa_attrs { 
	uP_RI_MPA_TX_MARKER_ENABLE = 0x2,

	uP_RI_MPA_CRC_ENABLE = 0x4,

	uP_RI_MPA_IETF_ENABLE = 0x8

} __attribute__ ((packed));

} __packed;



enum t3_qp_caps {

	uP_RI_QP_RDMA_READ_ENABLE = 0x01,
@@ -314,7 +314,7 @@ enum t3_qp_caps { 
	uP_RI_QP_BIND_ENABLE = 0x04,

	uP_RI_QP_FAST_REGISTER_ENABLE = 0x08,

	uP_RI_QP_STAG0_ENABLE = 0x10

} __attribute__ ((packed));

} __packed;



enum rdma_init_rtr_types {

	RTR_READ = 1,

drivers/infiniband/hw/mthca/mthca_cq.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct mthca_cq_context { 
	__be32 ci_db;		/* Arbel only */

	__be32 state_db;	/* Arbel only */

	u32    reserved;

} __attribute__((packed));

} __packed;



#define MTHCA_CQ_STATUS_OK          ( 0 << 28)

#define MTHCA_CQ_STATUS_OVERFLOW    ( 9 << 28)

drivers/infiniband/hw/mthca/mthca_eq.c

+8 −8
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct mthca_eq_context { 
	__be32 consumer_index;

	__be32 producer_index;

	u32    reserved3[4];

} __attribute__((packed));

} __packed;



#define MTHCA_EQ_STATUS_OK          ( 0 << 28)

#define MTHCA_EQ_STATUS_OVERFLOW    ( 9 << 28)
@@ -130,7 +130,7 @@ struct mthca_eqe { 
		u32 raw[6];

		struct {

			__be32 cqn;

		} __attribute__((packed)) comp;

		} __packed comp;

		struct {

			u16    reserved1;

			__be16 token;
@@ -138,27 +138,27 @@ struct mthca_eqe { 
			u8     reserved3[3];

			u8     status;

			__be64 out_param;

		} __attribute__((packed)) cmd;

		} __packed cmd;

		struct {

			__be32 qpn;

		} __attribute__((packed)) qp;

		} __packed qp;

		struct {

			__be32 srqn;

		} __attribute__((packed)) srq;

		} __packed srq;

		struct {

			__be32 cqn;

			u32    reserved1;

			u8     reserved2[3];

			u8     syndrome;

		} __attribute__((packed)) cq_err;

		} __packed cq_err;

		struct {

			u32    reserved1[2];

			__be32 port;

		} __attribute__((packed)) port_change;

		} __packed port_change;

	} event;

	u8 reserved3[3];

	u8 owner;

} __attribute__((packed));

} __packed;



#define  MTHCA_EQ_ENTRY_OWNER_SW      (0 << 7)

#define  MTHCA_EQ_ENTRY_OWNER_HW      (1 << 7)

CRA Git | Maintained and supported by SUSTech CRA and CCSE