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 188C745D31; Wed, 27 Nov 2024 01:55:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BDC5427CD; Wed, 27 Nov 2024 01:53:36 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id AFC09427C2 for ; Wed, 27 Nov 2024 01:53:04 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 4EAAD2057221; Tue, 26 Nov 2024 16:53:02 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4EAAD2057221 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1732668783; bh=hlOdXBQcu/hoTQMUSAPhKQmjG0TghtbClEoUYjcAlIM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lPrSmeFwP71qzL66kflFwmMSXHDSFGsyzh0Umll+UWflTV/BhAeg6C35sqnGpxAqM RRA/D9+9dIJu7pxgh0Bg79BkutqBfb7RmC3aiLuAPVcHyEI/J1hVbBTwGgVIlL5rna Df9S5B5t1wUzFIt4SkppklJXkZ7h5L1RPoCKKb9I= 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 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> X-Mailer: git-send-email 1.8.3.1 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> 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 --- drivers/regex/cn9k/cn9k_regexdev.c | 4 ++-- drivers/regex/mlx5/mlx5_rxp.h | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) 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 { -- 2.34.1