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 427B845CE3 for ; Mon, 11 Nov 2024 07:38:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 369864067A; Mon, 11 Nov 2024 07:38:09 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2051.outbound.protection.outlook.com [40.107.93.51]) by mails.dpdk.org (Postfix) with ESMTP id 41CDC40E09 for ; Mon, 11 Nov 2024 07:38:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XB+bbTUEC4moFMJoF8MNQwBYJscyzSM49YNvV54E28X9uOzPo5nbzu+G0/mCI5YcX8YmFXmqHjLKah/pT29P5aRDk47/vWDkKw3rUcWWjKgDgqn4+6TlnFEL4HcUrzXrRgSx2ymPGiSVEnqpiOe3WitB0KcWtWfh9F6aV2B67zoPzpDQIzRGcx2NmLLp+VTe6ynMfThogMmhhQcK1+HhDYQ+k1b6PEm5v10LUxYbXFxwoX0HTy4K8ZIapXQigTnrgCVCo2+TWoNqOuXxVGdKHB2wk82cuWjrU3siXpNpqiYl4TOHGGnvUqk3Q9dVlDWLmjKK7QBNgUWiEYhkysBz7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4koYM5wxmjNFY58EjtbA47X6FgffdjNYoqsfx8lG4Js=; b=Jfpg+4f48ckGROS0Tgya5to57cfP+jE9QKLq6kv/7cdxms9qfZ6LU087FF+EefZL0Ap0QORzU+YRsMTAkogaZHkvumXmUB2EeVVPtZwj1a1q2Er886lF6qSw4HbrDBXLmkZ7Xk1iDo+GQcc36UV+bWcocaZ9ANxu5lr2HlJtsjrdcRR+GTng8gm4OiqeuNFUju9yTX9SsZTUZcoYVBptL9/IUETPA0oqvUIFjKzzst8+SN8QbW/PhhVshCNTAf+gVPIsKdifpVVEP3zF1MGmRJi7XVRMSv9bkmFIjRCcicOmc8a7S2CwEfciw04ju0tkAIBI8bUmxZz9W5bWvhzMQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=nxp.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4koYM5wxmjNFY58EjtbA47X6FgffdjNYoqsfx8lG4Js=; b=fVT64+OVIZ8gotG+Ck3mdAmCpZJmeU0HUTZDU5By3MlWWVxdvoviHP3kdGxfFbuQjpd/OBmKRTuCAGZHux9pjp3YczBBNAqFvClHwqfk5noUL9Gw9bOB3td6lUin/Ygp/AoP216wX8Gy1r076/ZRpPJXGo6d4vQJ9xVzX6HmqlCeKWmx8n6hM+KWgriT06Bl9lkEyoZV/M4tmlHzDKyhpxJXjPwKAjUcqwF11kjnPTKX8er5dTIi9odHp0czzU8PQVKxsl6zw6LJ2Qa5S+kpJyw0TDn90Nt7IRQnkY1TQRaeI6sdwwHRiUOPyHmRlmZ0dMJdpLQk5U0HwNranmxS2w== Received: from SA0PR11CA0099.namprd11.prod.outlook.com (2603:10b6:806:d1::14) by SN7PR12MB8436.namprd12.prod.outlook.com (2603:10b6:806:2e3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:38:05 +0000 Received: from SN1PEPF0002636B.namprd02.prod.outlook.com (2603:10b6:806:d1:cafe::cf) by SA0PR11CA0099.outlook.office365.com (2603:10b6:806:d1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27 via Frontend Transport; Mon, 11 Nov 2024 06:38:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF0002636B.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:38:05 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:37:55 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:37:53 -0800 From: Xueming Li To: Vanshika Shukla CC: , Hemant Agrawal , "dpdk stable" Subject: patch 'net/dpaa: fix reallocate mbuf handling' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:13 +0800 Message-ID: <20241111062847.216344-88-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636B:EE_|SN7PR12MB8436:EE_ X-MS-Office365-Filtering-Correlation-Id: 7430270f-703a-4156-dd17-08dd021b65cc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?b7RJ86ynOMMX5+OqmtWOd8i/U8PjgMZDeQCwlRnIF5bg4KVrzHDPDAuH0/aG?= =?us-ascii?Q?YwTCe1EZpZDygQ8V/PuZLEZo81bRDjbwasVeYsgmp6nVtpFaBbGy9EauoNIM?= =?us-ascii?Q?Bm23MtXIv0xdjWX9bey6aMxsBXu7KyK/YVwNokcVvxPBDWthEfBjDWeoDv0x?= =?us-ascii?Q?aLi3Gi6mdE1XT1wWcPSLr3G0jAv7+OtKcpBQateK1FK3Cjkudyi2iEKe+G3W?= =?us-ascii?Q?jwmPdmsFzNswvBg8rom/fheWEpNpXyOvuCwCxv1Bs3ezRdkWFjz81gwza9/1?= =?us-ascii?Q?6VdC9MLHkWM9wFaTBELbk5yogdecFQ/MZXtCPTqLUnJ9STV2ieHigR2MGVJg?= =?us-ascii?Q?M66Cj7O9nMGG+bw3D+i8kfQ8/UncfYuOxLi/BT/4tNxTK3ixg5z+QaC51uqS?= =?us-ascii?Q?+nFrad9mXh3Of3+3QM9VxNaAvAyw7C5KKzxkU5jSVFfkIAE955jxRqafbiel?= =?us-ascii?Q?nTN4yjHxrKoRdpna4LJNUxiopQUKJ19jVZlZgtVOLlGeIkH3jxy0UHTDMndv?= =?us-ascii?Q?uK/9oQO+hMaDi2Lkw4WuYUqR08M+CDoM3+9CZcxvz+G7PkYaE3eqSu7BKqWC?= =?us-ascii?Q?c9EFPhajHvzEjdla+UVl0LTOQSET7YYIlWvjzhudNkou8wR9eF+QRblG1Jqm?= =?us-ascii?Q?lZJlQYCsjxG/e8/xbTOWskQPS9//waeD2HGnwmCJPTLT9K+mvX6QIqVQK30V?= =?us-ascii?Q?ZQtAog6qs0p3MBcIp3Zp5oWFsvs+cmq3jwAWFuFi98I4/dPUftak8W8mZuIR?= =?us-ascii?Q?/ylB74zFxt8lCJnVyxToptHQ/sTf/4ZVW/CThFNwiocrrgRdLxSztGl7F2cj?= =?us-ascii?Q?Y07rUeSxhu3lYJ13XuBIsuc1blkFyWxVR1ERSP/GKOmdPdfx4zGYdudrNU3d?= =?us-ascii?Q?q5AW0uT47IKnECAvaQRI9yjBk3qWAa+6F5aV+saFI8xUGdURLZDsOSzDDKm6?= =?us-ascii?Q?cZcB47R/EttAiSOS5vjHVtd3FfLa41eLvLK2oDfaqyhEOoRkV82HI/XwG1fB?= =?us-ascii?Q?r4/8Nu4mPeKNLiUwyIkonTPrkbuf2ldMRsmsLEr/vjOh8DoHZ4Ui7Yhc/GML?= =?us-ascii?Q?w4X/S1441B5jCEclGVnnpVvAEuETktJm1AFwWZfMI2TZZ1QGWUVSVlmpPGkM?= =?us-ascii?Q?U9iqKIiOYTIJWR3Q9ErXdFct76O827ORqJXqBpP3fIZwDo6/kEvt0UVEny90?= =?us-ascii?Q?zr9dPIpqpUoOmRUNhorXeO/hLKoFrZNh1jKR3D+UnB7RpCeKeHK/elCc9gWx?= =?us-ascii?Q?BFSquGXAohSr9HyPuelguueN/Di4aHKeLAfKdzvbZEqyjPL7ilFBHF6nT/7m?= =?us-ascii?Q?Trx0IkfRaX3CcRIv3i8PBSjANYtR4PR0/+bQBIo/KpBCmjxxBlB5SrXYXKnM?= =?us-ascii?Q?dNE77bbgxrClprpmMHSqAyXr5NMxAR2wWAID43F+HjP9u5Arsg=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:38:05.0369 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7430270f-703a-4156-dd17-08dd021b65cc X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF0002636B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8436 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 23.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 11/30/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=b430ea372d74ca994443f2c8086311d1e3b1fcc8 Thanks. Xueming Li --- >From b430ea372d74ca994443f2c8086311d1e3b1fcc8 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 Cc: Xueming Li [ 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 ce4f3d6c85..018d55bbdc 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -1034,7 +1034,7 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf) /* Copy the data */ 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); /* Set new offsets and the temp buffers */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:09.097428559 +0800 +++ 0087-net-dpaa-fix-reallocate-mbuf-handling.patch 2024-11-11 14:23:05.232192837 +0800 @@ -1 +1 @@ -From 7594cafa92189fd5bad87a5caa6b7a92bbab0979 Mon Sep 17 00:00:00 2001 +From b430ea372d74ca994443f2c8086311d1e3b1fcc8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7594cafa92189fd5bad87a5caa6b7a92bbab0979 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 1d7efdef88..247e7b92ba 100644 +index ce4f3d6c85..018d55bbdc 100644 @@ -23 +25 @@ -@@ -1223,7 +1223,7 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf) +@@ -1034,7 +1034,7 @@ reallocate_mbuf(struct qman_fq *txq, struct rte_mbuf *mbuf)