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 457F7A0A0E for ; Mon, 10 May 2021 18:07:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FF4C4003E; Mon, 10 May 2021 18:07:00 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2054.outbound.protection.outlook.com [40.107.223.54]) by mails.dpdk.org (Postfix) with ESMTP id 3C5064003E for ; Mon, 10 May 2021 18:06:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dzXip/ewW/SZ4C/kTEzoSGrTxcUToAXFQ79qvK9iixs8J6ih5qyEOQncfipTHt3cq8v8QQFxkeNQ3yOUnKHyKAGt1ba7dVqpRtL8EFAMz90fys6bznKFLKWlpiSYZRelnWetdq+WvlyPLOSq9uk9DULDmbpQQRW4RJapj//O1tNZoo3Dc2/qRYFq9veig7C+omUlIpBv2RtuM5VmxMLenv4alyhUuHfbZsZ+kP0r4CqU7ae1lXlx4Ke+q/spd6TXW9tvzMschWb5aay9FBbN/0Wc1B3DFhmgxdLBeqijgcuYSoR0JrebbDxTFQfbZZtN7ZNAOERNoRusKQtNGBX2CA== 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-SenderADCheck; bh=wBhznsFtW7D1WZqa0bSgJDmzwqYn2wGy0HMHAPWIvM0=; b=Q8+3z+gqWDpYXtFicgAtrN1lkxWBY0Mf/D3jbpg79BTndy6BXB4JjYOoYnGDDUfeoCQMJD6e3vFvmZKzJf2xgsT10g99QgIumtsJiiIZbtwYTXXv3+cthacEcFgEKN1F54w0OkPgvm1iM5O7z5dho/LAYEtcGa26do3F1OBMg64Bx9LIHwWJN3dXw8DWmNuCX3ynGV+94QiOitlxurhiXX/d9JNfINJC67fc2bI0vRfr9mKZEYmTwkTbd4cczk8DP4vN/2bhCWLG/wVHP1a58ePp6drNf6EJc/r6YvOXwbnfrV9oNE6nHL41wj7bHtHRFaN63XzmhpOPD5riP7GCfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=wBhznsFtW7D1WZqa0bSgJDmzwqYn2wGy0HMHAPWIvM0=; b=S9x9wXGCmildHuUqxcc5JELkgcXW9cn+6YER4CGY38IsWoufZ3UMhKjfWn5uVMazh1q8oudwUfsUl68jL08Nko70JG1Rw62U55LPhMJV9+b+aO6RrnXP5LHXjo1YpREIA5hXX4shXwnwPtMCTfFqXbEqoq1cndU6xZFrusiMD613PU5/afWTQZ62gG1MofQHPQxVIGwQ2dBTny3C2LwUHLb8Zx79aDUhBeEQQkdp6ZXb2G5rJLyFQbHvfcxy0P5DvPll5tF1lGPHswWytIqoPyRcqpCqM6D/3WQjfjYxepSti7mMga4DL45tWz//BazI38yNzvW7rRnCIGWCgN9twA== Received: from BN8PR15CA0019.namprd15.prod.outlook.com (2603:10b6:408:c0::32) by MW3PR12MB4348.namprd12.prod.outlook.com (2603:10b6:303:5f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:06:55 +0000 Received: from BN8NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::a1) by BN8PR15CA0019.outlook.office365.com (2603:10b6:408:c0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:06:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT040.mail.protection.outlook.com (10.13.177.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:06:55 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:06:53 +0000 From: Xueming Li To: Qi Zhang CC: Luca Boccassi , Robert Malz , Qiming Yang , dpdk stable Date: Mon, 10 May 2021 23:59:47 +0800 Message-ID: <20210510160258.30982-38-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c79ca053-34ab-43ce-7e26-08d913cda20a X-MS-TrafficTypeDiagnostic: MW3PR12MB4348: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YEbyoTBii64XCheBkh8+8su4hynfEHoS1d1NxOTDnTWOIKFva0Sho+/jLlsppDQEl0ivTwAZYK4BtSGDxdz4RBl677nhVEfAfu+A6Sn3WIHzF9Tn3qAh14SgGbZcX7TOwbVMb05q5dXko+aRcNSAA7DfpQWdjdDYWe1MxtZHVU7of3FQ5lJNUNK/0OKrJ0b8xEERBzYkbo/2B+aXyu0WvRPnR1Hi8c6Xme6ubdPjdPVBY4WBUdkwSsNb2oUhwuXZwYmzaOknmceepJMEPRcH+z+kCH2YeZ90W0uDQTFVLSQHGP3b/8LFV3YJnyHd1j7GbvsIc0lCsAmhIvlZno7AAfClwJjA869AcMXP6BC17Dk0BBM766z1lFoKlpoy+R7p212lsVzIGHr85W22idb30gwQUWGn4+9bobI0Js4Gg3Y7xY/KGAFJzRy+zHYFLf4Iq+a8fGEiErATr2rNoFT7pM4L/I1czJZWu1uhxEjqMLsshll4Md3ez9Rq0lGAj9FZOiR58frWUtusZmW+w8EArI7xLA4XndpVpIX5T8ywaugvStX/Ybuqpn9ImP+j2iKENd6qIUg4hTEhnAmx+c++2GEDb4TQcQI3zY8jHnYBvPimbKanIyOQy3xgseFi0dD4Zh5htZXvnbe1FJEm/Tkxo/Y4evBDRdTV0Lnu11WluaBTgPDlu267ALQGwKXYv5Xsq+Aj5/h9quislHGaLNtHbgoyLi98m6U26rIkOnUssdg= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(39860400002)(376002)(136003)(346002)(46966006)(36840700001)(966005)(186003)(16526019)(53546011)(26005)(83380400001)(82310400003)(478600001)(7636003)(86362001)(336012)(2906002)(426003)(2616005)(5660300002)(356005)(36906005)(82740400003)(47076005)(55016002)(8676002)(6666004)(7696005)(4326008)(6286002)(1076003)(54906003)(316002)(6916009)(70586007)(70206006)(8936002)(36860700001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:06:55.5656 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c79ca053-34ab-43ce-7e26-08d913cda20a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4348 Subject: [dpdk-stable] patch 'net/ice/base: cleanup filter list on error' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/0d32ae0c6f43fe3a954bc3016b80fecc0e132125 Thanks. Xueming Li --- >From 0d32ae0c6f43fe3a954bc3016b80fecc0e132125 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Tue, 2 Mar 2021 15:23:57 +0800 Subject: [PATCH] net/ice/base: cleanup filter list on error Cc: Luca Boccassi [ upstream commit 34ede45188c318e451ef98183814cc4555208f46 ] When ice_remove_vsi_lkup_fltr is called, by calling ice_add_to_vsi_fltr_list local copy of vsi filter list is created. If any issues during creation of vsi filter list occurs it up for the caller to free already allocated memory. This patch ensures proper memory deallocation in these cases. Fixes: c7dd15931183 ("net/ice/base: add virtual switch code") Signed-off-by: Robert Malz Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_switch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 247c3acb67..e6ea04183f 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -5602,7 +5602,7 @@ ice_remove_vsi_lkup_fltr(struct ice_hw *hw, u16 vsi_handle, &remove_list_head); ice_release_lock(rule_lock); if (status) - return; + goto free_fltr_list; switch (lkup) { case ICE_SW_LKUP_MAC: @@ -5630,6 +5630,7 @@ ice_remove_vsi_lkup_fltr(struct ice_hw *hw, u16 vsi_handle, break; } +free_fltr_list: LIST_FOR_EACH_ENTRY_SAFE(fm_entry, tmp, &remove_list_head, ice_fltr_list_entry, list_entry) { LIST_DEL(&fm_entry->list_entry); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:27.676447800 +0800 +++ 0039-net-ice-base-cleanup-filter-list-on-error.patch 2021-05-10 23:59:26.380000000 +0800 @@ -1 +1 @@ -From 34ede45188c318e451ef98183814cc4555208f46 Mon Sep 17 00:00:00 2001 +From 0d32ae0c6f43fe3a954bc3016b80fecc0e132125 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 34ede45188c318e451ef98183814cc4555208f46 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 2d0dd4b28c..3dc764266b 100644 +index 247c3acb67..e6ea04183f 100644 @@ -27 +29 @@ -@@ -6078,7 +6078,7 @@ ice_remove_vsi_lkup_fltr(struct ice_hw *hw, u16 vsi_handle, +@@ -5602,7 +5602,7 @@ ice_remove_vsi_lkup_fltr(struct ice_hw *hw, u16 vsi_handle, @@ -36 +38 @@ -@@ -6106,6 +6106,7 @@ ice_remove_vsi_lkup_fltr(struct ice_hw *hw, u16 vsi_handle, +@@ -5630,6 +5630,7 @@ ice_remove_vsi_lkup_fltr(struct ice_hw *hw, u16 vsi_handle,