From patchwork Mon Apr 15 20:03:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 139302 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 3BF2F43E7E; Mon, 15 Apr 2024 22:05:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF77840A76; Mon, 15 Apr 2024 22:04:59 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id E37C8402C4 for ; Mon, 15 Apr 2024 22:04:48 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id AD54820FD43F; Mon, 15 Apr 2024 13:04:46 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com AD54820FD43F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1713211486; bh=Kkr/JEH85TIeVpRagOlL4V24yP6GHO/yBauQcsPEayc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B0SAdoKtwfhkZKWtd50CLAV07NHc7++W7+wQkiTXeqhcDRRc+ctBmptfc6VZ14GSN Ffiu+lBAvVVh4MUzgx4gwoBxkZoBeXcuFbmTYn9+86CawsUs9BPGVld+dekd5GNIit /jCbVxTNZMainvxbdnWei9njm0Ipy8au8waxOzfo= 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 07/83] net/cxgbe: move alignment attribute on types Date: Mon, 15 Apr 2024 13:03:29 -0700 Message-Id: <1713211485-9021-8-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/cxgbe/base/adapter.h | 14 +++++++------- drivers/net/cxgbe/cxgbe_ofld.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/cxgbe/base/adapter.h b/drivers/net/cxgbe/base/adapter.h index 7bee5cf..d490c6f 100644 --- a/drivers/net/cxgbe/base/adapter.h +++ b/drivers/net/cxgbe/base/adapter.h @@ -155,12 +155,12 @@ struct sge_eth_rx_stats { /* Ethernet rx queue statistics */ u64 rx_drops; /* # of packets dropped due to no mem */ }; -struct sge_eth_rxq { /* a SW Ethernet Rx queue */ +struct __rte_cache_aligned sge_eth_rxq { /* a SW Ethernet Rx queue */ unsigned int flags; /* flags for state of the queue */ struct sge_rspq rspq; struct sge_fl fl; struct sge_eth_rx_stats stats; -} __rte_cache_aligned; +}; /* * Currently there are two types of coalesce WR. Type 0 needs 48 bytes per @@ -252,7 +252,7 @@ struct sge_eth_tx_stats { /* Ethernet tx queue statistics */ u64 coal_pkts; /* # of coalesced packets */ }; -struct sge_eth_txq { /* state for an SGE Ethernet Tx queue */ +struct __rte_cache_aligned sge_eth_txq { /* state for an SGE Ethernet Tx queue */ struct sge_txq q; struct rte_eth_dev *eth_dev; /* port that this queue belongs to */ struct rte_eth_dev_data *data; @@ -260,21 +260,21 @@ struct sge_eth_txq { /* state for an SGE Ethernet Tx queue */ rte_spinlock_t txq_lock; unsigned int flags; /* flags for state of the queue */ -} __rte_cache_aligned; +}; -struct sge_ctrl_txq { /* State for an SGE control Tx queue */ +struct __rte_cache_aligned sge_ctrl_txq { /* State for an SGE control Tx queue */ struct sge_txq q; /* txq */ struct adapter *adapter; /* adapter associated with this queue */ rte_spinlock_t ctrlq_lock; /* control queue lock */ u8 full; /* the Tx ring is full */ u64 txp; /* number of transmits */ struct rte_mempool *mb_pool; /* mempool to generate ctrl pkts */ -} __rte_cache_aligned; +}; struct sge { struct sge_eth_txq *ethtxq; struct sge_eth_rxq *ethrxq; - struct sge_rspq fw_evtq __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) struct sge_rspq fw_evtq; struct sge_ctrl_txq ctrlq[MAX_CTRL_QUEUES]; u16 max_ethqsets; /* # of available Ethernet queue sets */ diff --git a/drivers/net/cxgbe/cxgbe_ofld.h b/drivers/net/cxgbe/cxgbe_ofld.h index 33697c7..7a4e30d 100644 --- a/drivers/net/cxgbe/cxgbe_ofld.h +++ b/drivers/net/cxgbe/cxgbe_ofld.h @@ -65,7 +65,7 @@ struct tid_info { u32 hash_tids_in_use; u32 conns_in_use; - rte_spinlock_t atid_lock __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) rte_spinlock_t atid_lock; rte_spinlock_t ftid_lock; };