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 19F1643E7E; Mon, 15 Apr 2024 22:07:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86266410F9; Mon, 15 Apr 2024 22:05:23 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 5DB0B406BC for ; Mon, 15 Apr 2024 22:04:54 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 26E6820FD475; Mon, 15 Apr 2024 13:04:46 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 26E6820FD475 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1713211488; bh=38nPiLFfdf+G9LCDOcvvAS0tqtwGgoF2DUtSnLsakDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r4f7AjHxAPNGoFnEJgassX7kaQxvKfKdHgYV2KpFoah1VD9grfg0/u9bgbWOKvpmB 8aLdKAgzBs4rNo26en55IaH0zc4cgrFOAZe8Zv/o3tMCwFuVzUExOgq3bsgtp2iPpt 1p7B45WRSqSQ+UI4Zkp1JzlauAGRyUjUqFiVQbU8= From: Tyler Retzlaff To: dev@dpdk.org Cc: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= , "Min Hu (Connor)" , =?UTF-8?q?Morten=20Br=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 25/83] net/nfp: move alignment attribute on types Date: Mon, 15 Apr 2024 13:03:47 -0700 Message-Id: <1713211485-9021-26-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 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 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/nfp/flower/nfp_flower_flow.c | 4 ++-- drivers/net/nfp/nfp_ipsec.h | 4 ++-- drivers/net/nfp/nfp_rxtx.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c index 086cc80..26ee920 100644 --- a/drivers/net/nfp/flower/nfp_flower_flow.c +++ b/drivers/net/nfp/flower/nfp_flower_flow.c @@ -141,11 +141,11 @@ struct nfp_mask_id_entry { uint8_t mask_id; }; -struct nfp_pre_tun_entry { +struct __rte_aligned(32) nfp_pre_tun_entry { uint16_t mac_index; uint16_t ref_cnt; struct rte_ether_addr mac_addr; -} __rte_aligned(32); +}; static inline struct nfp_flow_priv * nfp_flow_dev_to_priv(struct rte_eth_dev *dev) diff --git a/drivers/net/nfp/nfp_ipsec.h b/drivers/net/nfp/nfp_ipsec.h index 8fdb7fd..29ca27d 100644 --- a/drivers/net/nfp/nfp_ipsec.h +++ b/drivers/net/nfp/nfp_ipsec.h @@ -142,7 +142,7 @@ struct nfp_ipsec_msg { }; }; -struct nfp_ipsec_session { +struct __rte_cache_aligned nfp_ipsec_session { /** Opaque user defined data */ void *user_data; /** NFP sa_entries database parameter index */ @@ -155,7 +155,7 @@ struct nfp_ipsec_session { struct rte_security_ipsec_xform ipsec; /** Security session action type */ enum rte_security_session_action_type action; -} __rte_cache_aligned; +}; struct nfp_net_ipsec_data { int pkt_dynfield_offset; diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 6ecabc2..344005e 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -27,7 +27,7 @@ struct nfp_tx_ipsec_desc_msg { } esn; /**< Extended Sequence Number */ }; -struct nfp_net_txq { +struct __rte_aligned(64) nfp_net_txq { /** Backpointer to nfp_net structure */ struct nfp_net_hw *hw; @@ -77,7 +77,7 @@ struct nfp_net_txq { * in a cache line. */ uint64_t dma; -} __rte_aligned(64); +}; /* RX and freelist descriptor format */ #define PCIE_DESC_RX_DD (1 << 7) @@ -129,7 +129,7 @@ struct nfp_net_rx_desc { }; }; -struct nfp_net_rxq { +struct __rte_aligned(64) nfp_net_rxq { /** Backpointer to nfp_net structure */ struct nfp_net_hw *hw; @@ -197,7 +197,7 @@ struct nfp_net_rxq { /** DMA address of the queue */ uint64_t dma; -} __rte_aligned(64); +}; static inline void nfp_net_mbuf_alloc_failed(struct nfp_net_rxq *rxq) -- 1.8.3.1