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 0CA6B48A44 for ; Fri, 31 Oct 2025 15:36:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 061D340150; Fri, 31 Oct 2025 15:36:05 +0100 (CET) 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 298CE40661 for ; Fri, 31 Oct 2025 15:36:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761921362; 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=LF8cYqniJcWP3xiuswddY01I7DAqRH5MsAy18TMdTfo=; b=erns8vjtpXUpSs9niWHJQXDqkqk3N4KxxzbWsxHAuYnG6ne9zha5iJawzN1XPwhx65jz7s DTCDeRyEXZcF8VWVJ2s+Ceb0hhQTs+AnmDl8Nrx3ieEB89SVFE8tWlnay5wZBX6tSXBVrQ b81Bz5giMnrArR0dadOLlM19UgI91Bk= 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-633-2FJrosWRNY-nJ-a34DSf1Q-1; Fri, 31 Oct 2025 10:36:00 -0400 X-MC-Unique: 2FJrosWRNY-nJ-a34DSf1Q-1 X-Mimecast-MFC-AGG-ID: 2FJrosWRNY-nJ-a34DSf1Q_1761921359 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 B82851800673; Fri, 31 Oct 2025 14:35:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.50]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 84FAE1800452; Fri, 31 Oct 2025 14:35:58 +0000 (UTC) From: Kevin Traynor To: Jun Yang Cc: dpdk stable Subject: patch 'net/dpaa2: fix extract buffer preparation' has been queued to stable release 24.11.4 Date: Fri, 31 Oct 2025 14:32:22 +0000 Message-ID: <20251031143421.324432-20-ktraynor@redhat.com> In-Reply-To: <20251031143421.324432-1-ktraynor@redhat.com> References: <20251031143421.324432-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TOx69aUskrMdKl5HTYr3QECdSbOVHKQduOXUfHatM0s_1761921359 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/05/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/443b13ab4383fafc4934d93603e2d19a9ef5c69f Thanks. Kevin --- >From 443b13ab4383fafc4934d93603e2d19a9ef5c69f Mon Sep 17 00:00:00 2001 From: Jun Yang Date: Wed, 2 Jul 2025 15:21:40 +0530 Subject: [PATCH] net/dpaa2: fix extract buffer preparation [ upstream commit 53bb620fa66ec89ee888573009771e0e9f279930 ] 1) The max size of extract buffer should be size of "struct dpni_ext_set_rx_tc_dist"(488), which is greater than 256. 2) dpkg_prepare_key_cfg is responsible to clear extract buffer before preparing. Fixes: 25d0ae624245 ("net/dpaa2: check IOVA before sending MC command") Signed-off-by: Jun Yang --- drivers/net/dpaa2/dpaa2_ethdev.c | 4 ++-- drivers/net/dpaa2/dpaa2_ethdev.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index a9bce854c3..528b2d305d 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -2799,5 +2799,5 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) memset(&priv->extract.qos_key_extract, 0, sizeof(struct dpaa2_key_extract)); - priv->extract.qos_extract_param = rte_malloc(NULL, + priv->extract.qos_extract_param = rte_zmalloc(NULL, DPAA2_EXTRACT_PARAM_MAX_SIZE, RTE_CACHE_LINE_SIZE); @@ -2810,5 +2810,5 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) memset(&priv->extract.tc_key_extract[i], 0, sizeof(struct dpaa2_key_extract)); - priv->extract.tc_extract_param[i] = rte_malloc(NULL, + priv->extract.tc_extract_param[i] = rte_zmalloc(NULL, DPAA2_EXTRACT_PARAM_MAX_SIZE, RTE_CACHE_LINE_SIZE); diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index fd3119247a..f32c31c763 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -32,5 +32,7 @@ #define DPAA2_MAX_CHANNELS 16 -#define DPAA2_EXTRACT_PARAM_MAX_SIZE 256 +#define DPAA2_EXTRACT_PARAM_MAX_SIZE \ + RTE_ALIGN(sizeof(struct dpni_ext_set_rx_tc_dist), 256) + #define DPAA2_EXTRACT_ALLOC_KEY_MAX_SIZE 256 @@ -61,5 +63,5 @@ /* Size of the input SMMU mapped memory required by MC */ -#define DIST_PARAM_IOVA_SIZE 256 +#define DIST_PARAM_IOVA_SIZE DPAA2_EXTRACT_PARAM_MAX_SIZE /* Enable TX Congestion control support -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-10-31 13:53:52.889431558 +0000 +++ 0020-net-dpaa2-fix-extract-buffer-preparation.patch 2025-10-31 13:53:52.040523381 +0000 @@ -1 +1 @@ -From 53bb620fa66ec89ee888573009771e0e9f279930 Mon Sep 17 00:00:00 2001 +From 443b13ab4383fafc4934d93603e2d19a9ef5c69f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 53bb620fa66ec89ee888573009771e0e9f279930 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 998d1e7c53..1d11847d76 100644 +index a9bce854c3..528b2d305d 100644 @@ -24 +25 @@ -@@ -2788,5 +2788,5 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) +@@ -2799,5 +2799,5 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) @@ -31 +32 @@ -@@ -2799,5 +2799,5 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) +@@ -2810,5 +2810,5 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) @@ -39 +40 @@ -index b9dd9b22fd..b501fc091a 100644 +index fd3119247a..f32c31c763 100644