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 D99F9A0C3F for ; Sat, 12 Jun 2021 01:16:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CEF3E4003F; Sat, 12 Jun 2021 01:16:06 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2043.outbound.protection.outlook.com [40.107.223.43]) by mails.dpdk.org (Postfix) with ESMTP id 59C4B4003F for ; Sat, 12 Jun 2021 01:16:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f0x5NX6slB9nIoiY12qqq8Viw/tUwqKaTIAIJJ5AT2ZXucQQHuCDicumqcJYRoi6QNRhJspgus0C/Z3As0MSK/rsxqzrFEr6uoD97GDg71YwMy+0GEUzOHPzXJKXaEVTeT4K65UwdVySTMGVO4jTAc27LxvJVGrsT0AUfn1J5vKhmQrBg1w3C/bQjE2uVJJnGNMN6Hfhn/BsstGMi+Yeu/s76vfOhoS3bYU4hkA3x6EHdKneBj2zYtXSTz422qsYeSVAUuAq8wITg5/Mki9QrARmoH/Mv2SLxQCiETUyDMBeKjHSPkinqC8hZVf2M5cEhoXAk/PVaH4fy8nlpWzgbg== 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=N7KaCVB1LY04jTPc6DMGwpXsMWKGZJNskWwWUAiuguk=; b=j6q89QdB1wckNPrGet8j5SXAoZAXapRyZSpRWVvQ3k/YFh7nm3tYTmXNSukdZLpJE2NhPJXJtvB07IrmZYlYIjbR2wYZEgS58aHO91Frw4buBp/SuMd+JdaMA8YQ2L9u5tj6cE/0twb6umWy29AbqrcRj1hyaDz39lCnO6ylRRc3ZLT6n7APJSj40IrlrkX722DTrw6KvuKiIOzFApc6nMdPISIqYfunrm+TDbBTALitu6RGoUc6gCs7KgkEwAbZXB9MQ27gER2fd4ksl3FQ8cJfvwl2VPsTWJWdpS4zOEC6dvjtqrZV/Lt1rUbn8XEksY+KOt9r1G927IZ3E7RFmA== 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=N7KaCVB1LY04jTPc6DMGwpXsMWKGZJNskWwWUAiuguk=; b=eDEIbCkUXpab7gWxTbPHOdQ8p9VjhhkRCqZma5cQbkWOHEj4VYbkZCMBFwqdZaw5cWaLprgLR4iKEGEzEdgAVgAe34KlXLLX85dU+GhPuxuAemp48JBsyyMUmaEVs5gqaC6Id+5hJLk1/o8b55v4wxDjzsd5Zo3tKGqArAfN7yzMm6KvB/F223sRstodT13THSE2/n8rZ3IvvbYlbGTkLyWi33nDLPbALFhXXGB4zxfqGhVgaMDvjYoLsVXknRGcX/RRFOxsUOVygqdTaeDM03n53FNNUzJnvGCLKRBb/yPjxOqAN1wh0xYSelYzg3prEVJjL4nLGiAZy2da8+iCqw== Received: from BN9PR03CA0494.namprd03.prod.outlook.com (2603:10b6:408:130::19) by MN2PR12MB3184.namprd12.prod.outlook.com (2603:10b6:208:100::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20; Fri, 11 Jun 2021 23:16:02 +0000 Received: from BN8NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:408:130:cafe::63) by BN9PR03CA0494.outlook.office365.com (2603:10b6:408:130::19) 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:02 +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:02 +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:01 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:03:33 +0800 Message-ID: <20210611230433.8208-119-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: 00edc239-5db5-4d4d-a903-08d92d2ee1a6 X-MS-TrafficTypeDiagnostic: MN2PR12MB3184: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1051; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yH2BJq/Hk1JhVQ78574dlZhIG8/v0QU7ojVIKfO5i2ZikpucMfMarygaGfE1wskbvpOtRKJvuc3FIEXQHZpnKiPDrITRb7cpIUykEPayei9pnpSB5QO8Iy/8Sn20vWhAmc4IcpPCdhcym2zNw1HnmUQ0u6lWNcxoQ0dyBWidFsin7ezEkKVgkSfAbAap8M7OMc9NrsoJCJXrw+bkOsqoWRFpXOodc1UV20y0/Sjv4zBdv1UWAIrEDFGmrweFp+jQTc2mIvaRFvQKWt3t2Yl5PF1rnS2rrpaY4WVXfbbIyLUQBY3i47ch/XMReZUelWc1Tue63xzMiJIlQIhFrUpBkzPDY8mtY7KSuc6z7D9fPKugnJ58hOhI9Tyz9CjLRFMQYXfgB2NX1A9N2WnBJnw86/L2h8nAJZbbnn3p6VUKGrIKE10EzN1NI5lz0xxjkU6R/FcLe1cm8nultPNkbJafejGV+DdUoVCt3Ddg2xQW1pwaxl7+q+OHXbkjfyrCWCLIopFMM54NVZJuKunXb/KkwY+Pw08CSEcCH8Pig14gaXRwdvyzdmxfDEdtu+pQsu1RkB+L7GHPF4/dU8rsujzMIYC62/ocMPg8tv5HQHfA+vd6xr9Mnz0IFnkvYeFpJoH3w+8Ocymshsqjzu3+Ij8C/wXRru4jVrzeAjhNcKUQ0Ku5+T+BgnOG3/N25rNQGcZS04tuPyATpq6ciHmQHZE6qNyI1D2jLxxK3ku5D085I4Ng8qCFCQGofd36VgcWzU4g+HDRTs006OVm3/88EgzDLbk0yexFJ7DOXwUupwZpVLEfHxeWA9LMMZfYeR46LhDS 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)(39860400002)(136003)(376002)(396003)(46966006)(36840700001)(54906003)(70586007)(2616005)(7636003)(36906005)(6666004)(47076005)(53546011)(7696005)(186003)(2906002)(82740400003)(82310400003)(26005)(5660300002)(966005)(86362001)(478600001)(36860700001)(6916009)(4326008)(55016002)(83380400001)(8936002)(1076003)(336012)(70206006)(36756003)(16526019)(6286002)(316002)(426003)(356005)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:16:02.5238 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00edc239-5db5-4d4d-a903-08d92d2ee1a6 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: MN2PR12MB3184 Subject: [dpdk-stable] patch 'net/hns3: fix log 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/8f93ec62881375eb5ec45696d44cee34f3d161fc Thanks. Xueming Li --- >From 8f93ec62881375eb5ec45696d44cee34f3d161fc Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 7 May 2021 17:08:15 +0800 Subject: [PATCH] net/hns3: fix log on flow director clear Cc: Luca Boccassi [ upstream commit f4e5c18ffa2656d253bc334171854e60463afbbb ] If clear FDIR rules fail, the error code was logged, but the error code was useless because it was the sum of all fail code. This patch fixes it by log the success cnt and fail cnt. Fixes: fcba820d9b9e ("net/hns3: support flow director") Fixes: 8eed8acc812e ("net/hns3: add error code to some logs") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_fdir.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c index 3810c6fcd1..ab7db1189d 100644 --- a/drivers/net/hns3/hns3_fdir.c +++ b/drivers/net/hns3/hns3_fdir.c @@ -1013,6 +1013,8 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns) struct hns3_fdir_info *fdir_info = &pf->fdir; struct hns3_fdir_rule_ele *fdir_filter; struct hns3_hw *hw = &hns->hw; + int succ_cnt = 0; + int fail_cnt = 0; int ret = 0; /* flush flow director */ @@ -1021,17 +1023,23 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns) fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list); while (fdir_filter) { TAILQ_REMOVE(&fdir_info->fdir_list, fdir_filter, entries); - ret += hns3_fd_tcam_config(hw, true, - fdir_filter->fdir_conf.location, - NULL, false); + ret = hns3_fd_tcam_config(hw, true, + fdir_filter->fdir_conf.location, + NULL, false); + if (ret == 0) + succ_cnt++; + else + fail_cnt++; rte_free(fdir_filter); fdir_filter = TAILQ_FIRST(&fdir_info->fdir_list); } - if (ret) { - hns3_err(hw, "Fail to delete FDIR filter, ret = %d", ret); + if (fail_cnt > 0) { + hns3_err(hw, "fail to delete all FDIR filter, success num = %d " + "fail num = %d", succ_cnt, fail_cnt); ret = -EIO; } + return ret; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.647938800 +0800 +++ 0119-net-hns3-fix-log-on-flow-director-clear.patch 2021-06-12 06:53:56.510000000 +0800 @@ -1 +1 @@ -From f4e5c18ffa2656d253bc334171854e60463afbbb Mon Sep 17 00:00:00 2001 +From 8f93ec62881375eb5ec45696d44cee34f3d161fc Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit f4e5c18ffa2656d253bc334171854e60463afbbb ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 0ef0938ea2..e116d872fb 100644 +index 3810c6fcd1..ab7db1189d 100644 @@ -25 +27 @@ -@@ -1026,6 +1026,8 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns) +@@ -1013,6 +1013,8 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns) @@ -34 +36 @@ -@@ -1034,17 +1036,23 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns) +@@ -1021,17 +1023,23 @@ int hns3_clear_all_fdir_filter(struct hns3_adapter *hns)