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 DA4D245F25; Mon, 23 Dec 2024 20:13:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2437B4067B; Mon, 23 Dec 2024 20:12:36 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 52579402AB for ; Mon, 23 Dec 2024 20:12:16 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 6164A206ADDF; Mon, 23 Dec 2024 11:12:14 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 6164A206ADDF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1734981135; bh=qT0EVX8lksuKicrf4DvHVK/hk9y1Rk5hkKflLzDQ+I0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GomQNBWyTvyorZ0O1vLylN7LEEmb8IHGUG4PukZcevNLtGtkNT9MPX2a5n13dhwQ1 fPfW+/CJU0xi9eLnHYup9l2tPQ0DW3XcTPqxFvX4wFY5PMKi64MHGadS0gavoL4jRG 59Og5bU9yObsnLN21O+Fr6fLXDduPnRoV7f+2Tvg= From: Andre Muezerie To: roretzla@linux.microsoft.com Cc: aman.deep.singh@intel.com, anatoly.burakov@intel.com, bruce.richardson@intel.com, byron.marohn@intel.com, conor.walsh@intel.com, cristian.dumitrescu@intel.com, david.hunt@intel.com, dev@dpdk.org, dsosnowski@nvidia.com, gakhil@marvell.com, jerinj@marvell.com, jingjing.wu@intel.com, kirill.rybalchenko@intel.com, konstantin.v.ananyev@yandex.ru, matan@nvidia.com, orika@nvidia.com, radu.nicolau@intel.com, ruifeng.wang@arm.com, sameh.gobriel@intel.com, sivaprasad.tummala@amd.com, skori@marvell.com, stephen@networkplumber.org, suanmingm@nvidia.com, vattunuru@marvell.com, viacheslavo@nvidia.com, vladimir.medvedkin@intel.com, yipeng1.wang@intel.com, Andre Muezerie Subject: [PATCH v7 17/29] drivers/vdpa: replace packed attributes Date: Mon, 23 Dec 2024 11:11:50 -0800 Message-Id: <1734981122-4729-18-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1734981122-4729-1-git-send-email-andremue@linux.microsoft.com> References: <1710968771-16435-1-git-send-email-roretzla@linux.microsoft.com> <1734981122-4729-1-git-send-email-andremue@linux.microsoft.com> 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 MSVC struct packing is not compatible with GCC. Replace macro __rte_packed with __rte_packed_begin to push existing pack value and set packing to 1-byte and macro __rte_packed_end to restore the pack value prior to the push. Macro __rte_packed_end is deliberately utilized to trigger a MSVC compiler warning if no existing packing has been pushed allowing easy identification of locations where the __rte_packed_begin is missing. Signed-off-by: Andre Muezerie Reviewed-by: Tyler Retzlaff --- drivers/vdpa/ifc/base/ifcvf.h | 4 ++-- drivers/vdpa/mlx5/mlx5_vdpa.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h index 04c81c8196..7be1596556 100644 --- a/drivers/vdpa/ifc/base/ifcvf.h +++ b/drivers/vdpa/ifc/base/ifcvf.h @@ -115,11 +115,11 @@ struct ifcvf_pci_common_cfg { u32 queue_used_hi; }; -struct ifcvf_net_config { +__rte_packed_begin struct ifcvf_net_config { u8 mac[6]; u16 status; u16 max_virtqueue_pairs; -} __rte_packed; +} __rte_packed_end; struct ifcvf_pci_mem_resource { u64 phys_addr; /**< Physical address, 0 if not resource. */ diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h index e156520172..6f25eea641 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h @@ -90,13 +90,13 @@ enum mlx5_vdpa_task_type { }; /* Generic task information and size must be multiple of 4B. */ -struct __rte_aligned(4) mlx5_vdpa_task { +__rte_packed_begin struct __rte_aligned(4) mlx5_vdpa_task { struct mlx5_vdpa_priv *priv; enum mlx5_vdpa_task_type type; RTE_ATOMIC(uint32_t) *remaining_cnt; RTE_ATOMIC(uint32_t) *err_cnt; uint32_t idx; -} __rte_packed; +} __rte_packed_end; /* Generic mlx5_vdpa_c_thread information. */ struct mlx5_vdpa_c_thread { -- 2.47.0.vfs.0.3