From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id C133943D5B;
Thu, 28 Mar 2024 00:10:47 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9D44642DCE;
Thu, 28 Mar 2024 00:09:42 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id AB228410FD
for <dev@dpdk.org>; Thu, 28 Mar 2024 00:09:21 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id 13C0220E6AE7; Wed, 27 Mar 2024 16:09:19 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 13C0220E6AE7
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1711580960;
bh=IiLvykGt2iCEyJSJ5MTAhrQafAxWQvwwTxjRVRlQqWg=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=aJMuJsjjWkSGfXqR7ZxLiQhSoZ7soum1BEuXN2NVWilCrylFSaiMoo8xDR1YhjjQX
3oyynVNEFXujeWJzIqtL+8tNe94DgScV7+ltDD7JrLleHqS8a4BLm3Gu4pY8CdDlrZ
O8W22QclCGQLZVzxZMuJe97AfsPEINougJE++8UA=
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: Akhil Goyal <gakhil@marvell.com>, Aman Singh <aman.deep.singh@intel.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Byron Marohn <byron.marohn@intel.com>, Conor Walsh <conor.walsh@intel.com>,
Cristian Dumitrescu <cristian.dumitrescu@intel.com>,
Dariusz Sosnowski <dsosnowski@nvidia.com>,
David Hunt <david.hunt@intel.com>, Jerin Jacob <jerinj@marvell.com>,
Jingjing Wu <jingjing.wu@intel.com>,
Kirill Rybalchenko <kirill.rybalchenko@intel.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
Matan Azrad <matan@nvidia.com>, Ori Kam <orika@nvidia.com>,
Radu Nicolau <radu.nicolau@intel.com>, Ruifeng Wang <ruifeng.wang@arm.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Sivaprasad Tummala <sivaprasad.tummala@amd.com>,
Suanming Mou <suanmingm@nvidia.com>, Sunil Kumar Kori <skori@marvell.com>,
Vamsi Attunuru <vattunuru@marvell.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>,
Yipeng Wang <yipeng1.wang@intel.com>,
Yuying Zhang <Yuying.Zhang@intel.com>,
Yuying Zhang <yuying.zhang@intel.com>,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH v2 15/15] examples: pack structures when building with MSVC
Date: Wed, 27 Mar 2024 16:09:18 -0700
Message-Id: <1711580958-20808-16-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1711580958-20808-1-git-send-email-roretzla@linux.microsoft.com>
References: <1710968771-16435-1-git-send-email-roretzla@linux.microsoft.com>
<1711580958-20808-1-git-send-email-roretzla@linux.microsoft.com>
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Add __rte_msvc_pushpack(1) to all __rte_packed structs to cause packing
when building with MSVC.
Remove __rte_packed where it appears natural alignment without
packing would produce the same layout or the struct is internal.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
examples/common/neon/port_group.h | 1 +
examples/ip_pipeline/cli.c | 10 +++++-----
examples/ipsec-secgw/ipsec.h | 1 +
examples/l3fwd-power/main.c | 2 ++
examples/ptpclient/ptpclient.c | 8 ++++++++
5 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/examples/common/neon/port_group.h b/examples/common/neon/port_group.h
index 421e2e8..bd40590 100644
--- a/examples/common/neon/port_group.h
+++ b/examples/common/neon/port_group.h
@@ -21,6 +21,7 @@
port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1,
uint16x8_t dp2)
{
+ __rte_msvc_pack
union {
uint16_t u16[FWDSTEP + 1];
uint64_t u64;
diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index e8269ea..aad6c78 100644
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -2571,7 +2571,7 @@ struct pkt_key_qinq {
uint16_t svlan;
uint16_t ethertype_cvlan;
uint16_t cvlan;
-} __rte_packed;
+};
struct pkt_key_ipv4_5tuple {
uint8_t time_to_live;
@@ -2581,7 +2581,7 @@ struct pkt_key_ipv4_5tuple {
uint32_t da;
uint16_t sp;
uint16_t dp;
-} __rte_packed;
+};
struct pkt_key_ipv6_5tuple {
uint16_t payload_length;
@@ -2591,15 +2591,15 @@ struct pkt_key_ipv6_5tuple {
uint8_t da[16];
uint16_t sp;
uint16_t dp;
-} __rte_packed;
+};
struct pkt_key_ipv4_addr {
uint32_t addr;
-} __rte_packed;
+};
struct pkt_key_ipv6_addr {
uint8_t addr[16];
-} __rte_packed;
+};
static uint32_t
parse_match(char **tokens,
diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index bdcada1..bdc6045 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -277,6 +277,7 @@ struct socket_ctx {
struct rte_mempool *session_pool;
};
+__rte_msvc_pack
struct cnt_blk {
uint32_t salt;
uint64_t iv;
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index f4adcf4..a3be37b 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -278,6 +278,7 @@ struct lcore_rx_queue {
#define DEFAULT_HASH_FUNC rte_jhash
#endif
+__rte_msvc_pack
struct ipv4_5tuple {
uint32_t ip_dst;
uint32_t ip_src;
@@ -286,6 +287,7 @@ struct ipv4_5tuple {
uint8_t proto;
} __rte_packed;
+__rte_msvc_pack
struct ipv6_5tuple {
uint8_t ip_dst[IPV6_ADDR_LEN];
uint8_t ip_src[IPV6_ADDR_LEN];
diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c
index afb61bb..cdd73fd 100644
--- a/examples/ptpclient/ptpclient.c
+++ b/examples/ptpclient/ptpclient.c
@@ -56,6 +56,7 @@
};
/* Structs used for PTP handling. */
+__rte_msvc_pack
struct tstamp {
uint16_t sec_msb;
uint32_t sec_lsb;
@@ -66,11 +67,13 @@ struct clock_id {
uint8_t id[8];
};
+__rte_msvc_pack
struct port_id {
struct clock_id clock_id;
uint16_t port_number;
} __rte_packed;
+__rte_msvc_pack
struct ptp_header {
uint8_t msg_type;
uint8_t ver;
@@ -86,22 +89,26 @@ struct ptp_header {
int8_t log_message_interval;
} __rte_packed;
+__rte_msvc_pack
struct sync_msg {
struct ptp_header hdr;
struct tstamp origin_tstamp;
} __rte_packed;
+__rte_msvc_pack
struct follow_up_msg {
struct ptp_header hdr;
struct tstamp precise_origin_tstamp;
uint8_t suffix[];
} __rte_packed;
+__rte_msvc_pack
struct delay_req_msg {
struct ptp_header hdr;
struct tstamp origin_tstamp;
} __rte_packed;
+__rte_msvc_pack
struct delay_resp_msg {
struct ptp_header hdr;
struct tstamp rx_tstamp;
@@ -110,6 +117,7 @@ struct delay_resp_msg {
} __rte_packed;
struct ptp_message {
+ __rte_msvc_pack
union {
struct ptp_header header;
struct sync_msg sync;
--
1.8.3.1