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 852C745DB9 for ; Wed, 27 Nov 2024 18:21:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 80D0F4068A; Wed, 27 Nov 2024 18:21:30 +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 A174240685 for ; Wed, 27 Nov 2024 18:21:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728087; 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=J3IZiXdaHS2sS/Jap52gHr7UQ+V3kqLjcdYSwXYFask=; b=MlL0P6N5DlBvCG1LdoztjLEd34iT+xMrGspaiztJSAlJoSYQbvfNKtWRMJQZS3ZAoEpdEm duAEf+DjBE1dZdkrbCVNCEuZHoq5f46T6a9R+5RS6VJVNy2SjuDqaFZDwEYiJniof8iyrj FLlH9VJF1Ab+5g3e1pAfTq5cVzVvTuA= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-569-ffH3af4PN-aBk4NDfPMkFA-1; Wed, 27 Nov 2024 12:21:25 -0500 X-MC-Unique: ffH3af4PN-aBk4NDfPMkFA-1 X-Mimecast-MFC-AGG-ID: ffH3af4PN-aBk4NDfPMkFA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E19D91956096; Wed, 27 Nov 2024 17:21:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7AAB5300019E; Wed, 27 Nov 2024 17:21:23 +0000 (UTC) From: Kevin Traynor To: Vanshika Shukla Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa: fix reallocate mbuf handling' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:00 +0000 Message-ID: <20241127171916.690404-53-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -UNKs6lAsVemZQ0QzNydjdpOJGYKEV-DZrLJHtmQ25o_1732728085 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 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. 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/52daecc142f39198eb4c57402e29ee1e566f4529 Thanks. Kevin --- >From 52daecc142f39198eb4c57402e29ee1e566f4529 Mon Sep 17 00:00:00 2001 From: Vanshika Shukla Date: Tue, 1 Oct 2024 16:33:25 +0530 Subject: [PATCH] net/dpaa: fix reallocate mbuf handling [ upstream commit 7594cafa92189fd5bad87a5caa6b7a92bbab0979 ] This patch fixes the bug in the reallocate_mbuf code handling. The source location is corrected when copying the data in the new mbuf. Fixes: f8c7a17a48c9 ("net/dpaa: support Tx scatter gather for non-DPAA buffer") Signed-off-by: Vanshika Shukla Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 463a5f4df5..60a03624f6 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -1025,5 +1025,5 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf) data = rte_pktmbuf_append(new_mbufs[0], bytes_to_copy); - rte_memcpy((uint8_t *)data, rte_pktmbuf_mtod_offset(mbuf, + rte_memcpy((uint8_t *)data, rte_pktmbuf_mtod_offset(temp_mbuf, void *, offset1), bytes_to_copy); -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.937168709 +0000 +++ 0053-net-dpaa-fix-reallocate-mbuf-handling.patch 2024-11-27 17:17:38.226269378 +0000 @@ -1 +1 @@ -From 7594cafa92189fd5bad87a5caa6b7a92bbab0979 Mon Sep 17 00:00:00 2001 +From 52daecc142f39198eb4c57402e29ee1e566f4529 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7594cafa92189fd5bad87a5caa6b7a92bbab0979 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 1d7efdef88..247e7b92ba 100644 +index 463a5f4df5..60a03624f6 100644 @@ -23 +24 @@ -@@ -1224,5 +1224,5 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf) +@@ -1025,5 +1025,5 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf)