diff mbox series

[v4,20/39] rcu: use C11 alignas

Message ID	1707928564-28796-21-git-send-email-roretzla@linux.microsoft.com (mailing list archive)
State	Superseded, archived
Delegated to:	David Marchand
Headers	From: Tyler Retzlaff <roretzla@linux.microsoft.com> To: dev@dpdk.org Cc: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>, Bruce Richardson <bruce.richardson@intel.com>, Chengwen Feng <fengchengwen@huawei.com>, Cristian Dumitrescu <cristian.dumitrescu@intel.com>, David Christensen <drc@linux.vnet.ibm.com>, David Hunt <david.hunt@intel.com>, Ferruh Yigit <ferruh.yigit@amd.com>, Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>, Jasvinder Singh <jasvinder.singh@intel.com>, Jerin Jacob <jerinj@marvell.com>, Kevin Laatz <kevin.laatz@intel.com>, Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>, Min Zhou <zhoumin@loongson.cn>, Ruifeng Wang <ruifeng.wang@arm.com>, Sameh Gobriel <sameh.gobriel@intel.com>, Stanislaw Kardach <kda@semihalf.com>, Thomas Monjalon <thomas@monjalon.net>, Vladimir Medvedkin <vladimir.medvedkin@intel.com>, Yipeng Wang <yipeng1.wang@intel.com>, Tyler Retzlaff <roretzla@linux.microsoft.com> Subject: [PATCH v4 20/39] rcu: use C11 alignas Date: Wed, 14 Feb 2024 08:35:45 -0800 Message-Id: <1707928564-28796-21-git-send-email-roretzla@linux.microsoft.com> In-Reply-To: <1707928564-28796-1-git-send-email-roretzla@linux.microsoft.com> References: <1707873986-29352-1-git-send-email-roretzla@linux.microsoft.com> <1707928564-28796-1-git-send-email-roretzla@linux.microsoft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	use C11 alignas and normalize type alignment \| [v4,00/39] use C11 alignas and normalize type alignment [v4,01/39] eal: use C11 alignas [v4,02/39] eal: redefine macro to be integer literal for MSVC [v4,03/39] stack: use C11 alignas [v4,04/39] sched: use C11 alignas [v4,05/39] ring: use C11 alignas [v4,06/39] pipeline: use C11 alignas [v4,07/39] net: use C11 alignas [v4,08/39] mbuf: use C11 alignas [v4,09/39] hash: use C11 alignas [v4,10/39] eventdev: use C11 alignas [v4,11/39] ethdev: use C11 alignas [v4,12/39] dmadev: use C11 alignas [v4,13/39] distributor: use C11 alignas [v4,14/39] acl: use C11 alignas [v4,15/39] vhost: use C11 alignas [v4,16/39] timer: use C11 alignas [v4,17/39] table: use C11 alignas [v4,18/39] reorder: use C11 alignas [v4,19/39] regexdev: use C11 alignas [v4,20/39] rcu: use C11 alignas [v4,21/39] power: use C11 alignas [v4,22/39] rawdev: use C11 alignas [v4,23/39] port: use C11 alignas [v4,24/39] pdcp: use C11 alignas [v4,25/39] node: use C11 alignas [v4,26/39] mldev: use C11 alignas [v4,27/39] mempool: use C11 alignas [v4,28/39] member: use C11 alignas [v4,29/39] lpm: use C11 alignas [v4,30/39] ipsec: use C11 alignas [v4,31/39] jobstats: use C11 alignas [v4,32/39] bpf: use C11 alignas [v4,33/39] compressdev: use C11 alignas [v4,34/39] cryptodev: use C11 alignas [v4,35/39] dispatcher: use C11 alignas [v4,36/39] fib: use C11 alignas [v4,37/39] gpudev: use C11 alignas [v4,38/39] graph: use C11 alignas [v4,39/39] ip_frag: use C11 alignas

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Tyler Retzlaff Feb. 14, 2024, 4:35 p.m. UTC

* Move __rte_aligned from the end of {struct,union} definitions to
  be between {struct,union} and tag.

  The placement between {struct,union} and the tag allows the desired
  alignment to be imparted on the type regardless of the toolchain being
  used for all of GCC, LLVM, MSVC compilers building both C and C++.

* Replace use of __rte_aligned(a) on variables/fields with alignas(a).

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 lib/rcu/rte_rcu_qsbr.h | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff mbox series

Patch

diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 23c9f89..f6e6ab3 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -21,6 +21,8 @@ 
  * entered quiescent state.
  */
 
+#include <stdalign.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -69,7 +71,7 @@ 
 #define RTE_QSBR_THRID_INVALID 0xffffffff
 
 /* Worker thread counter */
-struct rte_rcu_qsbr_cnt {
+struct __rte_cache_aligned rte_rcu_qsbr_cnt {
 	RTE_ATOMIC(uint64_t) cnt;
 	/**< Quiescent state counter. Value 0 indicates the thread is offline
 	 *   64b counter is used to avoid adding more code to address
@@ -78,7 +80,7 @@  struct rte_rcu_qsbr_cnt {
 	 */
 	RTE_ATOMIC(uint32_t) lock_cnt;
 	/**< Lock counter. Used when RTE_LIBRTE_RCU_DEBUG is enabled */
-} __rte_cache_aligned;
+};
 
 #define __RTE_QSBR_CNT_THR_OFFLINE 0
 #define __RTE_QSBR_CNT_INIT 1
@@ -91,28 +93,28 @@  struct rte_rcu_qsbr_cnt {
  * 1) Quiescent state counter array
  * 2) Register thread ID array
  */
-struct rte_rcu_qsbr {
-	RTE_ATOMIC(uint64_t) token __rte_cache_aligned;
+struct __rte_cache_aligned rte_rcu_qsbr {
+	alignas(RTE_CACHE_LINE_SIZE) RTE_ATOMIC(uint64_t) token;
 	/**< Counter to allow for multiple concurrent quiescent state queries */
 	RTE_ATOMIC(uint64_t) acked_token;
 	/**< Least token acked by all the threads in the last call to
 	 *   rte_rcu_qsbr_check API.
 	 */
 
-	uint32_t num_elems __rte_cache_aligned;
+	alignas(RTE_CACHE_LINE_SIZE) uint32_t num_elems;
 	/**< Number of elements in the thread ID array */
 	RTE_ATOMIC(uint32_t) num_threads;
 	/**< Number of threads currently using this QS variable */
 	uint32_t max_threads;
 	/**< Maximum number of threads using this QS variable */
 
-	struct rte_rcu_qsbr_cnt qsbr_cnt[0] __rte_cache_aligned;
+	alignas(RTE_CACHE_LINE_SIZE) struct rte_rcu_qsbr_cnt qsbr_cnt[0];
 	/**< Quiescent state counter array of 'max_threads' elements */
 
 	/**< Registered thread IDs are stored in a bitmap array,
 	 *   after the quiescent state counter array.
 	 */
-} __rte_cache_aligned;
+};
 
 /**
  * Call back function called to free the resources.