diff mbox series

[v2,net-next,2/8] ionic: remove pragma packed

Message ID 20200304042013.51970-3-snelson@pensando.io
State Superseded
Delegated to: David Miller
Headers show
Series ionic updates | expand

Commit Message

Shannon Nelson March 4, 2020, 4:20 a.m. UTC 
Replace the misguided "#pragma packed" with tags on each
struct/union definition that actually needs it.  This is safer
and more efficient on the various compilers and architectures.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
---
 .../net/ethernet/pensando/ionic/ionic_if.h    | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

Comments

Jakub Kicinski March 4, 2020, 7:54 p.m. UTC | #1 
On Tue,  3 Mar 2020 20:20:07 -0800 Shannon Nelson wrote:
> Replace the misguided "#pragma packed" with tags on each
> struct/union definition that actually needs it.  This is safer
> and more efficient on the various compilers and architectures.
> 
> Signed-off-by: Shannon Nelson <snelson@pensando.io>

Ah, I think I missed this pragma in original review :S

nit: I think __packed is preferred
Shannon Nelson March 5, 2020, 12:05 a.m. UTC | #2 
On 3/4/20 11:54 AM, Jakub Kicinski wrote:
> On Tue,  3 Mar 2020 20:20:07 -0800 Shannon Nelson wrote:
>> Replace the misguided "#pragma packed" with tags on each
>> struct/union definition that actually needs it.  This is safer
>> and more efficient on the various compilers and architectures.
>>
>> Signed-off-by: Shannon Nelson <snelson@pensando.io>
> Ah, I think I missed this pragma in original review :S
>
> nit: I think __packed is preferred

I was hoping to keep with the __attribute__((packed)) format, as I found 
in other kernel headers, as this file is shared in places that don't 
understand the __packed shorthand.  However, with Dave's added urging, 
I'll fix that in v3.

sln
diff mbox series

Patch

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_if.h b/drivers/net/ethernet/pensando/ionic/ionic_if.h
index ce07c2931a72..74697c25cd40 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_if.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_if.h
@@ -4,8 +4,6 @@ 
 #ifndef _IONIC_IF_H_
 #define _IONIC_IF_H_
 
-#pragma pack(push, 1)
-
 #define IONIC_DEV_INFO_SIGNATURE		0x44455649      /* 'DEVI' */
 #define IONIC_DEV_INFO_VERSION			1
 #define IONIC_IFNAMSIZ				16
@@ -366,7 +364,7 @@  union ionic_lif_config {
 		u8     rsvd2[2];
 		__le64 features;
 		__le32 queue_count[IONIC_QTYPE_MAX];
-	};
+	} __attribute__((packed));
 	__le32 words[64];
 };
 
@@ -417,7 +415,7 @@  union ionic_lif_identity {
 			__le32 max_frame_size;
 			u8 rsvd2[106];
 			union ionic_lif_config config;
-		} eth;
+		} __attribute__((packed)) eth;
 
 		struct {
 			u8 version;
@@ -439,8 +437,8 @@  union ionic_lif_identity {
 			struct ionic_lif_logical_qtype rq_qtype;
 			struct ionic_lif_logical_qtype cq_qtype;
 			struct ionic_lif_logical_qtype eq_qtype;
-		} rdma;
-	};
+		} __attribute((packed)) rdma;
+	} __attribute((packed));
 	__le32 words[512];
 };
 
@@ -526,7 +524,7 @@  struct ionic_q_init_cmd {
 	__le64 sg_ring_base;
 	__le32 eq_index;
 	u8     rsvd2[16];
-};
+} __attribute__((packed));
 
 /**
  * struct ionic_q_init_comp - Queue init command completion
@@ -1095,7 +1093,7 @@  struct ionic_port_status {
 	u8     status;
 	u8     rsvd[51];
 	struct ionic_xcvr_status  xcvr;
-};
+} __attribute((packed));
 
 /**
  * struct ionic_port_identify_cmd - Port identify command
@@ -1251,7 +1249,7 @@  struct ionic_port_getattr_comp {
 		u8      pause_type;
 		u8      loopback_mode;
 		u8      rsvd2[11];
-	};
+	} __attribute__((packed));
 	u8     color;
 };
 
@@ -1319,7 +1317,7 @@  struct ionic_dev_setattr_cmd {
 		char    name[IONIC_IFNAMSIZ];
 		__le64  features;
 		u8      rsvd2[60];
-	};
+	} __attribute__((packed));
 };
 
 /**
@@ -1334,7 +1332,7 @@  struct ionic_dev_setattr_comp {
 	union {
 		__le64  features;
 		u8      rsvd2[11];
-	};
+	} __attribute__((packed));
 	u8     color;
 };
 
@@ -1361,7 +1359,7 @@  struct ionic_dev_getattr_comp {
 	union {
 		__le64  features;
 		u8      rsvd2[11];
-	};
+	} __attribute__((packed));
 	u8     color;
 };
 
@@ -1426,7 +1424,7 @@  struct ionic_lif_setattr_cmd {
 		} rss;
 		u8	stats_ctl;
 		u8      rsvd[60];
-	};
+	} __attribute__((packed));
 };
 
 /**
@@ -1444,7 +1442,7 @@  struct ionic_lif_setattr_comp {
 	union {
 		__le64  features;
 		u8      rsvd2[11];
-	};
+	} __attribute__((packed));
 	u8     color;
 };
 
@@ -1483,7 +1481,7 @@  struct ionic_lif_getattr_comp {
 		u8      mac[6];
 		__le64  features;
 		u8      rsvd2[11];
-	};
+	} __attribute__((packed));
 	u8     color;
 };
 
@@ -1688,7 +1686,7 @@  struct ionic_vf_setattr_cmd {
 		u8     linkstate;
 		__le64 stats_pa;
 		u8     pad[60];
-	};
+	} __attribute__((packed));
 };
 
 struct ionic_vf_setattr_comp {
@@ -1726,7 +1724,7 @@  struct ionic_vf_getattr_comp {
 		u8     linkstate;
 		__le64 stats_pa;
 		u8     pad[11];
-	};
+	} __attribute__((packed));
 	u8     color;
 };
 
@@ -2471,7 +2469,7 @@  union ionic_dev_cmd_regs {
 		union ionic_dev_cmd_comp    comp;
 		u8                    rsvd[48];
 		u32                   data[478];
-	};
+	} __attribute__((packed));
 	u32 words[512];
 };
 
@@ -2484,7 +2482,7 @@  union ionic_dev_regs {
 	struct {
 		union ionic_dev_info_regs info;
 		union ionic_dev_cmd_regs  devcmd;
-	};
+	} __attribute__((packed));
 	__le32 words[1024];
 };
 
@@ -2574,6 +2572,4 @@  struct ionic_identity {
 	union ionic_qos_identity qos;
 };
 
-#pragma pack(pop)
-
 #endif /* _IONIC_IF_H_ */