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 8D2D546BAE for ; Fri, 18 Jul 2025 21:38:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 867D940611; Fri, 18 Jul 2025 21:38:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5BF1840E4D for ; Fri, 18 Jul 2025 21:38:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8jSYEnLM76CL7KtEFi4fw8U7+3PgaX42SL97hTZlfCY=; b=TfoQkbc9gE/r8tDW9igBUqQF7qcwEGXX6khNRyHAK4X26tjOIwwzpVUJ67sm3agPBZztMg QOgcCpbCF4JfYggzvXFqUZ06sCyUR56AKIC39+xVP6nNvjVLEeCKsqsF5J1cLSkxHMId0w sc5lwj7kstKgKGhr9qc9qfyhkFkHtCE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-507-VjXgBmmqMZazcSulvKsG6g-1; Fri, 18 Jul 2025 15:38:48 -0400 X-MC-Unique: VjXgBmmqMZazcSulvKsG6g-1 X-Mimecast-MFC-AGG-ID: VjXgBmmqMZazcSulvKsG6g_1752867527 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 954D01800282; Fri, 18 Jul 2025 19:38:47 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id ECBC8180045B; Fri, 18 Jul 2025 19:38:45 +0000 (UTC) From: Kevin Traynor To: Konstantin Ananyev Cc: Anatoly Burakov , dpdk stable Subject: patch 'net/ixgbe: remove VLAs' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:44 +0100 Message-ID: <20250718193247.1008129-170-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: gx24iqs8C-Np7OkMM2sPExhRpaOdhnGBPhbcK6_SoFE_1752867527 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/25. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a69a881978973983718b2aecc9acfd651d6a08ad Thanks. Kevin --- >From a69a881978973983718b2aecc9acfd651d6a08ad Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Wed, 5 Feb 2025 17:33:13 -0800 Subject: [PATCH] net/ixgbe: remove VLAs [ upstream commit 948a4bbdeac9f1eef0c62b96bd1b59b1f9a021cc ] 1) ../drivers/net/ixgbe/ixgbe_ethdev.c:3556:46: warning: variable length array used [-Wvla] 2) ../drivers/net/ixgbe/ixgbe_ethdev.c:3739:23: warning: variable length array used [-Wvla] 3) ../drivers/net/ixgbe/ixgbe_rxtx_vec_common.h:17:24: warning: variable length array used [-Wvla] For first two cases: in fact ixgbe_xstats_calc_num() always returns constant value, so it should be safe to replace that function invocation just with a macro that performs same calculations. For case #3: reassemble_packets() is invoked only by ixgbe_recv_scattered_burst_vec(). And in turn, ixgbe_recv_scattered_burst_vec() operates only on fixed max amount of packets per call: RTE_IXGBE_MAX_RX_BURST. So, it should be safe to replace VLA with fixed size array. Signed-off-by: Konstantin Ananyev Acked-by: Anatoly Burakov --- drivers/net/ixgbe/ixgbe_ethdev.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 20b625c824..e0e4802e34 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -3472,9 +3472,14 @@ ixgbe_dev_stats_reset(struct rte_eth_dev *dev) /* This function calculates the number of xstats based on the current config */ + +#define IXGBE_XSTATS_CALC_NUM \ + (IXGBE_NB_HW_STATS + IXGBE_NB_MACSEC_STATS + \ + (IXGBE_NB_RXQ_PRIO_STATS * IXGBE_NB_RXQ_PRIO_VALUES) + \ + (IXGBE_NB_TXQ_PRIO_STATS * IXGBE_NB_TXQ_PRIO_VALUES)) + static unsigned -ixgbe_xstats_calc_num(void) { - return IXGBE_NB_HW_STATS + IXGBE_NB_MACSEC_STATS + - (IXGBE_NB_RXQ_PRIO_STATS * IXGBE_NB_RXQ_PRIO_VALUES) + - (IXGBE_NB_TXQ_PRIO_STATS * IXGBE_NB_TXQ_PRIO_VALUES); +ixgbe_xstats_calc_num(void) +{ + return IXGBE_XSTATS_CALC_NUM; } @@ -3592,6 +3597,6 @@ static int ixgbe_dev_xstats_get_names_by_id( uint16_t i; - uint16_t size = ixgbe_xstats_calc_num(); - struct rte_eth_xstat_name xstats_names_copy[size]; + struct rte_eth_xstat_name xstats_names_copy[IXGBE_XSTATS_CALC_NUM]; + const uint16_t size = RTE_DIM(xstats_names_copy); ixgbe_dev_xstats_get_names_by_id(dev, NULL, xstats_names_copy, @@ -3775,6 +3780,6 @@ ixgbe_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, uint16_t i; - uint16_t size = ixgbe_xstats_calc_num(); - uint64_t values_copy[size]; + uint64_t values_copy[IXGBE_XSTATS_CALC_NUM]; + const uint16_t size = RTE_DIM(values_copy); ixgbe_dev_xstats_get_by_id(dev, NULL, values_copy, size); -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:16.931631060 +0100 +++ 0170-net-ixgbe-remove-VLAs.patch 2025-07-18 20:29:11.185908112 +0100 @@ -1 +1 @@ -From 948a4bbdeac9f1eef0c62b96bd1b59b1f9a021cc Mon Sep 17 00:00:00 2001 +From a69a881978973983718b2aecc9acfd651d6a08ad Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 948a4bbdeac9f1eef0c62b96bd1b59b1f9a021cc ] + @@ -26 +28 @@ - drivers/net/intel/ixgbe/ixgbe_ethdev.c | 21 +++++++++++++-------- + drivers/net/ixgbe/ixgbe_ethdev.c | 21 +++++++++++++-------- @@ -29,5 +31,5 @@ -diff --git a/drivers/net/intel/ixgbe/ixgbe_ethdev.c b/drivers/net/intel/ixgbe/ixgbe_ethdev.c -index 5f18fbaad5..c79ecd6eec 100644 ---- a/drivers/net/intel/ixgbe/ixgbe_ethdev.c -+++ b/drivers/net/intel/ixgbe/ixgbe_ethdev.c -@@ -3438,9 +3438,14 @@ ixgbe_dev_stats_reset(struct rte_eth_dev *dev) +diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c +index 20b625c824..e0e4802e34 100644 +--- a/drivers/net/ixgbe/ixgbe_ethdev.c ++++ b/drivers/net/ixgbe/ixgbe_ethdev.c +@@ -3472,9 +3472,14 @@ ixgbe_dev_stats_reset(struct rte_eth_dev *dev) @@ -52 +54 @@ -@@ -3558,6 +3563,6 @@ static int ixgbe_dev_xstats_get_names_by_id( +@@ -3592,6 +3597,6 @@ static int ixgbe_dev_xstats_get_names_by_id( @@ -61 +63 @@ -@@ -3741,6 +3746,6 @@ ixgbe_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, +@@ -3775,6 +3780,6 @@ ixgbe_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,