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 D9DFD43BA4;
Fri, 23 Feb 2024 20:08:23 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 489CD42E2D;
Fri, 23 Feb 2024 20:05:06 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id DFFEB42C24
for <dev@dpdk.org>; Fri, 23 Feb 2024 20:04:19 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id 31ABB208432B; Fri, 23 Feb 2024 11:04:16 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 31ABB208432B
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1708715058;
bh=Bt7wYT6/5SVDNGQZnQ/KW80P6rk2GfJkoY/4ChRxq4o=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=jHpiiztfuTuxitQ5GoPHxKNSpV+75yoILceAi3S7gLvEQfA0r9j965awPG3/sohVX
V7RcCGbxNnJ60vQ86s3Hjk2xpmwJmZOe00zQ6qV/Uv135TMJkZMyrgAxlToYJktCys
SHBSKRaPioNMwmc41PGLRvZramCUkL+P8pKK3HP0=
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
Bruce Richardson <bruce.richardson@intel.com>,
Chengwen Feng <fengchengwen@huawei.com>,
Cristian Dumitrescu <cristian.dumitrescu@intel.com>,
David Christensen <drc@linux.vnet.ibm.com>,
David Hunt <david.hunt@intel.com>, Ferruh Yigit <ferruh.yigit@amd.com>,
Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,
Jasvinder Singh <jasvinder.singh@intel.com>,
Jerin Jacob <jerinj@marvell.com>, Kevin Laatz <kevin.laatz@intel.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
Min Zhou <zhoumin@loongson.cn>, Ruifeng Wang <ruifeng.wang@arm.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Stanislaw Kardach <kda@semihalf.com>,
Thomas Monjalon <thomas@monjalon.net>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>,
Yipeng Wang <yipeng1.wang@intel.com>,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH v5 36/39] fib: use C11 alignas
Date: Fri, 23 Feb 2024 11:04:11 -0800
Message-Id: <1708715054-22386-37-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1708715054-22386-1-git-send-email-roretzla@linux.microsoft.com>
References: <1707873986-29352-1-git-send-email-roretzla@linux.microsoft.com>
<1708715054-22386-1-git-send-email-roretzla@linux.microsoft.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
The current location used for __rte_aligned(a) for alignment of types
and variables is not compatible with MSVC. There is only a single
location accepted by both toolchains.
For variables standard C11 offers alignas(a) supported by conformant
compilers i.e. both MSVC and GCC.
For types the standard offers no alignment facility that compatibly
interoperates with C and C++ but may be achieved by relocating the
placement of __rte_aligned(a) to the aforementioned location accepted
by all currently supported toolchains.
To allow alignment for both compilers do the following:
* Move __rte_aligned from the end of {struct,union} definitions to
be between {struct,union} and tag.
The placement between {struct,union} and the tag allows the desired
alignment to be imparted on the type regardless of the toolchain being
used for all of GCC, LLVM, MSVC compilers building both C and C++.
* Replace use of __rte_aligned(a) on variables/fields with alignas(a).
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
lib/fib/dir24_8.h | 4 +++-
lib/fib/trie.h | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/fib/dir24_8.h b/lib/fib/dir24_8.h
index b0d1a40..6d350f7 100644
--- a/lib/fib/dir24_8.h
+++ b/lib/fib/dir24_8.h
@@ -6,6 +6,8 @@
#ifndef _DIR24_8_H_
#define _DIR24_8_H_
+#include <stdalign.h>
+
#include <rte_prefetch.h>
#include <rte_branch_prediction.h>
@@ -32,7 +34,7 @@ struct dir24_8_tbl {
uint64_t *tbl8; /**< tbl8 table. */
uint64_t *tbl8_idxes; /**< bitmap containing free tbl8 idxes*/
/* tbl24 table. */
- __extension__ uint64_t tbl24[0] __rte_cache_aligned;
+ __extension__ alignas(RTE_CACHE_LINE_SIZE) uint64_t tbl24[0];
};
static inline void *
diff --git a/lib/fib/trie.h b/lib/fib/trie.h
index 3cf161a..36ce1fd 100644
--- a/lib/fib/trie.h
+++ b/lib/fib/trie.h
@@ -6,6 +6,8 @@
#ifndef _TRIE_H_
#define _TRIE_H_
+#include <stdalign.h>
+
/**
* @file
* RTE IPv6 Longest Prefix Match (LPM)
@@ -36,7 +38,7 @@ struct rte_trie_tbl {
uint32_t *tbl8_pool; /**< bitmap containing free tbl8 idxes*/
uint32_t tbl8_pool_pos;
/* tbl24 table. */
- __extension__ uint64_t tbl24[0] __rte_cache_aligned;
+ __extension__ alignas(RTE_CACHE_LINE_SIZE) uint64_t tbl24[0];
};
static inline uint32_t
--
1.8.3.1