From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 94E6243B38;
Wed, 14 Feb 2024 17:38:05 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4361C432C8;
Wed, 14 Feb 2024 17:36:30 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 19F44427DB
for <dev@dpdk.org>; Wed, 14 Feb 2024 17:36:08 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1086)
id B2ED920B200F; Wed, 14 Feb 2024 08:36:06 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B2ED920B200F
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1707928566;
bh=f2+7LaddPrlEKgP1XbpXgSCD3znULx7iwMKvg7y2HTc=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=romeDvXbGw9JA0PUfpLHiLfb1QCofMao35Y/e2qbUuulsKOVv5zUKFRp5GDtUjIgF
pYihQgjRqn64wkBSkoBJMgUSbzh96JBhZbnGZGzu3gLp4wvJ88rD+RrmMX9FjybwoU
v3mmmvTbjbXA5+hsMvhbUL8tYTBXtQAvKvPUKzac=
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 15/39] vhost: use C11 alignas
Date: Wed, 14 Feb 2024 08:35:40 -0800
Message-Id: <1707928564-28796-16-git-send-email-roretzla@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
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
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
* 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>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/vhost/vhost.h | 8 ++++----
lib/vhost/vhost_crypto.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
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;
--
1.8.3.1