* 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 <roret...@linux.microsoft.com>
Acked-by: Morten Brørup <m...@smartsharesystems.com>
---
lib/node/node_private.h | 4 ++--
lib/node/pkt_cls.c | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/node/node_private.h b/lib/node/node_private.h
index 2b9bad1..ff04659 100644
--- a/lib/node/node_private.h
+++ b/lib/node/node_private.h
@@ -51,9 +51,9 @@ struct node_mbuf_priv1 {
/**
* Node mbuf private area 2.
*/
-struct node_mbuf_priv2 {
+struct __rte_cache_aligned node_mbuf_priv2 {
uint64_t priv_data;
-} __rte_cache_aligned;
+};
#define NODE_MBUF_PRIV2_SIZE sizeof(struct node_mbuf_priv2)
diff --git a/lib/node/pkt_cls.c b/lib/node/pkt_cls.c
index a8302b8..9d21b7f 100644
--- a/lib/node/pkt_cls.c
+++ b/lib/node/pkt_cls.c
@@ -2,6 +2,8 @@
* Copyright (C) 2020 Marvell.
*/
+#include <stdalign.h>
+
#include <rte_graph.h>
#include <rte_graph_worker.h>
@@ -9,7 +11,7 @@
#include "node_private.h"
/* Next node for each ptype, default is '0' is "pkt_drop" */
-static const uint8_t p_nxt[256] __rte_cache_aligned = {
+static const alignas(RTE_CACHE_LINE_SIZE) uint8_t p_nxt[256] = {
[RTE_PTYPE_L3_IPV4] = PKT_CLS_NEXT_IP4_LOOKUP,
[RTE_PTYPE_L3_IPV4_EXT] = PKT_CLS_NEXT_IP4_LOOKUP,
--
1.8.3.1
