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 2374843B27; Wed, 14 Feb 2024 08:09:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2C99432C0; Wed, 14 Feb 2024 08:07:00 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id E86C442F81 for ; Wed, 14 Feb 2024 08:06:26 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 958F720B2019; Tue, 13 Feb 2024 23:06:24 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 958F720B2019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1707894385; bh=h7k+m3VCt9w2Fbin0Wl5MrJLTds7bSwPCKifP3Xy4lI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gAnlQKl3xfvMheJxZa5Yv2ygwnM8UVFa2zcsEqaJk2kgnHUY1d9B2N9RECg+0Mg+D jnElm+Tf3G9agvbpVAF3GqwTk3nzPtAHSARR517+KhZK/845Oe9awvB3mtcl5U+Xt6 Z1tnPS89cPf7kew/oyg91p8RsdjBbpgBpfoE7+w0= From: Tyler Retzlaff To: dev@dpdk.org Cc: Andrew Rybchenko , Bruce Richardson , Chengwen Feng , Cristian Dumitrescu , David Christensen , David Hunt , Ferruh Yigit , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Kevin Laatz , Konstantin Ananyev , Min Zhou , Ruifeng Wang , Sameh Gobriel , Stanislaw Kardach , Thomas Monjalon , Vladimir Medvedkin , Yipeng Wang , Tyler Retzlaff Subject: [PATCH v3 25/39] node: use C11 alignas Date: Tue, 13 Feb 2024 23:06:08 -0800 Message-Id: <1707894382-307-26-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1707894382-307-1-git-send-email-roretzla@linux.microsoft.com> References: <1707873986-29352-1-git-send-email-roretzla@linux.microsoft.com> <1707894382-307-1-git-send-email-roretzla@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 * 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 --- 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 73563e4..195ac23 100644 --- a/lib/node/node_private.h +++ b/lib/node/node_private.h @@ -49,9 +49,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 + #include #include @@ -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