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 E77EF43E7E; Mon, 15 Apr 2024 22:11:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 796C340A72; Mon, 15 Apr 2024 22:06:13 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 468F640647 for ; Mon, 15 Apr 2024 22:05:04 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 0752020FD8C4; Mon, 15 Apr 2024 13:04:47 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0752020FD8C4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1713211491; bh=aOu/MMfQrJR9upSI0nLQJHloQwxToEP3BzV7d2Mwkfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y2NFacJd14A5OFwxrTF6t9joUkaKkvSaAssY4XZhAv6TVY6exDBt6kRyLx0nPf2l9 F18wK9T9rD8YCim96Flkp03Iiul0YFb8AmXhlIfK8FPnPjfj8zOmGdE9av/FLOyYLq cQyFun7d/kPent6l+Z66zqh63YCSUom67xfuGjFI= 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 43/83] event/octeontx: move alignment attribute on types Date: Mon, 15 Apr 2024 13:04:05 -0700 Message-Id: <1713211485-9021-44-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/event/octeontx/ssovf_evdev.h | 8 ++++---- drivers/event/octeontx/timvf_evdev.h | 8 ++++---- drivers/event/octeontx/timvf_worker.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/event/octeontx/ssovf_evdev.h b/drivers/event/octeontx/ssovf_evdev.h index 8a4cb20..293eb85 100644 --- a/drivers/event/octeontx/ssovf_evdev.h +++ b/drivers/event/octeontx/ssovf_evdev.h @@ -134,7 +134,7 @@ enum ssovf_type { OCTEONTX_SSO_HWS, /* SSO hardware workslot vf */ }; -struct ssovf_evdev { +struct __rte_cache_aligned ssovf_evdev { OFFLOAD_FLAGS; /*Sequence should not be changed */ uint8_t max_event_queues; uint8_t max_event_ports; @@ -150,10 +150,10 @@ struct ssovf_evdev { uint8_t *rxq_pool_rcnt; uint16_t tim_ring_cnt; uint16_t *tim_ring_ids; -} __rte_cache_aligned; +}; /* Event port aka HWS */ -struct ssows { +struct __rte_cache_aligned ssows { uint8_t cur_tt; uint8_t cur_grp; uint8_t swtag_req; @@ -162,7 +162,7 @@ struct ssows { uint8_t *grps[SSO_MAX_VHGRP]; uint8_t port; void *lookup_mem; -} __rte_cache_aligned; +}; static inline struct ssovf_evdev * ssovf_pmd_priv(const struct rte_eventdev *eventdev) diff --git a/drivers/event/octeontx/timvf_evdev.h b/drivers/event/octeontx/timvf_evdev.h index cef02cd..e7a63e4 100644 --- a/drivers/event/octeontx/timvf_evdev.h +++ b/drivers/event/octeontx/timvf_evdev.h @@ -123,7 +123,7 @@ enum timvf_clk_src { }; /* TIM_MEM_BUCKET */ -struct tim_mem_bucket { +struct __rte_aligned(8) tim_mem_bucket { uint64_t first_chunk; union { uint64_t w1; @@ -139,7 +139,7 @@ struct tim_mem_bucket { }; uint64_t current_chunk; uint64_t pad; -} __rte_packed __rte_aligned(8); +} __rte_packed; struct tim_mem_entry { uint64_t w0; @@ -160,7 +160,7 @@ struct timvf_ctrl_reg { struct tim_mem_bucket * const bkt, struct timvf_ring * const timr); -struct timvf_ring { +struct __rte_cache_aligned timvf_ring { bkt_id get_target_bkt; refill_chunk refill_chunk; struct rte_reciprocal_u64 fast_div; @@ -178,7 +178,7 @@ struct timvf_ring { uint64_t nb_timers; enum timvf_clk_src clk_src; uint16_t tim_ring_id; -} __rte_cache_aligned; +}; static __rte_always_inline uint32_t bkt_mod(const uint32_t rel_bkt, const uint32_t nb_bkts) diff --git a/drivers/event/octeontx/timvf_worker.c b/drivers/event/octeontx/timvf_worker.c index 50790e1..feb7c4d 100644 --- a/drivers/event/octeontx/timvf_worker.c +++ b/drivers/event/octeontx/timvf_worker.c @@ -146,7 +146,7 @@ uint16_t idx; uint16_t arr_idx = 0; struct timvf_ring *timr = adptr->data->adapter_priv; - struct tim_mem_entry entry[TIMVF_MAX_BURST] __rte_cache_aligned; + alignas(RTE_CACHE_LINE_SIZE) struct tim_mem_entry entry[TIMVF_MAX_BURST]; if (unlikely(!timeout_tick || timeout_tick >= timr->nb_bkts)) { const enum rte_event_timer_state state = timeout_tick ? -- 1.8.3.1