diff mbox series

[v9,04/30] app/test: replace packed attributes

Message ID	1736383715-31703-5-git-send-email-andremue@linux.microsoft.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
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, mb@smartsharesystems.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 v9 04/30] app/test: replace packed attributes Date: Wed, 8 Jan 2025 16:48:09 -0800 Message-Id: <1736383715-31703-5-git-send-email-andremue@linux.microsoft.com> In-Reply-To: <1736383715-31703-1-git-send-email-andremue@linux.microsoft.com> References: <1710968771-16435-1-git-send-email-roretzla@linux.microsoft.com> <1736383715-31703-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 \| [v9,00/30] fix packing of structs when building with MSVC [v9,01/30] devtools: check packed attributes [v9,02/30] eal/include: add new packing macros [v9,03/30] app/test-pmd: remove unnecessary packed attributes [v9,04/30] app/test: replace packed attributes [v9,05/30] doc/guides: replace packed attributes [v9,06/30] drivers/baseband: replace packed attributes [v9,07/30] drivers/bus: replace packed attributes [v9,08/30] drivers/common: replace packed attributes [v9,09/30] drivers/compress: replace packed attributes [v9,10/30] drivers/crypto: replace packed attributes [v9,11/30] drivers/dma: replace packed attributes [v9,12/30] drivers/event: replace packed attributes [v9,13/30] drivers/mempool: replace packed attributes [v9,14/30] drivers/net: replace packed attributes [v9,15/30] drivers/raw: replace packed attributes [v9,16/30] drivers/regex: replace packed attributes [v9,17/30] drivers/vdpa: replace packed attributes [v9,18/30] examples/common: replace packed attributes [v9,19/30] examples/ip-pipeline: remove packed attributes [v9,20/30] examples/ipsec_secgw: replace packed attributes [v9,21/30] examples/l3fwd-power: replace packed attributes [v9,22/30] examples/l3fwd: replace packed attributes [v9,23/30] examples/ptpclient: replace packed attributes [v9,24/30] examples/vhost_blk: replace packed attributes [v9,25/30] lib/eal: replace packed attributes [v9,26/30] lib/ipsec: replace packed attributes [v9,27/30] lib/net: replace packed attributes [v9,28/30] lib/pipeline: replace packed attributes [v9,29/30] lib/vhost: replace packed attributes [v9,30/30] eal/include: deprecate macro __rte_packed

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Andre Muezerie Jan. 9, 2025, 12:48 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>
Reviewed-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test/test_efd.c    | 4 ++--
 app/test/test_hash.c   | 4 ++--
 app/test/test_member.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index 1c0986b9bc..4a4379c563 100644
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -33,13 +33,13 @@  test_efd(void)
 static unsigned int test_socket_id;
 
 /* 5-tuple key type */
-struct flow_key {
+struct __rte_packed_begin flow_key {
 	uint32_t ip_src;
 	uint32_t ip_dst;
 	uint16_t port_src;
 	uint16_t port_dst;
 	uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
 
 RTE_LOG_REGISTER(efd_logtype_test, test.efd, INFO);
 
diff --git a/app/test/test_hash.c b/app/test/test_hash.c
index 65b9cad93c..6b5ef2d1e5 100644
--- a/app/test/test_hash.c
+++ b/app/test/test_hash.c
@@ -79,13 +79,13 @@  static uint32_t hashtest_key_lens[] = {0, 2, 4, 5, 6, 7, 8, 10, 11, 15, 16, 21,
  * Should be packed to avoid holes with potentially
  * undefined content in the middle.
  */
-struct flow_key {
+struct __rte_packed_begin flow_key {
 	uint32_t ip_src;
 	uint32_t ip_dst;
 	uint16_t port_src;
 	uint16_t port_dst;
 	uint32_t proto;
-} __rte_packed;
+} __rte_packed_end;
 
 /*
  * Hash function that always returns the same value, to easily test what
diff --git a/app/test/test_member.c b/app/test/test_member.c
index 5a4d2750db..a93787a10c 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -32,13 +32,13 @@  struct rte_member_setsum *setsum_vbf;
 struct rte_member_setsum *setsum_sketch;
 
 /* 5-tuple key type */
-struct flow_key {
+struct __rte_packed_begin flow_key {
 	uint32_t ip_src;
 	uint32_t ip_dst;
 	uint16_t port_src;
 	uint16_t port_dst;
 	uint8_t proto;
-} __rte_packed;
+} __rte_packed_end;
 
 /* Set ID Macros for multimatch test usage */
 #define M_MATCH_S 1	/* Not start with 0 since by default 0 means no match */