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 05C66A0C3F for ; Sat, 12 Jun 2021 01:16:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1D5240E46; Sat, 12 Jun 2021 01:16:07 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2054.outbound.protection.outlook.com [40.107.94.54]) by mails.dpdk.org (Postfix) with ESMTP id 21C0740E64 for ; Sat, 12 Jun 2021 01:16:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=agIEhb12QWvn5VglfD5nloq+TYwXVRV8SjnmkCQ70yLwkG3BG2bYiy+CEZ3JP3fbN2R+zKsjl8yALzs1sXX08gW20WDuR88DznkwSjNBzmK8c+673+3amLUTtjpQlzDX/G5i6u0z/Y5twD5Axi+nywXbxQTHnMOorulDMuBaMOSvR161OngicmGRf8A42NEx74sKTspuW/QyYPIPYSDkzLNbgFtzPpa2W2sJbcv1+vulhp2UCPeSj4YeCObyggijUYUJ9p7yB9Z/CWiwJvqejKZoC0BnOgSHZcI1kNgMqN5d/teTLZLZBeDw/SJgasA3YEDmpjUNaNsIbW+o41PxPQ== 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=q/slpWrBqQu1mSWiTqQxI6EyM46xVDbVj+zJxlxF/EE=; b=EEAuIW7yPfXXtWSkWZ+NY/9/Va5+b2FDIKZde00LnI5OvrxxjFzl5idl3uo1TIspaxi6AXAKUnof65f4BPBxRE62ikpU7/I3Z+DZmti/zlP30OMyPMXR7Y0W39YcfM1lHcbq9ccO8eWkz0KFcbVkn2yxcnGI46iwUwANJcktHogfcq7uv+dbk7+fJ48drmPSGLqJFuN3z/zwWw3ywNLvB5qhEpFNAq/u3pRjKexPIi5L1sAPlqErNiCMK8rkHeuzaJ1JC7TRKVKUqamYimSwVBtW6742Rc3lRPBEHGabuQZJvEaKo0cxa7Zxedh9uLp9dCyVUFJHs9iic6nuqsSYRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=huawei.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=q/slpWrBqQu1mSWiTqQxI6EyM46xVDbVj+zJxlxF/EE=; b=feGkEgpYd7o1rsjjvFRbNkzLj8TfNgDcM15e9o20XHhqYfoMq0MltQibPQE+T0PfmpsIZV5sZ+1MML9seQFdbQnP4SfA7oIuMwUD9figs68yQM8O7LnsVNBvVyKRuB1e8NRGBwSEgd12dSCNj1O7p8q8rv2p5JYQJLoZdYNYuTcJ+4OVPwuYesZH0HfREcqlZdRcgvpPr2BWqLVla+noKbMo1q+onj2o4nhpR5Zo8oSmT6TE5n2VVN1mo3McKHaupS2tFrQsCyfpbMOqExAE/wEn+hapazJgH3accbrhE1gb1aQjwRVoFFTphHnUvZjhTK1aNLCmrafUEWTZMRBaww== Received: from BN9PR03CA0483.namprd03.prod.outlook.com (2603:10b6:408:130::8) by BY5PR12MB4084.namprd12.prod.outlook.com (2603:10b6:a03:205::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:16:05 +0000 Received: from BN8NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:408:130:cafe::71) by BN9PR03CA0483.outlook.office365.com (2603:10b6:408:130::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:16:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; huawei.com; dkim=none (message not signed) header.d=none;huawei.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 BN8NAM11FT011.mail.protection.outlook.com (10.13.176.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:16:05 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:16:03 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:03:34 +0800 Message-ID: <20210611230433.8208-120-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee9cdb6f-4020-4a19-a04a-08d92d2ee34c X-MS-TrafficTypeDiagnostic: BY5PR12MB4084: 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: UsTIy5QwcgpmUYRTzNfvhXlhaAAqOTOuIsnYXl3xH4zb+qs0LanJV7dd11I4vNZFTyqzJuzJSRGm5WHo2MBq2xyKRMJrKDX4N+ofdpl76p1FfaBGMBFBwduo3bh687zUdM3eLqUq8eNYT77uqTu5xlDkHwTbDnb7uq6FlLA7tE3scBaX20dQMTe70+rUXcgLnjbpbzq8KMFFZ5P7JdCxEBy2qQHkxqKZcPZ05fDVUVvAs6ydQZ3HuJdTupW0gLt3f9yRy8/ae+NQ6kAdjnBxrSYzrMEv2N4X9vZDsCWjtqYfvprpGau20lSsfznZxsOr0LgzHG2JBVkYP3o424JBNVHZqPll5e0kDP8dbWEI5kksgk0Oj3BUKej0Gs7C319TTRNGsSaoVT5io0VONgfbf3nsj49mxbtPGeQOcDtSs+TvzSQw4pMMeajhX0P5P4OPx4xlK1ucHjCDAe63wqI4rB3gzegXOdAdcs0RHqMVoIpCceIcOXvx7es3xH7Wmuc9CQOW56SWBbmZfApMV1wnBAWU9pCGexcyFXNi+HEL/hsRdNDdzVC8Hin8R0GvG9lNeVNLJjc3Lf+Y8VvqGrUkfWd8jxOI7S5qRPwSmC15IWuV2kMhuHS3fg/IyBgU2U7c0TApi74AuhX5q595UhNE2oErrW8HrwLM5m/7UambxGHAsadj3DMfXTbvT7lpothcPaQm9ZBSfg7b1EiWGBI/NQfCuphL3D7WYb7Ho6yu4VMu0vnGgY1rA2EoyAalqOJ6PKkSV55w67xAWo2mB1sGISYrKZCyiPutHhmVLJKXxBN0Kij2RzMNU3AE8xdzL2pY 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)(346002)(396003)(376002)(39860400002)(136003)(46966006)(36840700001)(6916009)(1076003)(8676002)(478600001)(53546011)(316002)(426003)(70586007)(6666004)(966005)(8936002)(356005)(70206006)(186003)(86362001)(16526019)(5660300002)(336012)(54906003)(82740400003)(7636003)(26005)(6286002)(36860700001)(7696005)(55016002)(36756003)(2616005)(2906002)(82310400003)(4326008)(36906005)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:16:05.2942 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee9cdb6f-4020-4a19-a04a-08d92d2ee34c 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: BN8NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4084 Subject: [dpdk-stable] patch 'net/hns3: clear hash map on flow director clear' 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 06/14/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/6ed898b2971caa51fe2542911e301f57550f7e95 Thanks. Xueming Li --- >From 6ed898b2971caa51fe2542911e301f57550f7e95 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 7 May 2021 17:08:16 +0800 Subject: [PATCH] net/hns3: clear hash map on flow director clear Cc: Luca Boccassi [ upstream commit 7d01f89fa6a149157f77ef11a2b5ebec890d7db8 ] The fdir hash map hold the pointers of fdir rule elements, it needs to be set to NULL when clear all fdir rules. Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_fdir.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c index ab7db1189d..693d9c731a 100644 --- a/drivers/net/hns3/hns3_fdir.c +++ b/drivers/net/hns3/hns3_fdir.c @@ -1020,6 +1020,10 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns) /* flush flow director */ rte_hash_reset(fdir_info->hash_handle); + memset(fdir_info->hash_map, 0, + sizeof(struct hns3_fdir_rule_ele *) * + fdir_info->fd_cfg.rule_num[HNS3_FD_STAGE_1]); + fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list); while (fdir_filter) { TAILQ_REMOVE(&fdir_info->fdir_list, fdir_filter, entries); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.673472800 +0800 +++ 0120-net-hns3-clear-hash-map-on-flow-director-clear.patch 2021-06-12 06:53:56.510000000 +0800 @@ -1 +1 @@ -From 7d01f89fa6a149157f77ef11a2b5ebec890d7db8 Mon Sep 17 00:00:00 2001 +From 6ed898b2971caa51fe2542911e301f57550f7e95 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 7d01f89fa6a149157f77ef11a2b5ebec890d7db8 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index e116d872fb..d043f5786d 100644 +index ab7db1189d..693d9c731a 100644 @@ -22 +24 @@ -@@ -1033,6 +1033,10 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns) +@@ -1020,6 +1020,10 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns)