diff mbox series

[v3,15/39] vhost: use C11 alignas

Message ID	1707894382-307-16-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 v3 15/39] vhost: use C11 alignas Date: Tue, 13 Feb 2024 23:05:58 -0800 Message-Id: <1707894382-307-16-git-send-email-roretzla@linux.microsoft.com> In-Reply-To: <1707894382-307-1-git-send-email-roretzla@linux.microsoft.com> References: <1707873986-29352-1-git-send-email-roretzla@linux.microsoft.com> <1707894382-307-1-git-send-email-roretzla@linux.microsoft.com> Precedence: list Errors-To: dev-bounces@dpdk.org
Series	use C11 alignas and normalize type alignment \| [v3,00/39] use C11 alignas and normalize type alignment [v3,01/39] eal: use C11 alignas [v3,02/39] eal: redefine macro to be integer literal for MSVC [v3,03/39] stack: use C11 alignas [v3,04/39] sched: use C11 alignas [v3,05/39] ring: use C11 alignas [v3,06/39] pipeline: use C11 alignas [v3,07/39] net: use C11 alignas [v3,08/39] mbuf: remove unnecessary explicit alignment [v3,09/39] hash: use C11 alignas [v3,10/39] eventdev: use C11 alignas [v3,11/39] ethdev: use C11 alignas [v3,12/39] dmadev: use C11 alignas [v3,13/39] distributor: use C11 alignas [v3,14/39] acl: use C11 alignas [v3,15/39] vhost: use C11 alignas [v3,16/39] timer: use C11 alignas [v3,17/39] table: use C11 alignas [v3,18/39] reorder: use C11 alignas [v3,19/39] regexdev: use C11 alignas [v3,20/39] rcu: use C11 alignas [v3,21/39] power: use C11 alignas [v3,22/39] rawdev: use C11 alignas [v3,23/39] port: use C11 alignas [v3,24/39] pdcp: use C11 alignas [v3,25/39] node: use C11 alignas [v3,26/39] mldev: use C11 alignas [v3,27/39] mempool: use C11 alignas [v3,28/39] member: use C11 alignas [v3,29/39] lpm: use C11 alignas [v3,30/39] ipsec: use C11 alignas [v3,31/39] jobstats: use C11 alignas [v3,32/39] bpf: use C11 alignas [v3,33/39] compressdev: use C11 alignas [v3,34/39] cryptodev: use C11 alignas [v3,35/39] dispatcher: use C11 alignas [v3,36/39] fib: use C11 alignas [v3,37/39] gpudev: use C11 alignas [v3,38/39] graph: use C11 alignas [v3,39/39] ip_frag: use C11 alignas

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Tyler Retzlaff Feb. 14, 2024, 7:05 a.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>
---
 lib/vhost/vhost.h        | 8 ++++----
 lib/vhost/vhost_crypto.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Maxime Coquelin Feb. 14, 2024, 10:37 a.m. UTC | #1

On 2/14/24 08:05, Tyler Retzlaff wrote:
> * 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>
> ---
>   lib/vhost/vhost.h        | 8 ++++----
>   lib/vhost/vhost_crypto.c | 4 ++--
>   2 files changed, 6 insertions(+), 6 deletions(-)
> 

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime

diff mbox series

Patch

diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index 0b13374..4d11f56 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -271,7 +271,7 @@  struct vhost_async {
 /**
  * Structure contains variables relevant to RX/TX virtqueues.
  */
-struct vhost_virtqueue {
+struct __rte_cache_aligned vhost_virtqueue {
 	union {
 		struct vring_desc	*desc;
 		struct vring_packed_desc   *desc_packed;
@@ -349,7 +349,7 @@  struct vhost_virtqueue {
 	struct virtqueue_stats	stats;
 
 	RTE_ATOMIC(bool) irq_pending;
-} __rte_cache_aligned;
+};
 
 /* Virtio device status as per Virtio specification */
 #define VIRTIO_DEVICE_STATUS_RESET		0x00
@@ -477,7 +477,7 @@  struct inflight_mem_info {
  * Device structure contains all configuration information relating
  * to the device.
  */
-struct virtio_net {
+struct __rte_cache_aligned virtio_net {
 	/* Frontend (QEMU) memory and memory region information */
 	struct rte_vhost_memory	*mem;
 	uint64_t		features;
@@ -536,7 +536,7 @@  struct virtio_net {
 	struct rte_vhost_user_extern_ops extern_ops;
 
 	struct vhost_backend_ops *backend_ops;
-} __rte_cache_aligned;
+};
 
 static inline void
 vq_assert_lock__(struct virtio_net *dev, struct vhost_virtqueue *vq, const char *func)
diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
index 3704fbb..eb4a158 100644
--- a/lib/vhost/vhost_crypto.c
+++ b/lib/vhost/vhost_crypto.c
@@ -190,7 +190,7 @@  static int get_iv_len(enum rte_crypto_cipher_algorithm algo)
  * one DPDK crypto device that deals with all crypto workloads. It is declared
  * here and defined in vhost_crypto.c
  */
-struct vhost_crypto {
+struct __rte_cache_aligned vhost_crypto {
 	/** Used to lookup DPDK Cryptodev Session based on VIRTIO crypto
 	 *  session ID.
 	 */
@@ -213,7 +213,7 @@  struct vhost_crypto {
 	struct virtio_net *dev;
 
 	uint8_t option;
-} __rte_cache_aligned;
+};
 
 struct vhost_crypto_writeback_data {
 	uint8_t *src;