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 7F3E945C82;
Tue, 5 Nov 2024 04:18:46 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id D159F42D66;
Tue, 5 Nov 2024 04:17:52 +0100 (CET)
Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182])
by mails.dpdk.org (Postfix) with ESMTP id 4CCD3427A4
for <dev@dpdk.org>; Tue, 5 Nov 2024 04:17:38 +0100 (CET)
Received: by linux.microsoft.com (Postfix, from userid 1213)
id E37BF2127C6B; Mon, 4 Nov 2024 19:17:36 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com E37BF2127C6B
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;
s=default; t=1730776656;
bh=tTt6GcszmD0PH2QKuRQ9sisKygmVcB07Nxge+txJ0gc=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=Br4Qzl2t5OtayxE7Ai9R9qvEVKPUyW9GgnB2t5qH26Ib4XG0tw6Fuxz0t58tbcuP1
0jwcxdgAnNlR/voNRqtbDlF5GEpeJryigPSiVpVHDPVk9fT0n/gOSshVLdkP72lbZr
5fjvCnFnbPadG0sF4EJmrIUGvhheNJThx2xgO7kM=
From: Andre Muezerie <andremue@linux.microsoft.com>
To: stephen@networkplumber.org
Cc: aman.deep.singh@intel.com, anatoly.burakov@intel.com,
andrew.rybchenko@oktetlabs.ru, bruce.richardson@intel.com, dev@dpdk.org,
dmitry.kozliuk@gmail.com, dsosnowski@nvidia.com, fanzhang.oss@gmail.com,
fengchengwen@huawei.com, ferruh.yigit@amd.com, gakhil@marvell.com,
harry.van.haaren@intel.com, hkalra@marvell.com,
honnappa.nagarahalli@arm.com, hujiayu.hu@foxmail.com,
jingjing.wu@intel.com, kevin.laatz@intel.com,
konstantin.v.ananyev@yandex.ru, matan@nvidia.com, mb@smartsharesystems.com,
orika@nvidia.com, pallavi.kadam@intel.com, reshma.pattan@intel.com,
roretzla@linux.microsoft.com, sameh.gobriel@intel.com,
suanmingm@nvidia.com, thomas@monjalon.net, vfialko@marvell.com,
viacheslavo@nvidia.com, vladimir.medvedkin@intel.com,
yipeng1.wang@intel.com
Subject: [PATCH v4 15/19] common/mlx5: remove use of VLAs for Windows built
code
Date: Mon, 4 Nov 2024 19:15:49 -0800
Message-Id: <1730776553-31277-16-git-send-email-andremue@linux.microsoft.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1730776553-31277-1-git-send-email-andremue@linux.microsoft.com>
References: <1713397319-26135-1-git-send-email-roretzla@linux.microsoft.com>
<1730776553-31277-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 <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
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
MSVC does not support VLAs, replace VLAs with standard C arrays
or alloca(). alloca() is available for all toolchain/platform
combinations officially supported by DPDK.
Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
drivers/common/mlx5/mlx5_common.h | 4 ++--
drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
index 1abd1e8239..f29f06a86e 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -125,10 +125,10 @@ mlx5_fp_debug_enabled(void)
/* Allocate a buffer on the stack and fill it with a printf format string. */
#define MKSTR(name, ...) \
int mkstr_size_##name = snprintf(NULL, 0, "" __VA_ARGS__); \
- char name[mkstr_size_##name + 1]; \
+ char *name = alloca(mkstr_size_##name + 1); \
\
memset(name, 0, mkstr_size_##name + 1); \
- snprintf(name, sizeof(name), "" __VA_ARGS__)
+ snprintf(name, mkstr_size_##name + 1, "" __VA_ARGS__)
enum {
PCI_VENDOR_ID_MELLANOX = 0x15b3,
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c
index 9710dcedd3..fbe528a9ea 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -284,10 +284,9 @@ mlx5_devx_cmd_flow_counter_query(struct mlx5_devx_obj *dcs,
void *cmd_comp,
uint64_t async_id)
{
- int out_len = MLX5_ST_SZ_BYTES(query_flow_counter_out) +
- MLX5_ST_SZ_BYTES(traffic_counter);
- uint32_t out[out_len];
+ uint32_t out[MLX5_ST_SZ_BYTES(query_flow_counter_out) + MLX5_ST_SZ_BYTES(traffic_counter)];
uint32_t in[MLX5_ST_SZ_DW(query_flow_counter_in)] = {0};
+ const int out_len = RTE_DIM(out);
void *stats;
int rc;
@@ -346,7 +345,7 @@ mlx5_devx_cmd_mkey_create(void *ctx,
int klm_num = attr->klm_num;
int in_size_dw = MLX5_ST_SZ_DW(create_mkey_in) +
(klm_num ? RTE_ALIGN(klm_num, 4) : 0) * MLX5_ST_SZ_DW(klm);
- uint32_t in[in_size_dw];
+ uint32_t *in = alloca(sizeof(uint32_t) * in_size_dw);
uint32_t out[MLX5_ST_SZ_DW(create_mkey_out)] = {0};
void *mkc;
struct mlx5_devx_obj *mkey = mlx5_malloc(MLX5_MEM_ZERO, sizeof(*mkey),
--
2.34.1