diff mbox series

[v6,23/30] examples/ptpclient: replace packed attributes

Message ID	1732668761-5556-24-git-send-email-andremue@linux.microsoft.com (mailing list archive)
State	Superseded
Delegated to:	David Marchand
Headers	From: Andre Muezerie <andremue@linux.microsoft.com> To: roretzla@linux.microsoft.com Cc: aman.deep.singh@intel.com, anatoly.burakov@intel.com, bruce.richardson@intel.com, byron.marohn@intel.com, conor.walsh@intel.com, cristian.dumitrescu@intel.com, david.hunt@intel.com, dev@dpdk.org, dsosnowski@nvidia.com, gakhil@marvell.com, jerinj@marvell.com, jingjing.wu@intel.com, kirill.rybalchenko@intel.com, konstantin.v.ananyev@yandex.ru, matan@nvidia.com, orika@nvidia.com, radu.nicolau@intel.com, ruifeng.wang@arm.com, sameh.gobriel@intel.com, sivaprasad.tummala@amd.com, skori@marvell.com, stephen@networkplumber.org, suanmingm@nvidia.com, vattunuru@marvell.com, viacheslavo@nvidia.com, vladimir.medvedkin@intel.com, yipeng1.wang@intel.com, Andre Muezerie <andremue@linux.microsoft.com> Subject: [PATCH v6 23/30] examples/ptpclient: replace packed attributes Date: Tue, 26 Nov 2024 16:52:34 -0800 Message-Id: <1732668761-5556-24-git-send-email-andremue@linux.microsoft.com> In-Reply-To: <1732668761-5556-1-git-send-email-andremue@linux.microsoft.com> References: <1710968771-16435-1-git-send-email-roretzla@linux.microsoft.com> <1732668761-5556-1-git-send-email-andremue@linux.microsoft.com> Precedence: list Errors-To: dev-bounces@dpdk.org
Series	fix packing of structs when building with MSVC \| [v6,00/30] fix packing of structs when building with MSVC [v6,01/30] devtools: check packed attributes [v6,02/30] eal/include: add new packing macros [v6,03/30] app/test-pmd: remove unnecessary packed attributes [v6,04/30] app/test: replace packed attributes [v6,05/30] doc/guides: replace packed attributes [v6,06/30] drivers/baseband: replace packed attributes [v6,07/30] drivers/bus: replace packed attributes [v6,08/30] drivers/common: replace packed attributes [v6,09/30] drivers/compress: replace packed attributes [v6,10/30] drivers/crypto: replace packed attributes [v6,11/30] drivers/dma: replace packed attributes [v6,12/30] drivers/event: replace packed attributes [v6,13/30] drivers/mempool: replace packed attributes [v6,14/30] drivers/net: replace packed attributes [v6,15/30] drivers/raw: replace packed attributes [v6,16/30] drivers/regex: replace packed attributes [v6,17/30] drivers/vdpa: replace packed attributes [v6,18/30] examples/common: replace packed attributes [v6,19/30] examples/ip-pipeline: remove packed attributes [v6,20/30] examples/ipsec_secgw: replace packed attributes [v6,21/30] examples/l3fwd-power: replace packed attributes [v6,22/30] examples/l3fwd: replace packed attributes [v6,23/30] examples/ptpclient: replace packed attributes [v6,24/30] examples/vhost_blk: replace packed attributes [v6,25/30] lib/eal: replace packed attributes [v6,26/30] lib/ipsec: replace packed attributes [v6,27/30] lib/net: replace packed attributes [v6,28/30] lib/pipeline: replace packed attributes [v6,29/30] lib/vhost: replace packed attributes [v6,30/30] lib/eal: remove __rte_packed

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Andre Muezerie Nov. 27, 2024, 12:52 a.m. UTC

MSVC struct packing is not compatible with GCC. Replace macro
__rte_packed with __rte_packed_begin to push existing pack value
and set packing to 1-byte and macro __rte_packed_end to restore
the pack value prior to the push.

Macro __rte_packed_end is deliberately utilized to trigger a
MSVC compiler warning if no existing packing has been pushed allowing
easy identification of locations where the __rte_packed_begin is
missing.

Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
 examples/ptpclient/ptpclient.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c
index 23fa487081..5486a87119 100644
--- a/examples/ptpclient/ptpclient.c
+++ b/examples/ptpclient/ptpclient.c
@@ -85,21 +85,24 @@  static const struct rte_ether_addr ether_multicast = {
 };
 
 /* Structs used for PTP handling. */
+__rte_packed_begin
 struct tstamp {
 	uint16_t   sec_msb;
 	uint32_t   sec_lsb;
 	uint32_t   ns;
-}  __rte_packed;
+}  __rte_packed_end;
 
 struct clock_id {
 	uint8_t id[8];
 };
 
+__rte_packed_begin
 struct port_id {
 	struct clock_id        clock_id;
 	uint16_t               port_number;
-}  __rte_packed;
+}  __rte_packed_end;
 
+__rte_packed_begin
 struct ptp_header {
 	uint8_t              msg_type;
 	uint8_t              ver;
@@ -113,39 +116,44 @@  struct ptp_header {
 	uint16_t             seq_id;
 	uint8_t              control;
 	int8_t               log_message_interval;
-} __rte_packed;
+} __rte_packed_end;
 
+__rte_packed_begin
 struct sync_msg {
 	struct ptp_header   hdr;
 	struct tstamp       origin_tstamp;
-} __rte_packed;
+} __rte_packed_end;
 
+__rte_packed_begin
 struct follow_up_msg {
 	struct ptp_header   hdr;
 	struct tstamp       precise_origin_tstamp;
 	uint8_t             suffix[];
-} __rte_packed;
+} __rte_packed_end;
 
+__rte_packed_begin
 struct delay_req_msg {
 	struct ptp_header   hdr;
 	struct tstamp       origin_tstamp;
-} __rte_packed;
+} __rte_packed_end;
 
+__rte_packed_begin
 struct delay_resp_msg {
 	struct ptp_header    hdr;
 	struct tstamp        rx_tstamp;
 	struct port_id       req_port_id;
 	uint8_t              suffix[];
-} __rte_packed;
+} __rte_packed_end;
 
 struct ptp_message {
+	__rte_packed_begin
 	union {
 		struct ptp_header          header;
 		struct sync_msg            sync;
 		struct delay_req_msg       delay_req;
 		struct follow_up_msg       follow_up;
 		struct delay_resp_msg      delay_resp;
-	} __rte_packed;
+	} __rte_packed_end;
 };
 
 struct ptpv2_time_receiver_ordinary {