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 13E9743D05;
Wed, 20 Mar 2024 16:40:48 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4F65942DD8;
Wed, 20 Mar 2024 16:38:49 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 33112427E1
for <dev@dpdk.org>; Wed, 20 Mar 2024 16:38:27 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id EA04320B74D3; Wed, 20 Mar 2024 08:38:20 -0700 (PDT)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com EA04320B74D3
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1710949101;
bh=kWGTK3h2lWmAMl+srJFAEusMLOjB0I/LAL1gub4xbVc=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=pJELZvBEn96lZ67Zn1YvfUL7IQ278s1ACu141zvziymR8poEzQtGt40qDA+Hpjen0
Syz+9t/sKbeJ5AIBYtN7uwTr6Uf5tCol3rPPgLcWB2WN6McCQTtNdxQV4Otb6MwIPR
IFoXylFCIApD/Mhxccd493+2771/k6Ub7HXXbOS8=
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
To: dev@dpdk.org
Cc: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>,
"Min Hu (Connor)" <humin29@huawei.com>,
=?UTF-8?q?Morten=20Br=C3=B8rup?= <mb@smartsharesystems.com>,
Abdullah Sevincer <abdullah.sevincer@intel.com>,
Ajit Khaparde <ajit.khaparde@broadcom.com>,
Akhil Goyal <gakhil@marvell.com>, Alok Prasad <palok@marvell.com>,
Amit Bernstein <amitbern@amazon.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Andrew Boyer <andrew.boyer@amd.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,
Ankur Dwivedi <adwivedi@marvell.com>, Anoob Joseph <anoobj@marvell.com>,
Ashish Gupta <ashish.gupta@marvell.com>,
Ashwin Sekhar T K <asekhar@marvell.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Byron Marohn <byron.marohn@intel.com>,
Chaoyong He <chaoyong.he@corigine.com>, Chas Williams <chas3@att.com>,
Chenbo Xia <chenbox@nvidia.com>, Chengwen Feng <fengchengwen@huawei.com>,
Conor Walsh <conor.walsh@intel.com>,
Cristian Dumitrescu <cristian.dumitrescu@intel.com>,
Dariusz Sosnowski <dsosnowski@nvidia.com>,
David Hunt <david.hunt@intel.com>,
Devendra Singh Rawat <dsinghrawat@marvell.com>,
Ed Czeck <ed.czeck@atomicrules.com>,
Evgeny Schemeilin <evgenys@amazon.com>, Fan Zhang <fanzhang.oss@gmail.com>,
Gagandeep Singh <g.singh@nxp.com>, Guoyang Zhou <zhouguoyang@huawei.com>,
Harman Kalra <hkalra@marvell.com>,
Harry van Haaren <harry.van.haaren@intel.com>,
Hemant Agrawal <hemant.agrawal@nxp.com>,
Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,
Hyong Youb Kim <hyonkim@cisco.com>, Jakub Grajciar <jgrajcia@cisco.com>,
Jerin Jacob <jerinj@marvell.com>, Jian Wang <jianwang@trustnetic.com>,
Jiawen Wu <jiawenwu@trustnetic.com>, Jie Hai <haijie1@huawei.com>,
Jingjing Wu <jingjing.wu@intel.com>, John Daley <johndale@cisco.com>,
John Miller <john.miller@atomicrules.com>, Joyce Kong <joyce.kong@arm.com>,
Junfeng Guo <junfeng.guo@intel.com>, Kai Ji <kai.ji@intel.com>,
Kevin Laatz <kevin.laatz@intel.com>,
Kiran Kumar K <kirankumark@marvell.com>,
Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,
Lee Daly <lee.daly@intel.com>, Liang Ma <liangma@liangbit.com>,
Liron Himi <lironh@marvell.com>, Long Li <longli@microsoft.com>,
Maciej Czekaj <mczekaj@marvell.com>, Matan Azrad <matan@nvidia.com>,
Matt Peters <matt.peters@windriver.com>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
Michael Shamis <michaelsh@marvell.com>,
Nagadheeraj Rottela <rnagadheeraj@marvell.com>,
Nicolas Chautru <nicolas.chautru@intel.com>,
Nithin Dabilpuram <ndabilpuram@marvell.com>, Ori Kam <orika@nvidia.com>,
Pablo de Lara <pablo.de.lara.guarch@intel.com>,
Pavan Nikhilesh <pbhagavatula@marvell.com>,
Peter Mccarthy <peter.mccarthy@intel.com>,
Radu Nicolau <radu.nicolau@intel.com>,
Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,
Rakesh Kudurumalla <rkudurumalla@marvell.com>,
Raveendra Padasalagi <raveendra.padasalagi@broadcom.com>,
Reshma Pattan <reshma.pattan@intel.com>, Ron Beider <rbeider@amazon.com>,
Ruifeng Wang <ruifeng.wang@arm.com>, Sachin Saxena <sachin.saxena@nxp.com>,
Selwin Sebastian <selwin.sebastian@amd.com>,
Shai Brandes <shaibran@amazon.com>,
Shepard Siegel <shepard.siegel@atomicrules.com>,
Shijith Thotton <sthotton@marvell.com>,
Sivaprasad Tummala <sivaprasad.tummala@amd.com>,
Somnath Kotur <somnath.kotur@broadcom.com>,
Srikanth Yalavarthi <syalavarthi@marvell.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Steven Webster <steven.webster@windriver.com>,
Suanming Mou <suanmingm@nvidia.com>, Sunil Kumar Kori <skori@marvell.com>,
Sunil Uttarwar <sunilprakashrao.uttarwar@amd.com>,
Sunila Sahu <ssahu@marvell.com>, Tejasree Kondoj <ktejasree@marvell.com>,
Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
Vikas Gupta <vikas.gupta@broadcom.com>,
Volodymyr Fialko <vfialko@marvell.com>,
Wajeeh Atrash <atrwajee@amazon.com>, Wisam Jaddo <wisamm@nvidia.com>,
Xiaoyun Wang <cloud.wangxiaoyun@huawei.com>,
Yipeng Wang <yipeng1.wang@intel.com>,
Yisen Zhuang <yisen.zhuang@huawei.com>,
Yuying Zhang <Yuying.Zhang@intel.com>,
Zhangfei Gao <zhangfei.gao@linaro.org>, Zhirun Yan <yanzhirun_163@163.com>,
Ziyang Xuan <xuanziyang2@huawei.com>,
Tyler Retzlaff <roretzla@linux.microsoft.com>
Subject: [PATCH 19/83] net/ixgbe: move alignment attribute on types
Date: Wed, 20 Mar 2024 08:37:12 -0700
Message-Id: <1710949096-5786-20-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1710949096-5786-1-git-send-email-roretzla@linux.microsoft.com>
References: <1710949096-5786-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 <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
Move location of __rte_aligned(a) to new conventional location. The new
placement between {struct,union} and the tag allows the desired
alignment to be imparted on the type regardless of the toolchain being
used for both C and C++. Additionally, it avoids confusion by Doxygen
when generating documentation.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
drivers/net/ixgbe/ixgbe_ipsec.h | 4 ++--
drivers/net/ixgbe/ixgbe_rxtx.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ipsec.h b/drivers/net/ixgbe/ixgbe_ipsec.h
index e218c0a..be39199 100644
--- a/drivers/net/ixgbe/ixgbe_ipsec.h
+++ b/drivers/net/ixgbe/ixgbe_ipsec.h
@@ -60,7 +60,7 @@ struct ipaddr {
};
/** inline crypto crypto private session structure */
-struct ixgbe_crypto_session {
+struct __rte_cache_aligned ixgbe_crypto_session {
enum ixgbe_operation op;
const uint8_t *key;
uint32_t key_len;
@@ -70,7 +70,7 @@ struct ixgbe_crypto_session {
struct ipaddr src_ip;
struct ipaddr dst_ip;
struct rte_eth_dev *dev;
-} __rte_cache_aligned;
+};
struct ixgbe_crypto_rx_ip_table {
struct ipaddr ip;
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index f6c17d4..3d39eaa 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -1101,8 +1101,8 @@
* Use 2 different table for normal packet and tunnel packet
* to save the space.
*/
-const uint32_t
- ptype_table[IXGBE_PACKET_TYPE_MAX] __rte_cache_aligned = {
+const alignas(RTE_CACHE_LINE_SIZE) uint32_t
+ ptype_table[IXGBE_PACKET_TYPE_MAX] = {
[IXGBE_PACKET_TYPE_ETHER] = RTE_PTYPE_L2_ETHER,
[IXGBE_PACKET_TYPE_IPV4] = RTE_PTYPE_L2_ETHER |
RTE_PTYPE_L3_IPV4,
@@ -1187,8 +1187,8 @@
RTE_PTYPE_INNER_L3_IPV6_EXT | RTE_PTYPE_INNER_L4_SCTP,
};
-const uint32_t
- ptype_table_tn[IXGBE_PACKET_TYPE_TN_MAX] __rte_cache_aligned = {
+const alignas(RTE_CACHE_LINE_SIZE) uint32_t
+ ptype_table_tn[IXGBE_PACKET_TYPE_TN_MAX] = {
[IXGBE_PACKET_TYPE_NVGRE] = RTE_PTYPE_L2_ETHER |
RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | RTE_PTYPE_TUNNEL_GRE |
RTE_PTYPE_INNER_L2_ETHER,
@@ -1429,7 +1429,7 @@
static inline uint64_t
ixgbe_rxd_pkt_info_to_pkt_flags(uint16_t pkt_info)
{
- static uint64_t ip_rss_types_map[16] __rte_cache_aligned = {
+ static alignas(RTE_CACHE_LINE_SIZE) uint64_t ip_rss_types_map[16] = {
0, RTE_MBUF_F_RX_RSS_HASH, RTE_MBUF_F_RX_RSS_HASH, RTE_MBUF_F_RX_RSS_HASH,
0, RTE_MBUF_F_RX_RSS_HASH, 0, RTE_MBUF_F_RX_RSS_HASH,
RTE_MBUF_F_RX_RSS_HASH, 0, 0, 0,
--
1.8.3.1