From patchwork Mon Apr 15 20:03:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 139322 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 341DB43E7E; Mon, 15 Apr 2024 22:08:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6E4241140; Mon, 15 Apr 2024 22:05:26 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id E3CF4406A2 for ; Mon, 15 Apr 2024 22:04:54 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 4DDE420FD479; Mon, 15 Apr 2024 13:04:46 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4DDE420FD479 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1713211488; bh=j0QMT+KUo+c8PbjeUCrBJ+hj4XY/Y/nmWduuodqPJQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=njnrSLUcO7EaDUHvAx1SwWSnSxRKmXfoXOe9c48xLOzcJCh3sxEAzC8VibRv/idXb ScUHsZpJBBCl223FOrh4STlL0WoLfVQ5xsOq4WbPgSIBwFee61meriM1/0lTfzL70l qShErNONrCLghZs7iQMG93dNtkLU/bMm5HQLT+q0= 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 27/83] net/octeontx: move alignment attribute on types Date: Mon, 15 Apr 2024 13:03:49 -0700 Message-Id: <1713211485-9021-28-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/octeontx/octeontx_ethdev.c | 4 ++-- drivers/net/octeontx/octeontx_ethdev.h | 12 ++++++------ drivers/net/octeontx/octeontx_rxtx.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c index bec54fd..e397136 100644 --- a/drivers/net/octeontx/octeontx_ethdev.c +++ b/drivers/net/octeontx/octeontx_ethdev.c @@ -36,9 +36,9 @@ #define OCTEONTX_QLM_MODE_SGMII 7 #define OCTEONTX_QLM_MODE_XFI 12 -struct evdev_priv_data { +struct __rte_cache_aligned evdev_priv_data { OFFLOAD_FLAGS; /*Sequence should not be changed */ -} __rte_cache_aligned; +}; struct octeontx_vdev_init_params { uint8_t nr_port; diff --git a/drivers/net/octeontx/octeontx_ethdev.h b/drivers/net/octeontx/octeontx_ethdev.h index 7e04fad..efd6cf5 100644 --- a/drivers/net/octeontx/octeontx_ethdev.h +++ b/drivers/net/octeontx/octeontx_ethdev.h @@ -105,7 +105,7 @@ struct octeontx_fc_info { }; /* Octeontx ethdev nic */ -struct octeontx_nic { +struct __rte_cache_aligned octeontx_nic { struct rte_eth_dev *dev; int node; int port_id; @@ -145,15 +145,15 @@ struct octeontx_nic { int print_flag; struct octeontx_fc_info fc; bool reconfigure; -} __rte_cache_aligned; +}; -struct octeontx_txq { +struct __rte_cache_aligned octeontx_txq { uint16_t queue_id; octeontx_dq_t dq; struct rte_eth_dev *eth_dev; -} __rte_cache_aligned; +}; -struct octeontx_rxq { +struct __rte_cache_aligned octeontx_rxq { uint16_t queue_id; uint16_t port_id; uint8_t evdev; @@ -161,7 +161,7 @@ struct octeontx_rxq { uint16_t ev_queues; uint16_t ev_ports; struct rte_mempool *pool; -} __rte_cache_aligned; +}; void octeontx_set_tx_function(struct rte_eth_dev *dev); diff --git a/drivers/net/octeontx/octeontx_rxtx.h b/drivers/net/octeontx/octeontx_rxtx.h index b6e3515..cd581f5 100644 --- a/drivers/net/octeontx/octeontx_rxtx.h +++ b/drivers/net/octeontx/octeontx_rxtx.h @@ -71,7 +71,7 @@ struct octeontx_send_hdr_s { union octeontx_send_hdr_w1_u w1; }; -static const uint32_t __rte_cache_aligned +static const alignas(RTE_CACHE_LINE_SIZE) uint32_t ptype_table[PTYPE_SIZE][PTYPE_SIZE][PTYPE_SIZE] = { [LC_NONE][LE_NONE][LF_NONE] = RTE_PTYPE_UNKNOWN, [LC_NONE][LE_NONE][LF_IPSEC_ESP] = RTE_PTYPE_UNKNOWN,