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 335E746024;
Thu, 9 Jan 2025 01:50:03 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 9EAB840615;
Thu, 9 Jan 2025 01:48:48 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id DC342402E5
for <dev@dpdk.org>; Thu, 9 Jan 2025 01:48:40 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1213)
id EC4C2203E3B1; Wed, 8 Jan 2025 16:48:39 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com EC4C2203E3B1
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1736383719;
bh=N5rgw+EbgYKu9PdJ8fTGgJpO4zhXlj/r9qVS3KZZxBg=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=bXQ0YyQ3G1lndjNxtqrGFUQRbquyGJwOc3c61k0Ra0feXE15hqe2Nxwz3kJnI0Gcc
jCxx077V1yy2PJ0GhTEXQww0U0LEOJfbIah12YVjqp4SUKQ/p1Sy1BAzKtuWxvGlbW
cv+UlHmqSiQjOIKHUTVAIHFmL9WfOIus1pIYjGF4=
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>
X-Mailer: git-send-email 1.8.3.1
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>
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
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 --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 */
--
2.47.0.vfs.0.3