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 D472345CE3 for ; Mon, 11 Nov 2024 07:31:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA2D94067A; Mon, 11 Nov 2024 07:31:12 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2071.outbound.protection.outlook.com [40.107.92.71]) by mails.dpdk.org (Postfix) with ESMTP id 145974067A for ; Mon, 11 Nov 2024 07:31:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B084j8yUJ1U2COTwrqL2B3N547/fuLI6V7Hk+ht7uzK/9BJ/a3SitT4lfiW0NlYPgR69Oj7UDT6nudckw58WnQGscc3RpOVDOM1pc7ErP1ne4meXE3neltxSpUnpidFeggZ0Ufj9x80vONv9hnyLd9/bBcgD8ggchID9ccF4FYqisxBW3OHt9tVgWQKU8EmtwkT8zw86QyWy2tC5PlLsRdoQviAuJv8YCLXxp1CRxwc8LigIRUBkQ7KB1UNbOlcV7N5N7vgoxqHChsaQY2Vl5cxrG3n5kAfdn8J/FDcLRMSZM5IJqijhDU7JMoOOSYGyoN0wWcv1vFZNQsCJdeqOYg== 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=KE/VPinzM7UmH6JzUolJ+Ofzj1ULk8HPX5tWh1VA0As=; b=Hql+qy0IOw81NoKemkB0BW3dMfIX7NLFo95uYujfx57AkwTlMqJPL3HQ+lurDqhOq5O42RF4nTUYmixlRcKvyGi0nfWOsmALFnDRSCvBAMsoyFlU/27y3UlElAzDFJOKFnzOav9j3z+hjRbyz8wiuV5P41bUiiCxgXtjBbOWpBXpy43gpqqyTgKFNzveu6xQN0LUWqC8vxg9EeuAJ4zjmYVC/J14WEGJ9ySoWtgrYrX7yh3z7kzuE7AEWKYKsMZ/4P9Q3SzRlys9tstgmfXB2MrvAx5Uo+Seaak1DWmwrByZgUaWoWcrBeuEe0N2mzYOOzNXYeHe4mizmw4rkSabwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=networkplumber.org 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=KE/VPinzM7UmH6JzUolJ+Ofzj1ULk8HPX5tWh1VA0As=; b=nrYSldJmC/Z7Q+BEUTDaDkoJZboeLqduE8vCRAGy2IArCiuiP1Jv5PxWAGeBC9tccHSS3Ed8FxBICw8TGMBisK+/7Rn+gP612j4U8cv9AUhk1D78otgX9SsPMWlw8x7FVdwNsM2ZVaJTBc4ScOPBdLh4X6Kptw0LVZ3zecySP39wNclEPMSeIF5FmRRZGt/Yh4YmCVC+cLMIRa2DKH5p/KmlyOCpsvxaqThvUSzUPRSUEDoH+2BMEazSG3HQMFxtig+lM24g8c40CWn5pP5e0KtrWUnnOltlXbrIbiYAohr8WUGDuyV0xmesnlxUd+D4TR1ZwDWU066NMMvTkGc3Kg== Received: from DS7PR03CA0335.namprd03.prod.outlook.com (2603:10b6:8:55::34) by BL3PR12MB6569.namprd12.prod.outlook.com (2603:10b6:208:38c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.26; Mon, 11 Nov 2024 06:31:08 +0000 Received: from DS1PEPF0001708E.namprd03.prod.outlook.com (2603:10b6:8:55:cafe::45) by DS7PR03CA0335.outlook.office365.com (2603:10b6:8:55::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.26 via Frontend Transport; Mon, 11 Nov 2024 06:31:08 +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 DS1PEPF0001708E.mail.protection.outlook.com (10.167.17.134) 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:31:08 +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:30:54 -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.1544.4; Sun, 10 Nov 2024 22:30:51 -0800 From: Xueming Li To: Stephen Hemminger CC: , Pavan Nikhilesh , =?UTF-8?q?Morten=20Br=C3=B8rup?= , "Konstantin Ananyev" , Wathsala Vithanage , dpdk stable Subject: patch 'event/cnxk: fix free function mismatch in port config' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:27:05 +0800 Message-ID: <20241111062847.216344-20-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: DS1PEPF0001708E:EE_|BL3PR12MB6569:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bcd36af-bf91-415d-9f08-08dd021a6d5e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?TU5rNXdSc0xjbys3RVVBZWUrYVBQSGxCYzN5K3EvVzh3a2ZmVU5Lck9vNC94?= =?utf-8?B?dFJmYWZDMU10d3Q3S2w5dTVyYzdMZ25ueGVweG1UU1F4UGE2ZVlZeU92b3lJ?= =?utf-8?B?ODN2RVFsZXFZdjhEMHVoWXZscVpFdklJTjJsL3BIbEs0UjVrWW5rdXBNWXBx?= =?utf-8?B?Tk12QXNlczJPb0NUbFBFdlE1azExRkVuM0lTNWRRU3FTSUhnMW1xNExvdmdG?= =?utf-8?B?LzJRaFBPd2FPMFIvL3JUSTErZDEzOXprZG5IanVoTGdGRTRPUFNSamM4dDhU?= =?utf-8?B?b25SNHNoaWFMYWJScDJhMXBsY3pOY3JyQ0ZQVXNnME1Vam9iMmN0VkJTNCtW?= =?utf-8?B?Z2dWYTI3OXJIa2ExQnNvZWQ4ZFl2SDk3QmllOURvYTkxUHVGR09kd01KRlh4?= =?utf-8?B?OFZPeVZ2NFFzV08vbmdxS0JoTElTWTJUYmhJUitDWlo4STFScmF0T0JqNmNw?= =?utf-8?B?a3FaZ2tKbHpmN1YxVzEzTVBidEFpT0ZXRFpyUURlOVBDczI0TUM2M1VCdlpl?= =?utf-8?B?YTBjNENzaHlQWEtmYVp6VkFPakluVE84SktUL04yeHRhTGJrWWw2TlpFL3Fw?= =?utf-8?B?bm9QNHlvcFVIQ1BncC9iRXh0SUJFK29FRU9Yb3VZdGRBdTcybWhEM2oxbFhz?= =?utf-8?B?aXA5d0tiUFE3SkdmbERjVTVqcHlLQlpaYmEzMFJ1ZnBJNFRzN2k2MnY2REVk?= =?utf-8?B?eFJGMlJRZVB1bGp4SFZmM29HQkQ5WFBFYkpDS000bFd2RHZKMGlFbHNEaVlj?= =?utf-8?B?TVNzMnJXWHF6Nmh6Q09NeFhOQ3QxeGpGSzVSUUZjUThERE5VbWZZcGJUK3R0?= =?utf-8?B?a2Uvc00zeFZxUDZzeUJobVNHSTZydEZ6UENCek80U3Y2bzlFUDNxaXUzb09L?= =?utf-8?B?UWF0QTR5bzB5dkI3cWxtdXNTOWlMQnR3T1d0b3lUeEI1R2YwazZPdllSb1Bm?= =?utf-8?B?OFlOaWVYQjViOU1pVEErc0pRY1BiVXRXV0RTMXBabUZoY3JjeGpuN21Td0Jx?= =?utf-8?B?a0FBZ2JwU1BtZlJXRVpwV1pjTnVIemhuQlBKbmUwVkdYZzYwTXpJQVZmNkM0?= =?utf-8?B?U3dpQm1iVFRFRDFUeWw1OWFOZ3ppVFdIT0xtMG10bVU2Q2U4dnRzRVJISStB?= =?utf-8?B?QUNXOUFaN1liMmNCY21hcFhxckN4eFFhbnZ2aENmd09iTCtPeFVJUHlkUEdL?= =?utf-8?B?UDhNMTFpSGI4YjBieURHVk5UU2xmR0U0SFp0b0Y4dDYzbVhvNEtWVkJaWE5t?= =?utf-8?B?Wk1HNGJCSTJKZ3hrM2lWK0JCV1MxQUZLUklmMTBqMzNNdmJFb0tRSzZRcGp1?= =?utf-8?B?MWNXd25uTHNaRGp5dGN0Ny9jVDNoUE1Xb2ZSQXMvQkl3dnNuU2lSS3YyR0V5?= =?utf-8?B?eHZhR3A4eXNUTHhKcldkcnFvcG4xYlNWcWhpcVFqSjNWTHRNUUxtcDZ1MTVw?= =?utf-8?B?RDlJREZnS2tEa3FDZVRyWFpXR2xWL21NVEdqQ0JOYVU2QjBpeWIyVTNESTht?= =?utf-8?B?Rjd6OWJGTGJjRlNIQURXaENmNVdHY3FjcVc3Q1V0WnN2QlVjT0xKS3JYZWl1?= =?utf-8?B?cS9tRzdPSWdmd3JqWVFlWFZVRlFLOFcySGZvamdvUTlXaXFqbFVwdlA3bC9Z?= =?utf-8?B?TFJ2aUVZWlJ1SktCQkl5bEMwUDJ6UElOVGZjY2MrRFl1QjMyL2l4b3I3bmVh?= =?utf-8?B?ZWVCVkxRb2F1dUxzL2VaaGU5eEdObytpVDRmZmFYM2FjYktzMlFWbDd0WmJO?= =?utf-8?B?YTVDMXJIQmt2WGlmMTAvOFJRalJ3a2hkVUk3SU9BVEc4dXM5ejJxQVhKZ2FU?= =?utf-8?B?dnJMNEhOY2U1VllCSGhxVDY4blV1Z2xtODdMNkhlb01ac3Z5NFlpSVE2Y1d5?= =?utf-8?B?M2grRzBJcEQyQVloN1NINEFPYzFEcE5TK21ONzdwTmd4NEE9PQ==?= 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)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:31:08.2238 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1bcd36af-bf91-415d-9f08-08dd021a6d5e 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: DS1PEPF0001708E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6569 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=a3762499271d5541b0741fbceb9ccbdd5c36f557 Thanks. Xueming Li --- >From a3762499271d5541b0741fbceb9ccbdd5c36f557 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 8 Oct 2024 09:47:08 -0700 Subject: [PATCH] event/cnxk: fix free function mismatch in port config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit db92f4e2ce491bb96605621cdd6f6251ea3bde85 ] The code to cleanup in case of error would dereference null pointer then pass that result to rte_free. Fixes: 97a05c1fe634 ("event/cnxk: add port config") Signed-off-by: Stephen Hemminger Acked-by: Pavan Nikhilesh Acked-by: Morten Brørup Acked-by: Konstantin Ananyev Acked-by: Wathsala Vithanage --- drivers/event/cnxk/cnxk_eventdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index 20f7f0d6df..f44d8fb377 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -118,8 +118,8 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev, return 0; hws_fini: for (i = i - 1; i >= 0; i--) { - event_dev->data->ports[i] = NULL; rte_free(cnxk_sso_hws_get_cookie(event_dev->data->ports[i])); + event_dev->data->ports[i] = NULL; } return -ENOMEM; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:06.288408016 +0800 +++ 0019-event-cnxk-fix-free-function-mismatch-in-port-config.patch 2024-11-11 14:23:05.032192841 +0800 @@ -1 +1 @@ -From db92f4e2ce491bb96605621cdd6f6251ea3bde85 Mon Sep 17 00:00:00 2001 +From a3762499271d5541b0741fbceb9ccbdd5c36f557 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit db92f4e2ce491bb96605621cdd6f6251ea3bde85 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index c1df481827..84a55511a3 100644 +index 20f7f0d6df..f44d8fb377 100644 @@ -28 +30 @@ -@@ -121,8 +121,8 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev, +@@ -118,8 +118,8 @@ cnxk_setup_event_ports(const struct rte_eventdev *event_dev,