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 DFED645F25;
Mon, 23 Dec 2024 20:14:11 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 563F740A70;
Mon, 23 Dec 2024 20:12:44 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 8DCCB402C6
for <dev@dpdk.org>; Mon, 23 Dec 2024 20:12:16 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1213)
id D02F8206ADE7; Mon, 23 Dec 2024 11:12:14 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D02F8206ADE7
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1734981135;
bh=NPh5twHGWcq/Qhbp1HBkVtFD3alFDZMM1XkCG8qX6JQ=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=We4bX1P1YhpH5yUz5UWEkmqRJtBMTIubOvMLK6zU9Ak/qKVXPd5WRxwQznwewhBpf
XYlyai+ttC9ZDah+YrtfoKmSe7U3wuqNj6SjT60NPhhG6/A0TtI4Q6DP0XEXEdP5c9
WhqUB6OuSqFGpvkndoAvCC+md8b5S2InhTkEl8G4=
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 v7 25/29] lib/eal: replace packed attributes
Date: Mon, 23 Dec 2024 11:11:58 -0800
Message-Id: <1734981122-4729-26-git-send-email-andremue@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1734981122-4729-1-git-send-email-andremue@linux.microsoft.com>
References: <1710968771-16435-1-git-send-email-roretzla@linux.microsoft.com>
<1734981122-4729-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.
Removed the packed attributes from some structures that don't need
them.
Signed-off-by: Andre Muezerie <andremue@linux.microsoft.com>
---
lib/eal/common/eal_private.h | 2 +-
lib/eal/include/rte_memory.h | 3 ++-
lib/eal/include/rte_memzone.h | 3 ++-
lib/eal/include/rte_trace_point.h | 2 +-
lib/eal/x86/include/rte_memcpy.h | 9 ++++++---
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h
index bb315dab04..3b94e01b5b 100644
--- a/lib/eal/common/eal_private.h
+++ b/lib/eal/common/eal_private.h
@@ -62,7 +62,7 @@ struct rte_config {
* DPDK instances
*/
struct rte_mem_config *mem_config;
-} __rte_packed;
+};
/**
* Get the global configuration structure.
diff --git a/lib/eal/include/rte_memory.h b/lib/eal/include/rte_memory.h
index dbd0a6bedc..25fd7e0a6b 100644
--- a/lib/eal/include/rte_memory.h
+++ b/lib/eal/include/rte_memory.h
@@ -46,6 +46,7 @@ extern "C" {
/**
* Physical memory segment descriptor.
*/
+__rte_packed_begin
struct rte_memseg {
rte_iova_t iova; /**< Start IO address. */
union {
@@ -58,7 +59,7 @@ struct rte_memseg {
uint32_t nchannel; /**< Number of channels. */
uint32_t nrank; /**< Number of ranks. */
uint32_t flags; /**< Memseg-specific flags */
-} __rte_packed;
+} __rte_packed_end;
/**
* memseg list is a special case as we need to store a bunch of other data
diff --git a/lib/eal/include/rte_memzone.h b/lib/eal/include/rte_memzone.h
index e1563994d5..28c2262e12 100644
--- a/lib/eal/include/rte_memzone.h
+++ b/lib/eal/include/rte_memzone.h
@@ -45,6 +45,7 @@ extern "C" {
* A structure describing a memzone, which is a contiguous portion of
* physical memory identified by a name.
*/
+__rte_packed_begin
struct rte_memzone {
#define RTE_MEMZONE_NAMESIZE 32 /**< Maximum length of memory zone name.*/
@@ -62,7 +63,7 @@ struct rte_memzone {
int32_t socket_id; /**< NUMA socket ID. */
uint32_t flags; /**< Characteristics of this memzone. */
-} __rte_packed;
+} __rte_packed_end;
/**
* Set the maximum number of memzones.
diff --git a/lib/eal/include/rte_trace_point.h b/lib/eal/include/rte_trace_point.h
index 87b5f43c3c..b24db3b6da 100644
--- a/lib/eal/include/rte_trace_point.h
+++ b/lib/eal/include/rte_trace_point.h
@@ -298,7 +298,7 @@ struct __rte_trace_stream_header {
rte_uuid_t uuid;
uint32_t lcore_id;
char thread_name[__RTE_TRACE_EMIT_STRING_LEN_MAX];
-} __rte_packed;
+};
struct __rte_trace_header {
uint32_t offset;
diff --git a/lib/eal/x86/include/rte_memcpy.h b/lib/eal/x86/include/rte_memcpy.h
index 42058e4a3f..58368145c4 100644
--- a/lib/eal/x86/include/rte_memcpy.h
+++ b/lib/eal/x86/include/rte_memcpy.h
@@ -67,15 +67,18 @@ rte_mov15_or_less(void *dst, const void *src, size_t n)
* Use the following structs to avoid violating C standard
* alignment requirements and to avoid strict aliasing bugs
*/
+ __rte_packed_begin
struct rte_uint64_alias {
uint64_t val;
- } __rte_packed __rte_may_alias;
+ } __rte_packed_end __rte_may_alias;
+ __rte_packed_begin
struct rte_uint32_alias {
uint32_t val;
- } __rte_packed __rte_may_alias;
+ } __rte_packed_end __rte_may_alias;
+ __rte_packed_begin
struct rte_uint16_alias {
uint16_t val;
- } __rte_packed __rte_may_alias;
+ } __rte_packed_end __rte_may_alias;
void *ret = dst;
if (n & 8) {
--
2.47.0.vfs.0.3