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 175B043E7E; Mon, 15 Apr 2024 22:05:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A574940DC9; Mon, 15 Apr 2024 22:05:02 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 7FE044027E for ; Mon, 15 Apr 2024 22:04:49 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id D437320FD443; Mon, 15 Apr 2024 13:04:46 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D437320FD443 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1713211486; bh=fF+ZJcyjRtlQcy1I9kYoT5jw+wyN6I83FV2+0iSvlxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YJZ69nB2QawaW7R7UsEg7eb3EgNKAZ10/4PVbUZmaoNWv4gW/wkdN1AEJM5RFkVha gj4vWBJ4wtGgU0CMXgnuka62Rfrc+2aeFUEe6KIcB6iPF82x1lvTVgHpNQrl2pNf0f OHbU3bT18qXVaROn9U7egmF2cGLSEiTotGaHAI9s= 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 09/83] net/ena: move alignment attribute on types Date: Mon, 15 Apr 2024 13:03:31 -0700 Message-Id: <1713211485-9021-10-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/ena/ena_ethdev.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h index 7513a3f..7d82d22 100644 --- a/drivers/net/ena/ena_ethdev.h +++ b/drivers/net/ena/ena_ethdev.h @@ -142,7 +142,7 @@ struct ena_stats_rx { u64 bad_req_id; }; -struct ena_ring { +struct __rte_cache_aligned ena_ring { u16 next_to_use; u16 next_to_clean; uint64_t last_cleanup_ticks; @@ -175,8 +175,7 @@ struct ena_ring { uint16_t rx_free_thresh; }; - struct ena_com_rx_buf_info ena_bufs[ENA_PKT_MAX_BUFS] - __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) struct ena_com_rx_buf_info ena_bufs[ENA_PKT_MAX_BUFS]; struct rte_mempool *mb_pool; unsigned int port_id; @@ -201,7 +200,7 @@ struct ena_ring { unsigned int numa_socket_id; uint32_t missing_tx_completion_threshold; -} __rte_cache_aligned; +}; enum ena_adapter_state { ENA_ADAPTER_STATE_FREE = 0, @@ -288,15 +287,15 @@ struct ena_adapter { /* OS defined structs */ struct rte_eth_dev_data *edev_data; - struct ena_com_dev ena_dev __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) struct ena_com_dev ena_dev; /* TX */ - struct ena_ring tx_ring[ENA_MAX_NUM_QUEUES] __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) struct ena_ring tx_ring[ENA_MAX_NUM_QUEUES]; u32 max_tx_ring_size; u16 max_tx_sgl_size; /* RX */ - struct ena_ring rx_ring[ENA_MAX_NUM_QUEUES] __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) struct ena_ring rx_ring[ENA_MAX_NUM_QUEUES]; u32 max_rx_ring_size; u16 max_rx_sgl_size; @@ -357,9 +356,9 @@ struct ena_adapter { * Helper variables for holding the information about the supported * metrics. */ - uint64_t metrics_stats[ENA_MAX_CUSTOMER_METRICS] __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) uint64_t metrics_stats[ENA_MAX_CUSTOMER_METRICS]; uint16_t metrics_num; - struct ena_stats_srd srd_stats __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) struct ena_stats_srd srd_stats; }; int ena_mp_indirect_table_set(struct ena_adapter *adapter); -- 1.8.3.1