diff mbox series

[v6,16/30] drivers/regex: replace packed attributes

Message ID	1732668761-5556-17-git-send-email-andremue@linux.microsoft.com (mailing list archive)
State	Superseded
Delegated to:	David Marchand
Headers	From: Andre Muezerie <andremue@linux.microsoft.com> 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 <andremue@linux.microsoft.com> Subject: [PATCH v6 16/30] drivers/regex: replace packed attributes Date: Tue, 26 Nov 2024 16:52:27 -0800 Message-Id: <1732668761-5556-17-git-send-email-andremue@linux.microsoft.com> In-Reply-To: <1732668761-5556-1-git-send-email-andremue@linux.microsoft.com> References: <1710968771-16435-1-git-send-email-roretzla@linux.microsoft.com> <1732668761-5556-1-git-send-email-andremue@linux.microsoft.com> Precedence: list Errors-To: dev-bounces@dpdk.org
Series	fix packing of structs when building with MSVC \| [v6,00/30] fix packing of structs when building with MSVC [v6,01/30] devtools: check packed attributes [v6,02/30] eal/include: add new packing macros [v6,03/30] app/test-pmd: remove unnecessary packed attributes [v6,04/30] app/test: replace packed attributes [v6,05/30] doc/guides: replace packed attributes [v6,06/30] drivers/baseband: replace packed attributes [v6,07/30] drivers/bus: replace packed attributes [v6,08/30] drivers/common: replace packed attributes [v6,09/30] drivers/compress: replace packed attributes [v6,10/30] drivers/crypto: replace packed attributes [v6,11/30] drivers/dma: replace packed attributes [v6,12/30] drivers/event: replace packed attributes [v6,13/30] drivers/mempool: replace packed attributes [v6,14/30] drivers/net: replace packed attributes [v6,15/30] drivers/raw: replace packed attributes [v6,16/30] drivers/regex: replace packed attributes [v6,17/30] drivers/vdpa: replace packed attributes [v6,18/30] examples/common: replace packed attributes [v6,19/30] examples/ip-pipeline: remove packed attributes [v6,20/30] examples/ipsec_secgw: replace packed attributes [v6,21/30] examples/l3fwd-power: replace packed attributes [v6,22/30] examples/l3fwd: replace packed attributes [v6,23/30] examples/ptpclient: replace packed attributes [v6,24/30] examples/vhost_blk: replace packed attributes [v6,25/30] lib/eal: replace packed attributes [v6,26/30] lib/ipsec: replace packed attributes [v6,27/30] lib/net: replace packed attributes [v6,28/30] lib/pipeline: replace packed attributes [v6,29/30] lib/vhost: replace packed attributes [v6,30/30] lib/eal: remove __rte_packed

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Andre Muezerie Nov. 27, 2024, 12:52 a.m. UTC

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 <andremue@linux.microsoft.com>
---
 drivers/regex/cn9k/cn9k_regexdev.c |  4 ++--
 drivers/regex/mlx5/mlx5_rxp.h      | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

Comments

Tyler Retzlaff Dec. 5, 2024, 12:52 a.m. UTC | #1

On Tue, Nov 26, 2024 at 04:52:27PM -0800, Andre Muezerie wrote:
> 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 <andremue@linux.microsoft.com>
> ---

Reviewed-by: Tyler Retzlaff <roretzla@linux.microsoft.com>

diff mbox series

Patch

diff --git a/drivers/regex/cn9k/cn9k_regexdev.c b/drivers/regex/cn9k/cn9k_regexdev.c
index aa809ab5bf..33de38e7f9 100644
--- a/drivers/regex/cn9k/cn9k_regexdev.c
+++ b/drivers/regex/cn9k/cn9k_regexdev.c
@@ -40,12 +40,12 @@  struct ree_rule_db_entry {
 	uint64_t	value;
 };
 
-struct ree_rule_db {
+__rte_packed_begin struct ree_rule_db {
 	uint32_t version;
 	uint32_t revision;
 	uint32_t number_of_entries;
 	struct ree_rule_db_entry entries[];
-} __rte_packed;
+} __rte_packed_end;
 
 static void
 qp_memzone_name_get(char *name, int size, int dev_id, int qp_id)
diff --git a/drivers/regex/mlx5/mlx5_rxp.h b/drivers/regex/mlx5/mlx5_rxp.h
index b38b53cc14..6deb25e13d 100644
--- a/drivers/regex/mlx5/mlx5_rxp.h
+++ b/drivers/regex/mlx5/mlx5_rxp.h
@@ -42,14 +42,14 @@ 
 #define MLX5_RXP_RESP_STATUS_PMI_EOJ (1 << 14)
 
 /* This describes the header the RXP expects for any search data. */
-struct mlx5_rxp_job_desc {
+__rte_packed_begin struct mlx5_rxp_job_desc {
 	uint32_t job_id;
 	uint16_t ctrl;
 	uint16_t len;
 	uint16_t subset[4];
-} __rte_packed;
+} __rte_packed_end;
 
-struct mlx5_rxp_response_desc {
+__rte_packed_begin struct mlx5_rxp_response_desc {
 	uint32_t job_id;
 	uint16_t status;
 	uint8_t	detected_match_count;
@@ -58,13 +58,13 @@  struct mlx5_rxp_response_desc {
 	uint16_t instruction_count;
 	uint16_t latency_count;
 	uint16_t pmi_min_byte_ptr;
-} __rte_packed;
+} __rte_packed_end;
 
-struct mlx5_rxp_match_tuple {
+__rte_packed_begin struct mlx5_rxp_match_tuple {
 	uint32_t rule_id;
 	uint16_t start_ptr;
 	uint16_t length;
-} __rte_packed;
+} __rte_packed_end;
 
 struct mlx5_rxp_response {
 	struct mlx5_rxp_response_desc header;
@@ -115,11 +115,11 @@  struct mlx5_rxp_rof {
 	struct mlx5_rxp_rof_entry *rof_entries;
 };
 
-struct mlx5_rxp_ctl_rules_pgm {
+__rte_packed_begin struct mlx5_rxp_ctl_rules_pgm {
 	struct mlx5_rxp_ctl_hdr hdr;
 	uint32_t count;
 	struct mlx5_rxp_rof_entry rules[];
-} __rte_packed;
+} __rte_packed_end;
 
 /* RXP programming mode setting. */
 enum mlx5_rxp_program_mode {