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 333F44605F; Fri, 10 Jan 2025 21:25:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3754842D80; Fri, 10 Jan 2025 21:24:23 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 1241A427C0 for ; Fri, 10 Jan 2025 21:24:01 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 9F432203D601; Fri, 10 Jan 2025 12:23:59 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9F432203D601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1736540639; bh=exKy/3ppc0MuX89Kjv2WBefD7aSm9N0CZXhVgRi5TEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bvn528roR3yPACvzwOma1aDENNYdtNapiMsQ+P5Wr8ia3E0Wbg5b6kTNhWwArY/49 ysrzE+hVEFcFuYIxjOEA77I7nJMbY9mPM9+lR6hbDTRV2iZrtYE6rrOFWat2CUDvw/ bFffLuDJdSFAeSuLe/Sc0MftftxAnr+1+13Px07M= From: Andre Muezerie To: dev@dpdk.org Cc: konstantin.ananyev@huawei.com, homas@monjalon.net, david.marchand@redhat.com, Tyler Retzlaff Subject: [PATCH v14 16/81] common/mlx5: remove use of VLAs for Windows built code Date: Fri, 10 Jan 2025 12:22:35 -0800 Message-Id: <1736540620-21764-17-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1736540620-21764-1-git-send-email-andremue@linux.microsoft.com> References: <1713397319-26135-1-git-send-email-roretzla@linux.microsoft.com> <1736540620-21764-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 From: Tyler Retzlaff 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 --- drivers/common/meson.build | 8 ++++++++ drivers/common/mlx5/mlx5_common.h | 4 ++-- drivers/common/mlx5/mlx5_devx_cmds.c | 7 +++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/common/meson.build b/drivers/common/meson.build index 8734af36aa..79ba0a3001 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -11,3 +11,11 @@ drivers = [ 'mvep', 'octeontx', ] + +warning_flags = ['-Wvla'] + +foreach arg: warning_flags + if cc.has_argument(arg) + cflags += arg + endif +endforeach 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 a75f011750..804ee67cd6 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.47.0.vfs.0.3