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 D0B0745F25; Mon, 23 Dec 2024 20:14:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4147540A77; Mon, 23 Dec 2024 20:12:47 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 09C9B402CC for ; Mon, 23 Dec 2024 20:12:17 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id DDE47206ADE8; Mon, 23 Dec 2024 11:12:14 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com DDE47206ADE8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1734981135; bh=easb5FMgGCSLSKxNNv3Ssw/ezk2CXf9tzzXKBtDEFlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZKaCPzX9iVdd8xLSZJR39k5Df2Q+DYJ0wZMOZWHP7knMQsml8nBvgHy+oQg99VAEJ M1U01oslNPnlMd+z8UsoMEzoZzLbgM/e567Z+TE/UPHHcLxb1aBk6I2M+SbJ1r6B8J Mhc/5Q3/ohcdBg8IQs9voRSe/4+X/HZmnIOl0tvQ= 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 26/29] lib/ipsec: replace packed attributes Date: Mon, 23 Dec 2024 11:11:59 -0800 Message-Id: <1734981122-4729-27-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 --- lib/ipsec/crypto.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/ipsec/crypto.h b/lib/ipsec/crypto.h index 93d20aaaa0..bbadd38257 100644 --- a/lib/ipsec/crypto.h +++ b/lib/ipsec/crypto.h @@ -15,11 +15,11 @@ * AES-CTR counter block format. */ -struct aesctr_cnt_blk { +__rte_packed_begin struct aesctr_cnt_blk { uint32_t nonce; uint64_t iv; uint32_t cnt; -} __rte_packed; +} __rte_packed_end; /* * CHACHA20-POLY1305 devices have some specific requirements @@ -27,13 +27,13 @@ struct aesctr_cnt_blk { * Ideally that to be done by the driver itself. */ -struct aead_chacha20_poly1305_iv { +__rte_packed_begin struct aead_chacha20_poly1305_iv { uint32_t salt; uint64_t iv; uint32_t cnt; -} __rte_packed; +} __rte_packed_end; -struct aead_chacha20_poly1305_aad { +__rte_packed_begin struct aead_chacha20_poly1305_aad { uint32_t spi; /* * RFC 4106, section 5: @@ -45,25 +45,25 @@ struct aead_chacha20_poly1305_aad { uint64_t u64; } sqn; uint32_t align0; /* align to 16B boundary */ -} __rte_packed; +} __rte_packed_end; -struct chacha20_poly1305_esph_iv { +__rte_packed_begin struct chacha20_poly1305_esph_iv { struct rte_esp_hdr esph; uint64_t iv; -} __rte_packed; +} __rte_packed_end; /* * AES-GCM devices have some specific requirements for IV and AAD formats. * Ideally that to be done by the driver itself. */ -struct aead_gcm_iv { +__rte_packed_begin struct aead_gcm_iv { uint32_t salt; uint64_t iv; uint32_t cnt; -} __rte_packed; +} __rte_packed_end; -struct aead_gcm_aad { +__rte_packed_begin struct aead_gcm_aad { uint32_t spi; /* * RFC 4106, section 5: @@ -75,34 +75,34 @@ struct aead_gcm_aad { uint64_t u64; } sqn; uint32_t align0; /* align to 16B boundary */ -} __rte_packed; +} __rte_packed_end; -struct gcm_esph_iv { +__rte_packed_begin struct gcm_esph_iv { struct rte_esp_hdr esph; uint64_t iv; -} __rte_packed; +} __rte_packed_end; /* * AES-CCM devices have some specific requirements for IV and AAD formats. * Ideally that to be done by the driver itself. */ -union aead_ccm_salt { +__rte_packed_begin union aead_ccm_salt { uint32_t salt; struct inner { uint8_t salt8[3]; uint8_t ccm_flags; } inner; -} __rte_packed; +} __rte_packed_end; -struct aead_ccm_iv { +__rte_packed_begin struct aead_ccm_iv { uint8_t ccm_flags; uint8_t salt[3]; uint64_t iv; uint32_t cnt; -} __rte_packed; +} __rte_packed_end; -struct aead_ccm_aad { +__rte_packed_begin struct aead_ccm_aad { uint8_t padding[18]; uint32_t spi; /* @@ -115,12 +115,12 @@ struct aead_ccm_aad { uint64_t u64; } sqn; uint32_t align0; /* align to 16B boundary */ -} __rte_packed; +} __rte_packed_end; -struct ccm_esph_iv { +__rte_packed_begin struct ccm_esph_iv { struct rte_esp_hdr esph; uint64_t iv; -} __rte_packed; +} __rte_packed_end; static inline void -- 2.47.0.vfs.0.3