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 025D3A0A0E for ; Mon, 10 May 2021 18:19:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0BEA4003E; Mon, 10 May 2021 18:19:27 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2059.outbound.protection.outlook.com [40.107.243.59]) by mails.dpdk.org (Postfix) with ESMTP id 1561A4003E for ; Mon, 10 May 2021 18:19:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H/ECEEd5XbiWk6CJwr3ZyV3HPkGJPY90PIozvQayv5G8a67MqeAdIPZ1aTCBM1q1zc++p5BBBbsxOX2Ko9MhPfCjWcQax7t64wxEHVCxvN8BBgPLnG/ayDRDe0feuBMJ+Ni2ptbpPpdyUw2SCm3KaBEbKzLMSj+cNdtEQYA42Xe6It7LJq/g/8tfArpQWYvdkkEKrmLZ1/VhXPBL+FW23QHBnV4pzcTIwZ0Rez1Lpqn0rh/WmeIhwnxwMIaKZnDDWPMH6rTdI+KeSLxgQy2GskeV/fT2KRVUbCmH9DK9wGcbpWkdU4CL98WLPRpKShaP89hNIPYbUeVxBpQVNbQDMA== 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=/IYz6/NF/DLqmd5sZLsxaBHlEKnGefAgMGbd8fGcyLA=; b=lSwISBDq/+UuvLtpKXF2WGQqBBi/8qd4wbQbeIB7JfWC1bCdsz5FLBik9bmA5tta04xCYNbTEWx3FatyiIezgoTxMuSaLGayoqgFfwT1SjLGOaeQs+2Py8R0MrYRr9Riqi5iOUl8J8ZckjI/0W6imWFiGP7WzOBtdTJos/Cc1fvHx/HduABdFk3uWSuKxfxIMXHcc0xmUus2whfwyQ5Y+b8dbz13LNiuVevZWWUl0l3+NVtSXzBSaVftcIep7yzPVaYvloZ9AQqnZjS4C+z4BiS46YZYR5TbsScbxdUCn30lxGENrawSH8DEcwMdbHh0YBUplNdhF0UhlaZWikXNNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=cisco.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=/IYz6/NF/DLqmd5sZLsxaBHlEKnGefAgMGbd8fGcyLA=; b=tRMVrfwS4ub2X/2W7iPCme1Gpn9lG/pNWuOeDDlq/aQX3ANEIc6YTQl1udQ8agIeb0f6fQbE9x+E+z4WH9aPOCv0pHUnBjzU0aSILqDO/qN0NwpKUBzb3uN5DpMLmv+Vy1bOtYT0FVHE+21Dh3TzvZ/x4dmwdLbQqHRnjGqCi+HIco6d9bi270hj1wm/LYW0y12g4ce6dD9X0bqkSXzio0qjz5xxiZEnYAQgbu4Yy+ppgLfIJg8coAaLpmC18wjqMvTc94O7lfXPTjAXvqoeXJ/uZFO2yI5AIlxY0ByAym/WEZRXDrkSUSYpFtUWEzK8fl400xT4oEOKyX7B/F+EzQ== Received: from DM3PR12CA0063.namprd12.prod.outlook.com (2603:10b6:0:56::31) by CY4PR12MB1446.namprd12.prod.outlook.com (2603:10b6:910:10::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:19:24 +0000 Received: from DM6NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:0:56:cafe::84) by DM3PR12CA0063.outlook.office365.com (2603:10b6:0:56::31) 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:19:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; cisco.com; dkim=none (message not signed) header.d=none;cisco.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 DM6NAM11FT054.mail.protection.outlook.com (10.13.173.95) 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:19:24 +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:19:22 +0000 From: Xueming Li To: John Daley CC: Luca Boccassi , Hyong Youb Kim , dpdk stable Date: Tue, 11 May 2021 00:01:51 +0800 Message-ID: <20210510160258.30982-162-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: 45fad4d5-93c3-4f28-fb6f-08d913cf6046 X-MS-TrafficTypeDiagnostic: CY4PR12MB1446: 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: lQWbc5ei8fQsg/KltNZkfOC9JhjAm77dBpsaBZ5BDU68iL5jsPD+Mu/LCip2JIgAVsIiav/5HEEkoPr52Na0XUuaQH83MXqt6Z4YRlIh8N1rlCKnSJ2j99Cq/9WALcK/vYHNJHVRpdUeLscOJGVSiMm11s8E2pyxGJn+ePNdDgTmZnXEC4zofFbbb0c19uT5oC9TpdO0wr1v7ytX6NFo2tYjF9cH/jrvRYDN5D27dNoaxU34DrfWuoOdcEvi6FHQE1kFznuWG27osxTuouy47Kt57TnHOkjDPUY8J++oXsXV84UpEF+AHn15pfXkHqu9uzC2pIxPfHBaEk5qjNXjeESb5Q2l8xwxF2nYZM0Pwph2FkLtnGYoT+mBr+L/Xa8cx1Ty1lIcKfU3CjW9X0nVNVAO5yIqMPo0LmvPveTcaSPzI3qtponFXHM2EoR4ZejcaMvR4eHVbTmofO6UQxharfzIFPDfeWk6p0lm9Y4oH6HJWZLY0z8Fdm0z/O4dFZcFS4l2daQ0JVkA0ibZNXId8OWjnMHjuJxE+Bxg9r5fOXwe+JTqja/44ynzPWoF9EV6f3NR+1vFt7HIsW2wCxne0WVza0nJmH32+MHp/2yKBvUpTJUHuxO1IiuKQYWE+0PBWDi3SEoUOWJahbfSImom5xmEZ107BwRk8Gq8qzHFp0tCR6p4XbvlweU8VokYZ5pdikd3mWdiEjOkBzwOyN5Cdfs/4lHs3FHzx8gfnqbYg1uTglwKl03Thin3ohoBfsy3Wnt+rElhhA+X5OjXGlaDDA== 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)(376002)(346002)(136003)(39860400002)(36840700001)(46966006)(36756003)(2906002)(2616005)(55016002)(6286002)(53546011)(8676002)(86362001)(426003)(26005)(36906005)(70206006)(54906003)(83380400001)(316002)(70586007)(82310400003)(36860700001)(8936002)(1076003)(16526019)(966005)(4326008)(6916009)(356005)(7696005)(5660300002)(7636003)(47076005)(82740400003)(336012)(6666004)(478600001)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:19:24.3049 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45fad4d5-93c3-4f28-fb6f-08d913cf6046 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: DM6NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1446 Subject: [dpdk-stable] patch 'net/enic: fix flow initialization error handling' 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/2b03f8ca36f00d15271c3cf6939cc696402e482a Thanks. Xueming Li --- >From 2b03f8ca36f00d15271c3cf6939cc696402e482a Mon Sep 17 00:00:00 2001 From: John Daley Date: Thu, 8 Apr 2021 16:06:31 -0700 Subject: [PATCH] net/enic: fix flow initialization error handling Cc: Luca Boccassi [ upstream commit 5aa67931ec0ee1d335297a8c3fec5643a57c136b ] Fix a rare case in rte_flow initialization where the action hash table is not freed if allocating a NIC match table fails. Fixes: ea7768b5bba8 ("net/enic: add flow implementation based on Flow Manager API") Signed-off-by: John Daley Reviewed-by: Hyong Youb Kim --- drivers/net/enic/enic_fm_flow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/enic/enic_fm_flow.c b/drivers/net/enic/enic_fm_flow.c index 86b91ed8b1..401076b726 100644 --- a/drivers/net/enic/enic_fm_flow.c +++ b/drivers/net/enic/enic_fm_flow.c @@ -2886,7 +2886,7 @@ enic_fm_init(struct enic *enic) rc = enic_fm_init_actions(fm); if (rc) { ENICPMD_LOG(ERR, "cannot create action hash, error:%d", rc); - goto error_tables; + goto error_counters; } /* * One default exact match table for each direction. We hold onto @@ -2895,7 +2895,7 @@ enic_fm_init(struct enic *enic) rc = enic_fet_alloc(fm, 1, NULL, 128, &fm->default_ig_fet); if (rc) { ENICPMD_LOG(ERR, "cannot alloc default IG exact match table"); - goto error_counters; + goto error_actions; } fm->default_ig_fet->ref = 1; rc = enic_fet_alloc(fm, 0, NULL, 128, &fm->default_eg_fet); @@ -2910,6 +2910,8 @@ enic_fm_init(struct enic *enic) error_ig_fet: enic_fet_free(fm, fm->default_ig_fet); +error_actions: + rte_hash_free(fm->action_hash); error_counters: enic_fm_free_all_counters(fm); error_tables: -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.812473700 +0800 +++ 0163-net-enic-fix-flow-initialization-error-handling.patch 2021-05-10 23:59:26.610000000 +0800 @@ -1 +1 @@ -From 5aa67931ec0ee1d335297a8c3fec5643a57c136b Mon Sep 17 00:00:00 2001 +From 2b03f8ca36f00d15271c3cf6939cc696402e482a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 5aa67931ec0ee1d335297a8c3fec5643a57c136b ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 21d9b1cef7..cd364ee16b 100644 +index 86b91ed8b1..401076b726 100644 @@ -22 +24 @@ -@@ -2890,7 +2890,7 @@ enic_fm_init(struct enic *enic) +@@ -2886,7 +2886,7 @@ enic_fm_init(struct enic *enic) @@ -31 +33 @@ -@@ -2899,7 +2899,7 @@ enic_fm_init(struct enic *enic) +@@ -2895,7 +2895,7 @@ enic_fm_init(struct enic *enic) @@ -40 +42 @@ -@@ -2914,6 +2914,8 @@ enic_fm_init(struct enic *enic) +@@ -2910,6 +2910,8 @@ enic_fm_init(struct enic *enic)