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 3F2BFA0A0E for ; Mon, 10 May 2021 18:18:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 397C340140; Mon, 10 May 2021 18:18:58 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2047.outbound.protection.outlook.com [40.107.102.47]) by mails.dpdk.org (Postfix) with ESMTP id 327654014E for ; Mon, 10 May 2021 18:18:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YAwMV/cbafVuo9bKWZpXwS5MVVPGxvQjcYquWDVy5PSVTv1Rg0ta/VFaYqJL2dj/mQOZVktq5yW/5Z+GxUhSO/Dy7iNmVQ4iFLAb5YF1ZOf/8uTwmo2+1AuVsOk7WxFbJL8gTI5gghzlSb/dIgdLO0YckEMXg0GT+U7hTRiY/hzgkbzrrN8wwcyuDN2YTjXVLRviKIRMPLye/Ze1ZJLIxrz8xa2Aj+7rQOOs6NDSR7xy5T/gYbmYvE0Y9OPEM+UubBfPEbpDYJ7swH9mvQuReF5XZZ6O29cBGuN9UbbGVq/Vap0/bxTxRjwpwx3Nomca1X37kTB3XlIoZadmuyv1gQ== 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=IVSOa09BDqCsednTilsRazRm2Hmc1uVj74oBuuth39k=; b=ieOYwO7ZYB9ze5TQYjUZAkEsBofhfQdR6rLPmnQgB6Fed2ScMLbMbW7njEpqn1T1DJEAO+FMZZ56ox14+6E/6WkyBgq6nruDM3B9Fuu5vRDWm8YTxttPw/NJcCz/Mv2u4PJTYELaz2Tk0Jj1Hx/A0QKWYBQTjXHSSHb4zZqCf7rXZQED5vNpckPGXUxk4akbhp7193uqCCBOOZdBuv4FZM2Rm3IEPvJlGHNgmnNMpN4Rje6nDKspXfb3KKDyHsj74NVeDLbDzorkhvbpJrFq2tfdH2f9LJ5UD8Qd4XmpTfD9nTilv4/9EsiUlyE8DaUl0spElK7HOmOX5AbnA6pfCw== 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=IVSOa09BDqCsednTilsRazRm2Hmc1uVj74oBuuth39k=; b=j8yJccQBc2pgjGaUQkwyVoV4qnv+lTGpXXPyeZKqjaTZItbwWLQsB/rmLmypi3UU95CI6Rv1a3dWyKguqv32Cq/pWk6DK3K0mpc/bKoygFmw96H+sKvDr5vZUO3tFtN8wkkM0GLQuEGPk2UQdcKJ8JJQJK9K7sqdXrO2XqBfAsIg4rLBojUX6dZv2gZvFNGANVYxqqbtuhIIHzYEwnhYgA53/sxrReHN+IvJmOVsAygiZkzRC98t7hMLAjr8eoXTRPVpgt+qUWIenoP6TLOWIdRPQGdd9mBvqsOgvhnqIKaZnwX5OTM/gtOb/C5KG5GZcsqhoC1l9X+zAYixoY3azQ== Received: from DM6PR13CA0067.namprd13.prod.outlook.com (2603:10b6:5:134::44) by BL0PR12MB4674.namprd12.prod.outlook.com (2603:10b6:207:38::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24; Mon, 10 May 2021 16:18:54 +0000 Received: from DM6NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::e0) by DM6PR13CA0067.outlook.office365.com (2603:10b6:5:134::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.9 via Frontend Transport; Mon, 10 May 2021 16:18:54 +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 DM6NAM11FT018.mail.protection.outlook.com (10.13.172.110) 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:18:54 +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:18:52 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Min Hu , dpdk stable Date: Tue, 11 May 2021 00:01:46 +0800 Message-ID: <20210510160258.30982-157-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: 67597238-5174-4dc7-23aa-08d913cf4e63 X-MS-TrafficTypeDiagnostic: BL0PR12MB4674: 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: 1x421+O1R6Owz32a88HYbjQZx1izMZQwsng7OpAYWZQ0QLl4VxFc9FMQDkzaVPkH54MoCzyhCki1kJrd73ibM5ovg4rvjylVuK2QoiYEpxdfPzTMZqUgUhLU+prfQRX4WVjVXPhpZ+f1sFTUzjiebCwjzvfUNdL59NAws3+dUQvlrgL/sG4ZnXioy79vi+5pww34GrfQiyX7Pa3l+XXx00RO7+lwG3i58xDMXn95k0uegWQ3uRtfZy9XWz8NqYGq314LpzzUjeeMxUzW0mwXLW0eoO/THw77WfnRh9ex13TdldkL/1+l0HuLVRR0T3GzUaOk95X9BwLK4JtTu/PVdrOYs9RyKQLmhdsZLWNx72NP0V/Sy04JHp8N1+wYzF8U1RjTD6yxQBVTohVZUgIznJuLUqNskW56k2A6yCsp/BSM0LKwvYUJiTOp8n/ZuGnbcC5tUvB6ObHuE6eVxf79YtWiS5V0sxCxAIqh5fibG0XjsAvCCrvipREsUqYANCKbcLpIcSPEFwrAhFdSkMauy1ATgwJdEVo1lVfDvUd9+/eM3WGp1O59DOUSv9gvPZlfP9I/FQydU7GL6eQYb5LtILQ7iC8EVWuqkUZDjRUeuEnr+Nr6a4nUBeYN5MHvCUp4LgWcGi2bRTykHXHMT6+bgDJmhnlubln6QwUdOGSeFXZDXgQ7hZaimWpnRI0vRGysbYAk1VdJbuEKuzRVFVYOrUx1NQmSQIB4W29x0UC3XrpG5FTrYcroPlSV0RjVWmmfJAqrWn+pLf1+N1ZnSvRo5Q== 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)(136003)(39860400002)(346002)(376002)(396003)(46966006)(36840700001)(53546011)(6286002)(55016002)(336012)(2616005)(5660300002)(966005)(7636003)(82740400003)(7696005)(6666004)(478600001)(4326008)(426003)(1076003)(356005)(54906003)(26005)(8676002)(6916009)(36756003)(70206006)(70586007)(82310400003)(316002)(36906005)(47076005)(16526019)(86362001)(2906002)(186003)(36860700001)(8936002)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:18:54.2914 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67597238-5174-4dc7-23aa-08d913cf4e63 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: DM6NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4674 Subject: [dpdk-stable] patch 'net/hns3: fix flow control exception' 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/654aeb26190145635f321c44029d8a853f55a25b Thanks. Xueming Li --- >From 654aeb26190145635f321c44029d8a853f55a25b Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 31 Mar 2021 18:01:39 +0800 Subject: [PATCH] net/hns3: fix flow control exception Cc: Luca Boccassi [ upstream commit f1c555219fee71fe76cc53955cd0c052c88b2848 ] In multi-TC scenarios, MAC pause is not supported. Otherwise, only TC0 can trigger pause frames, and other TCs cannot trigger pause frames. In this case, flow control does not meet the expectation. Fixes: 62e3ccc2b94c ("net/hns3: support flow control") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index b5a02dfc13..b90ee642d6 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5279,6 +5279,11 @@ hns3_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) return -EOPNOTSUPP; } + if (hw->num_tc > 1) { + hns3_err(hw, "in multi-TC scenarios, MAC pause is not supported."); + return -EOPNOTSUPP; + } + hns3_get_fc_mode(hw, fc_conf->mode); if (hw->requested_mode == hw->current_mode && pf->pause_time == fc_conf->pause_time) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.688855900 +0800 +++ 0158-net-hns3-fix-flow-control-exception.patch 2021-05-10 23:59:26.610000000 +0800 @@ -1 +1 @@ -From f1c555219fee71fe76cc53955cd0c052c88b2848 Mon Sep 17 00:00:00 2001 +From 654aeb26190145635f321c44029d8a853f55a25b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit f1c555219fee71fe76cc53955cd0c052c88b2848 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 56b3032e6b..2fa0bfa072 100644 +index b5a02dfc13..b90ee642d6 100644 @@ -23 +25 @@ -@@ -5554,6 +5554,11 @@ hns3_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) +@@ -5279,6 +5279,11 @@ hns3_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)