From patchwork Mon Apr 15 20:03:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 139328 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0ED3A43E7E; Mon, 15 Apr 2024 22:08:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BA8C427E0; Mon, 15 Apr 2024 22:05:34 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 810C240A6C for ; Mon, 15 Apr 2024 22:04:56 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id C158120FD4A5; Mon, 15 Apr 2024 13:04:47 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com C158120FD4A5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1713211488; bh=KYewBDz3e6cQ2fdzMbNodpeK4yyyO6z96Qmanap8A/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PwPk1yM2bXQGsZ8jKw6EGG0/COwCcYX0AeZXTFcF4BRdmAf0Fqnbz/8ZUFFcbnsDQ dSeh+Jke+7BAGWW8i/PxzpiTIhJyp5V5aF7zX3TI1omznnCzF7Dh/5YgFAxxq9v/8Y KQtJBwCRux62fhTCtPy1VkGngGydZj8KnxD3m6A4= From: Tyler Retzlaff To: dev@dpdk.org Cc: =?utf-8?q?Mattias_R=C3=B6nnblom?= , "Min Hu (Connor)" , =?utf-8?q?Morten_Br=C3=B8rup?= , Abdullah Sevincer , Ajit Khaparde , Akhil Goyal , Alok Prasad , Amit Bernstein , Anatoly Burakov , Andrew Boyer , Andrew Rybchenko , Ankur Dwivedi , Anoob Joseph , Ashish Gupta , Ashwin Sekhar T K , Bruce Richardson , Byron Marohn , Chaoyong He , Chas Williams , Chenbo Xia , Chengwen Feng , Conor Walsh , Cristian Dumitrescu , Dariusz Sosnowski , David Hunt , Devendra Singh Rawat , Ed Czeck , Evgeny Schemeilin , Fan Zhang , Gagandeep Singh , Guoyang Zhou , Harman Kalra , Harry van Haaren , Hemant Agrawal , Honnappa Nagarahalli , Hyong Youb Kim , Jakub Grajciar , Jerin Jacob , Jian Wang , Jiawen Wu , Jie Hai , Jingjing Wu , John Daley , John Miller , Joyce Kong , Kai Ji , Kevin Laatz , Kiran Kumar K , Konstantin Ananyev , Lee Daly , Liang Ma , Liron Himi , Long Li , Maciej Czekaj , Matan Azrad , Matt Peters , Maxime Coquelin , Michael Shamis , Nagadheeraj Rottela , Nicolas Chautru , Nithin Dabilpuram , Ori Kam , Pablo de Lara , Pavan Nikhilesh , Peter Mccarthy , Radu Nicolau , Rahul Lakkireddy , Rakesh Kudurumalla , Raveendra Padasalagi , Reshma Pattan , Ron Beider , Ruifeng Wang , Sachin Saxena , Selwin Sebastian , Shai Brandes , Shepard Siegel , Shijith Thotton , Sivaprasad Tummala , Somnath Kotur , Srikanth Yalavarthi , Stephen Hemminger , Steven Webster , Suanming Mou , Sunil Kumar Kori , Sunil Uttarwar , Sunila Sahu , Tejasree Kondoj , Viacheslav Ovsiienko , Vikas Gupta , Volodymyr Fialko , Wajeeh Atrash , Wisam Jaddo , Xiaoyun Wang , Yipeng Wang , Yisen Zhuang , Yuying Zhang , Zhangfei Gao , Zhirun Yan , Ziyang Xuan , Tyler Retzlaff Subject: [PATCH v2 33/83] net/txgbe: move alignment attribute on types Date: Mon, 15 Apr 2024 13:03:55 -0700 Message-Id: <1713211485-9021-34-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1713211485-9021-1-git-send-email-roretzla@linux.microsoft.com> References: <1710949096-5786-1-git-send-email-roretzla@linux.microsoft.com> <1713211485-9021-1-git-send-email-roretzla@linux.microsoft.com> MIME-Version: 1.0 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 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 Acked-by: Morten Brørup --- drivers/net/txgbe/txgbe_ipsec.h | 4 ++-- drivers/net/txgbe/txgbe_ptypes.c | 10 +++++----- drivers/net/txgbe/txgbe_rxtx.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ipsec.h b/drivers/net/txgbe/txgbe_ipsec.h index 995e29e..e93f9a3 100644 --- a/drivers/net/txgbe/txgbe_ipsec.h +++ b/drivers/net/txgbe/txgbe_ipsec.h @@ -44,7 +44,7 @@ struct ipaddr { }; /** inline crypto private session structure */ -struct txgbe_crypto_session { +struct __rte_cache_aligned txgbe_crypto_session { enum txgbe_operation op; const uint8_t *key; uint32_t key_len; @@ -54,7 +54,7 @@ struct txgbe_crypto_session { struct ipaddr src_ip; struct ipaddr dst_ip; struct rte_eth_dev *dev; -} __rte_cache_aligned; +}; struct txgbe_crypto_rx_ip_table { struct ipaddr ip; diff --git a/drivers/net/txgbe/txgbe_ptypes.c b/drivers/net/txgbe/txgbe_ptypes.c index c07977b..a8e7271 100644 --- a/drivers/net/txgbe/txgbe_ptypes.c +++ b/drivers/net/txgbe/txgbe_ptypes.c @@ -47,7 +47,7 @@ #define RTE_PTYPE_INNER_L3_NONE 0 #define RTE_PTYPE_INNER_L4_NONE 0 -static u32 txgbe_ptype_lookup[TXGBE_PTID_MAX] __rte_cache_aligned = { +static alignas(RTE_CACHE_LINE_SIZE) u32 txgbe_ptype_lookup[TXGBE_PTID_MAX] = { /* L2:0-3 L3:4-7 L4:8-11 TUN:12-15 EL2:16-19 EL3:20-23 EL2:24-27 */ /* L2: ETH */ TPTE(0x10, ETHER, NONE, NONE, NONE, NONE, NONE, NONE), @@ -393,8 +393,8 @@ u8 txgbe_encode_ptype(u32 ptype) * Use 2 different table for normal packet and tunnel packet * to save the space. */ -const u32 -txgbe_ptype_table[TXGBE_PTID_MAX] __rte_cache_aligned = { +const alignas(RTE_CACHE_LINE_SIZE) u32 +txgbe_ptype_table[TXGBE_PTID_MAX] = { [TXGBE_PT_ETHER] = RTE_PTYPE_L2_ETHER, [TXGBE_PT_IPV4] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4, @@ -478,8 +478,8 @@ u8 txgbe_encode_ptype(u32 ptype) RTE_PTYPE_INNER_L3_IPV6_EXT | RTE_PTYPE_INNER_L4_SCTP, }; -const u32 -txgbe_ptype_table_tn[TXGBE_PTID_MAX] __rte_cache_aligned = { +const alignas(RTE_CACHE_LINE_SIZE) u32 +txgbe_ptype_table_tn[TXGBE_PTID_MAX] = { [TXGBE_PT_NVGRE] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN | RTE_PTYPE_TUNNEL_GRE | RTE_PTYPE_INNER_L2_ETHER, diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index 1cd4b25..2568bf0 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -1107,7 +1107,7 @@ static inline uint64_t txgbe_rxd_pkt_info_to_pkt_flags(uint32_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,