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 0B0D543B86 for ; Tue, 5 Mar 2024 10:54:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0599E42E1F; Tue, 5 Mar 2024 10:54:19 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2088.outbound.protection.outlook.com [40.107.100.88]) by mails.dpdk.org (Postfix) with ESMTP id 263414026B for ; Tue, 5 Mar 2024 10:54:17 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PT9ExXxBJQB+lyJ4jnyk5MI5BUxx9KGyITDBlYGbFhiZkJca6cOzIidr8oLhnXCwjcR0RrKaAxSf5HiO1i4PHr9xeuSn/hWNMtAMCO5/idZNT1+y5Ti0opBVb7+inzbYLrxp7cQ3ri+Q/QsA1FHWZ4tIyEgpIED4aZSZNfd3mXb+6rgzhKXfHQfIx83Qemz+nGhJr7rZ/FA6vtx5HjG/I71nIL+2lIb2nzoQhbSb6gHVgavSQa2FnXaZwkASvq7C5KfdR3ISav0xVDVRoNeJ+9a8zxqlvoaHW5J9SPemnD5FvRm+e9kY9K2VEIwA7LPSzCvn8KisNJYETR1YALyXJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=xsNvwtRbC2WeFKVAtOAJyguxiklcAE1isPwVdOT7nQs=; b=KBjeFp0Xqqv7W3FlgYbmu6kXUKLd3S8COaN59L+5UOhqAj4gXWwUMOHxRDP2iw5oZTqfgVFOiBlFARoH2xmx9pmWaljxQX+dOoovq0mZH0X8IK+q2FFZpnNvh04oDNIy7Xwj0y8cGtUF8c2g8Gg20ngue1rNRgUJm4SSQwHGmh1n4FBFe4/8jlbox9Jmxi0UmGxmiRz+885cIZ6Wfvo4nYpnTipYz4uHRhd6eiX/iw3GXvSYYQfN2NseGhovcU5Y+MXCuLW4iglCyVeKTp/S+rx0DbICqbCDTVPFZKRZ41b3bowuGAAMzm4XzrtPQFs2t7hHxBy+YvEuCDR7jhzrrw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=xsNvwtRbC2WeFKVAtOAJyguxiklcAE1isPwVdOT7nQs=; b=b9MIdT5IXe+FB2ch6mg9iMr5ZTaq8d09Alur9Cv8z7ocCM0e7xGjUkmBAf54+EJ7Yz+1xwduEiotrT3RIjL/H3Ofdy+yfGs4vlKrQQDuLeqJAweTCYAT9o8g5G3viMAL0TnGddVopFqzfSl/2TisDkqMJ1Z38+xWLClFg8HLNDoB955A8UDsAtLz/zjt1hodD/4FTW6THtv9XJfTnWRZlEIwVXrHWpoo4fMVHpEynbzPzYz9hZ5NkG0C3wZN9+38KEx3MAPvl2yk9lxmaX1iFLiQWvHEREnSZ6AVNz/93vYV2ryv0r4gHr9jbi2vHtY7CdU2XX0mGFuilBRPJAYUTw== Received: from SJ0PR03CA0201.namprd03.prod.outlook.com (2603:10b6:a03:2ef::26) by MN0PR12MB6029.namprd12.prod.outlook.com (2603:10b6:208:3cf::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:54:14 +0000 Received: from SJ5PEPF000001D6.namprd05.prod.outlook.com (2603:10b6:a03:2ef:cafe::9e) by SJ0PR03CA0201.outlook.office365.com (2603:10b6:a03:2ef::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.32 via Frontend Transport; Tue, 5 Mar 2024 09:54:14 +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 SJ5PEPF000001D6.mail.protection.outlook.com (10.167.242.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:54:14 +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.986.41; Tue, 5 Mar 2024 01:54:02 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:54:00 -0800 From: Xueming Li To: Suanming Mou CC: Anoob Joseph , Ciara Power , dpdk stable Subject: patch 'app/crypto-perf: fix next segment mbuf' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:46:47 +0800 Message-ID: <20240305094757.439387-67-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: SJ5PEPF000001D6:EE_|MN0PR12MB6029:EE_ X-MS-Office365-Filtering-Correlation-Id: 933cc08b-add2-4083-4f36-08dc3cfa36f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M7oBhwQhQeb2k6aB3dWuo5KeDdJDZqhsFzFAEuWwaKBBEIN8Y0CBzwfZWeELxdd18TtzDnuU+7fVhObxx/RmFDMkHFC9sYO1YuB1WxtdYYfko9FWqvgD4VEDxaWlkNAXzIka1DRGoHYAYSCnYs7VY4nk2lEL54DKXTW8xwr3TzMBcQMMq/ioAGj91sG9f5qJFKLUD3MGoaEYwGS8AmNhDS1TkTtk+p6VEor9HaUj/1VN6WyOjiKtm0fXhUe+ZNyAbRjQ1dOLxp75qP48XbQmTAg6Dfzzek0ksFGu4p6jxSOnJdPsyxSAvwwaM9psMoprrzL2jsPmazQysxMJor5SPfRMSl4YHKz57707BDwxMo2hU0NkZ45dykdx3MaSEId6g5mldtnXP1x7jMRtng959UvqClzw4dNnF2JlaSsHilDPbPEUoTHJ2JroUhmwik76WrV1j5NS0+78gbJVYBmpSO37ewQ+I6Jn9GTRYZga398hlX7MsvR41Soewsmzrm8Sy5tKYierJH5MYg2WdT2eSb4dWHkRkd18SfZT1+39lZACAIL+uBXPQt33B/crNfPscFNk3IClLRDebS/qq2XZIAP26lCHO2ToEsGYF+NYojYpzhfZvtcl0PuQzBB4dr9ZeaeAkPKybyPxb0hru3bLBUiJicw8QrYlw0NSv1cfQqtmcH+LcN3Pk/4F7vscaRrKI8sWKQLn+pcEVfKMvGUvasOQLMwXt3onB3Fz3gWGv7VUD35y+3vPB/NA8wGgES1e 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:(13230031)(36860700004)(376005)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:54:14.1410 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 933cc08b-add2-4083-4f36-08dc3cfa36f9 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: SJ5PEPF000001D6.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6029 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.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 03/31/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=dfc9d45365291d201b6f08cfaa5efba092a9572b Thanks. Xueming Li --- >From dfc9d45365291d201b6f08cfaa5efba092a9572b Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Thu, 4 Jan 2024 10:24:05 +0800 Subject: [PATCH] app/crypto-perf: fix next segment mbuf Cc: Xueming Li [ upstream commit 06a109ca5dc551631d9251e81966a4bc52f98c5a ] In fill_multi_seg_mbuf(), when remaining_segments is 0, rte_mbuf m's next should pointer to NULL instead of a new rte_mbuf, that causes setting m->next as NULL out of the while loop to the invalid mbuf. This commit fixes the invalid mbuf next operation. Fixes: bf9d6702eca9 ("app/crypto-perf: use single mempool") Signed-off-by: Suanming Mou Acked-by: Anoob Joseph Acked-by: Ciara Power --- app/test-crypto-perf/cperf_test_common.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/test-crypto-perf/cperf_test_common.c b/app/test-crypto-perf/cperf_test_common.c index 932aab16df..b3bf9f67e8 100644 --- a/app/test-crypto-perf/cperf_test_common.c +++ b/app/test-crypto-perf/cperf_test_common.c @@ -49,7 +49,6 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp, { uint16_t mbuf_hdr_size = sizeof(struct rte_mbuf); uint16_t remaining_segments = segments_nb; - struct rte_mbuf *next_mbuf; rte_iova_t next_seg_phys_addr = rte_mempool_virt2iova(obj) + mbuf_offset + mbuf_hdr_size; @@ -70,15 +69,15 @@ fill_multi_seg_mbuf(struct rte_mbuf *m, struct rte_mempool *mp, m->nb_segs = segments_nb; m->port = 0xff; rte_mbuf_refcnt_set(m, 1); - next_mbuf = (struct rte_mbuf *) ((uint8_t *) m + - mbuf_hdr_size + segment_sz); - m->next = next_mbuf; - m = next_mbuf; - remaining_segments--; + remaining_segments--; + if (remaining_segments > 0) { + m->next = (struct rte_mbuf *)((uint8_t *) m + mbuf_hdr_size + segment_sz); + m = m->next; + } else { + m->next = NULL; + } } while (remaining_segments > 0); - - m->next = NULL; } static void -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:32.931514065 +0800 +++ 0066-app-crypto-perf-fix-next-segment-mbuf.patch 2024-03-05 17:39:30.783566493 +0800 @@ -1 +1 @@ -From 06a109ca5dc551631d9251e81966a4bc52f98c5a Mon Sep 17 00:00:00 2001 +From dfc9d45365291d201b6f08cfaa5efba092a9572b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 06a109ca5dc551631d9251e81966a4bc52f98c5a ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org