From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4E66445D31; Wed, 27 Nov 2024 01:53:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1341F427D7; Wed, 27 Nov 2024 01:53:11 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 2391C427C3 for ; Wed, 27 Nov 2024 01:53:03 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 40A9E20545B9; Tue, 26 Nov 2024 16:53:02 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 40A9E20545B9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1732668782; bh=QZ6nJH655IW0sVrK89EQqRWt/VPjbkFEvJmuE9YtFJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PQCzjGhBe2VoMuJIUaEHXMtt1cj06EufQKCQsmAGPv30zNK6U8z+W+CoqmEGHe/zK wCMF2dtxo+IyC4lqw3IMyyThwDMbiTDBW+FKr1AQDSvHC3LbeD4NDSdLANa98DfDye u3XCynP4LgaKQf81ZdQ0fZkloq9fS04wExWhgvyc= From: Andre Muezerie 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 Subject: [PATCH v6 04/30] app/test: replace packed attributes Date: Tue, 26 Nov 2024 16:52:15 -0800 Message-Id: <1732668761-5556-5-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 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> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 --- app/test/test_efd.c | 3 ++- app/test/test_hash.c | 3 ++- app/test/test_member.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/test/test_efd.c b/app/test/test_efd.c index 1c0986b9bc..0c4444c764 100644 --- a/app/test/test_efd.c +++ b/app/test/test_efd.c @@ -33,13 +33,14 @@ test_efd(void) static unsigned int test_socket_id; /* 5-tuple key type */ +__rte_packed_begin struct 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..6dbd038efd 100644 --- a/app/test/test_hash.c +++ b/app/test/test_hash.c @@ -79,13 +79,14 @@ 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. */ +__rte_packed_begin struct 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..72ea7c239a 100644 --- a/app/test/test_member.c +++ b/app/test/test_member.c @@ -32,13 +32,14 @@ struct rte_member_setsum *setsum_vbf; struct rte_member_setsum *setsum_sketch; /* 5-tuple key type */ +__rte_packed_begin struct 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.34.1