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 E78A9A0524 for ; Fri, 5 Feb 2021 12:23:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFC041606D2; Fri, 5 Feb 2021 12:23:38 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 6919E4067B for ; Fri, 5 Feb 2021 12:23:37 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id c12so7261646wrc.7 for ; Fri, 05 Feb 2021 03:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qBDzNij53PK2bCikH0FYBnSBIsVUi8XwUwVeMBurlMA=; b=bZgr//HoMNZp9qeMOpII4jgI5lu8LJ5VUQns4YP12+semHgfzlbO8WXoFu2d94AtWz onidYgkGObm2w4xitvVqIMPfBxfBtFNBXV50/R0UtIzKJvHSmmgZcdI+6clcf2UXw+zu 4LqW0M73y+fBY7qHrvfOm+RpIIRvtXkcPFxKM2+qbH44+Vz6/W/6l4Xs1/xy3/JHVbq4 ogq5FCuJp6sAUScaWUMPOvUcecEU+dt4YH0REqFlXnXTsY9P6ig1ZoVNffOpXp5cGL7W DL/q/i33+p+wD6/CQ1yFc3r9jxl1jaOIbV4gbKbhocLrp1JQeelEYleeICgb+6XhRwow 9h9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qBDzNij53PK2bCikH0FYBnSBIsVUi8XwUwVeMBurlMA=; b=QQtByM/frUlAAl+S4GqAFJ+cVjWo7WGtqA+mNKYoKQ5g48YU6TxkEt6fJw0ByhpKW9 kzsCDt+Zl2wxZaX2TN9F1oNVKQuwBWZZnHVKMUU1ykIRC8Dje48LI6OYXhB3oA2Hww3T 6yn6AzwJZhujA+qmu4tX2/soQBmgPRfIqSlOgCJz61v551QTdHdLDtTRVsrgi5jOOxf2 ZoAFT8e/gdghUHYMP8vhp20WE4J2BgZnxb5vzxdO3SvMa5qwWYVQL2aB2nU+5oSxaK39 zP75kVNprEYk5gGyg1ZTxXUlFw4/eWncjkg3nYvNmKM5if6QrGgOWanj+3WEk8WZ3oKk FDYQ== X-Gm-Message-State: AOAM530FIH2LaiUSvJ3bhTlZZgDRlV6wJKgcQ0k3xJlWXlrfrMW5xB/E djsVzYO4KyfSyzdWQEPpxqdbVpK/WIwfBGYF X-Google-Smtp-Source: ABdhPJwMoPDtBohv8MQBQuo7yICL9rJ5rx8uflG0o/bDaLxllkSJPb31QIChJ1l8xbGLR/GEw+yNGA== X-Received: by 2002:a5d:4242:: with SMTP id s2mr4560995wrr.108.1612524217223; Fri, 05 Feb 2021 03:23:37 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i7sm11949186wru.49.2021.02.05.03.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:23:36 -0800 (PST) From: luca.boccassi@gmail.com To: Tal Shnaiderman Cc: Ophir Munk , Matan Azrad , dpdk stable Date: Fri, 5 Feb 2021 11:16:02 +0000 Message-Id: <20210205111920.1272063-76-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix constant array size' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/89e0cd5ca7baa647abacbc96093d04a7e52dafd5 Thanks. Luca Boccassi --- >From 89e0cd5ca7baa647abacbc96093d04a7e52dafd5 Mon Sep 17 00:00:00 2001 From: Tal Shnaiderman Date: Mon, 28 Dec 2020 11:54:05 +0200 Subject: [PATCH] net/mlx5: fix constant array size [ upstream commit 09a5e9777e7eb0179e0f9a3b6830c89702df0bd7 ] Before this commit the PMD used: const int elt_n = 8 const int *stack[elt_n]; In Windows clang compiler complains: net/mlx5/mlx5_flow.c:215:19: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant] Fix it by using a constant macro definition instead of a variable: #define MLX5_RSS_EXP_ELT_N 8 const int *stack[MLX5_RSS_EXP_ELT_N]; Fixes: c7870bfe09dc ("ethdev: move RSS expansion code to mlx5 driver") Signed-off-by: Tal Shnaiderman Signed-off-by: Ophir Munk Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 52ade39a42..a4cf63b235 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -212,6 +212,8 @@ mlx5_flow_expand_rss_item_complete(const struct rte_flow_item *item) return ret; } +#define MLX5_RSS_EXP_ELT_N 8 + /** * Expand RSS flows into several possible flows according to the RSS hash * fields requested and the driver capabilities. @@ -242,13 +244,12 @@ mlx5_flow_expand_rss(struct mlx5_flow_expand_rss *buf, size_t size, const struct mlx5_flow_expand_node graph[], int graph_root_index) { - const int elt_n = 8; const struct rte_flow_item *item; const struct mlx5_flow_expand_node *node = &graph[graph_root_index]; const int *next_node; - const int *stack[elt_n]; + const int *stack[MLX5_RSS_EXP_ELT_N]; int stack_pos = 0; - struct rte_flow_item flow_items[elt_n]; + struct rte_flow_item flow_items[MLX5_RSS_EXP_ELT_N]; unsigned int i; size_t lsize; size_t user_pattern_size = 0; @@ -261,10 +262,10 @@ mlx5_flow_expand_rss(struct mlx5_flow_expand_rss *buf, size_t size, memset(&missed_item, 0, sizeof(missed_item)); lsize = offsetof(struct mlx5_flow_expand_rss, entry) + - elt_n * sizeof(buf->entry[0]); + MLX5_RSS_EXP_ELT_N * sizeof(buf->entry[0]); if (lsize <= size) { buf->entry[0].priority = 0; - buf->entry[0].pattern = (void *)&buf->entry[elt_n]; + buf->entry[0].pattern = (void *)&buf->entry[MLX5_RSS_EXP_ELT_N]; buf->entries = 0; addr = buf->entry[0].pattern; } @@ -367,7 +368,7 @@ mlx5_flow_expand_rss(struct mlx5_flow_expand_rss *buf, size_t size, /* Go deeper. */ if (node->next) { next_node = node->next; - if (stack_pos++ == elt_n) { + if (stack_pos++ == MLX5_RSS_EXP_ELT_N) { rte_errno = E2BIG; return -rte_errno; } -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:32.671293426 +0000 +++ 0076-net-mlx5-fix-constant-array-size.patch 2021-02-05 11:18:28.866692254 +0000 @@ -1 +1 @@ -From 09a5e9777e7eb0179e0f9a3b6830c89702df0bd7 Mon Sep 17 00:00:00 2001 +From 89e0cd5ca7baa647abacbc96093d04a7e52dafd5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 09a5e9777e7eb0179e0f9a3b6830c89702df0bd7 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 82e24d7067..bf86aaaa39 100644 +index 52ade39a42..a4cf63b235 100644