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 12C9D433D8 for ; Mon, 11 Dec 2023 11:16:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E1CB42686; Mon, 11 Dec 2023 11:16:13 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2086.outbound.protection.outlook.com [40.107.220.86]) by mails.dpdk.org (Postfix) with ESMTP id 7E07440E0F for ; Mon, 11 Dec 2023 11:16:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a9Vwop02iyENjS6ADBBbUecxYEbJ91JdH2x6wErFVe/eHogHT1W4clbpiaXY64mytaZjB2QBaa6WTlysjxRJWf4NJLH0m5nNdXsT/KpK/eKSmqW7L7KA1Fo+LLBY0OFK2aOLyHQMNAAjea5slZLEoF9VYGVshxlEGtflkEa9H3OZon8mgIXfwL3r2UbDUjMUx6f0gD6Mw/2EAmlhAXkVkc/v7fg7AKbxQgyZQaaDi0lJ/foxGkeckbTafuh/NrAJZ5rHEP1tEEaZsCEz5fURzj3DxvV03HuKlWCQ6852FoICwD0x4aNwLzBjOR+C092b+6OQEJZ+zhCGtPK3duhCuA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=s+rWR/sOgaQO9TJOxUfkk1bCuQNiDxQgkwpkpBWPs1o=; b=ksBaNLjKP5zTfXHY6jWPFZzWduh+ElzNk1R5ylyBS9jgLekyXAu8hv4HPs9KYWxBOQsLJx4X7w4WB19P9IxCEAGH5wyi4dRg13WG01ZE+fS5Ul/m3VNfhpDTLtIr6rd/HgDM651zbxtgYjm5ymhMlmQTQipcNrhHsy/J0EWxPYo91wChXxMlMZpDUPi2e7oqpPMUkrW3ghZslDS4Y8ZMgsdVBIbzDQfMAP16E1WUSEILyVMxrYHwmHbwEGAf9JZmf4QxtaXlZcgiUgOMnlzFaPCVflVwzPyOi+yhUHCBnnAlQPFI45kCh4cdmvuJ6LQGqp6FLsg2j1KB6Yssx0XDxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=s+rWR/sOgaQO9TJOxUfkk1bCuQNiDxQgkwpkpBWPs1o=; b=UPH4ve+1E3vcP8OGCw+QS5p7gMnbSH4WMok0q4v9da3TEo/YjQvVTkaXGmx4Zb7NHS8cvwfs6xv6kit4dlLyL02HfiUxla1wG4t5uqJuzMf7pKXRJH+3sgbB71WRPoF/VL13hWvoVPvDmnQDm28Fkcmh3mTf/ta49Qa4wCTXwal8us55r5/G5cjWrzda9VNX9qNBIRSjL3Dh99AYX1eCuYFkQGgVTZY8iE6MUcGZMTfNiwZujy6NFQ5EIfl337HOEF4i+8ES7iwGXmyLYZjEIs2aOl9AkXNkUFBUi/EhJDU+cTrIpAqUyHeYdwLdQnhKhZDg9sewKJSynMyMhFwSNg== Received: from BLAPR05CA0013.namprd05.prod.outlook.com (2603:10b6:208:36e::28) by SA1PR12MB7411.namprd12.prod.outlook.com (2603:10b6:806:2b1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:16:09 +0000 Received: from MN1PEPF0000ECD5.namprd02.prod.outlook.com (2603:10b6:208:36e:cafe::91) by BLAPR05CA0013.outlook.office365.com (2603:10b6:208:36e::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.21 via Frontend Transport; Mon, 11 Dec 2023 10:16:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000ECD5.mail.protection.outlook.com (10.167.242.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:16:08 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:15:50 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:15:48 -0800 From: Xueming Li To: Jie Hai CC: dpdk stable Subject: patch 'net/hns3: fix some error logs' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:03 +0800 Message-ID: <20231211101226.2122-39-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD5:EE_|SA1PR12MB7411:EE_ X-MS-Office365-Filtering-Correlation-Id: 5705c5d4-40b4-4f7c-2b6f-08dbfa323176 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JAwYGo5Oz3PG6oxrMcEiml7DDxoM4RxqdIOvyVXAT3SeLueM2KLsdvEouBo4sx+LH4PcVJhyr/Ie61XlIrmxs5qETd5LP6Xj27UWpgGAfrjnUDHXFaTERgk8ZXRCqa90x8DHmL/HitXey8RudSNozum5ZJn/V/90WOgL30KhJlZynZ6IhdS3nvwjDGCc6PGt/Fij/E+ecFtpGx4ALA/wdcKioS3UmSrpyAIlmDp3B+jS8mFLW4eVrnWvrAs5CloVZfNz9IVnjNf+7Y8SFjUQ5Bx5zGHjQGSj/U0Lj0NU0u0r8hi56Wek+b8f1CFAZCmIJ0JWEIajt4MDuH4EvGgmJp5KmoAOpjmjAJtM5t213vP2/3CAZyDD2uJh9xFH3mimPESIHyTvbRsWkjj+F7nhjjvSKgNHOkYEtLBOt5nvSZad17WPCoM5uNVmVG85kJLP0yT1Ucd8kc6psMGY47x8SBpLbegK4IOvEw3VZ3lJU5x1U6yhAbdMK1EOqKa2o+zUECj7KtZmyV+nwBR6AoioF54IdvPjn7eQOfZpqYYBdyPuo6npSBcZZiTedafB5UQeod4PdPdfpp+uS4zbuTBrreizj9fL3I3IlyX454RKLNiUcznEgNSq0XVSnd8xeCTnmyxb/EkF219USADEvIJaVWjjFNkVELT0ERmGPotlVL7ur9tzxp5uqpmk5rZk3Sdga+uo80erReAkOHlCDuWLh9r8eunru1xUWNcNPhmHe8zeCS7d9CQkInBLoGcYsn6q8BFGg9TEThYLHt9Y0JP7i9xHx+YRYf7+PhwbNmgYGxs= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(396003)(136003)(376002)(346002)(230922051799003)(64100799003)(82310400011)(1800799012)(451199024)(186009)(40470700004)(36840700001)(46966006)(4001150100001)(6666004)(7696005)(2906002)(70206006)(6916009)(53546011)(7636003)(356005)(36756003)(86362001)(316002)(8936002)(4326008)(8676002)(5660300002)(55016003)(40480700001)(70586007)(966005)(478600001)(40460700003)(41300700001)(36860700001)(82740400003)(47076005)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:16:08.6162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5705c5d4-40b4-4f7c-2b6f-08dbfa323176 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7411 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 Hi, FYI, your patch has been queued to stable release 22.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=555126492becbea6c7d53883cef10015c8c2c98a Thanks. Xueming Li --- >From 555126492becbea6c7d53883cef10015c8c2c98a Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Tue, 31 Oct 2023 20:23:57 +0800 Subject: [PATCH] net/hns3: fix some error logs Cc: Xueming Li [ upstream commit fdafdca875eafe36950542cbfbdb21b01b371081 ] This patch fixes some error log. Fixes: 62e3ccc2b94c ("net/hns3: support flow control") Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_dcb.c | 2 +- drivers/net/hns3/hns3_flow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c index 07b8c46a81..2831d3dc62 100644 --- a/drivers/net/hns3/hns3_dcb.c +++ b/drivers/net/hns3/hns3_dcb.c @@ -1082,7 +1082,7 @@ hns3_dcb_map_cfg(struct hns3_hw *hw) ret = hns3_pg_to_pri_map(hw); if (ret) { - hns3_err(hw, "pri_to_pg mapping fail: %d", ret); + hns3_err(hw, "pg_to_pri mapping fail: %d", ret); return ret; } diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c index d5c9c22633..da17fa6e69 100644 --- a/drivers/net/hns3/hns3_flow.c +++ b/drivers/net/hns3/hns3_flow.c @@ -927,7 +927,7 @@ hns3_parse_sctp(const struct rte_flow_item *item, struct hns3_fdir_rule *rule, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_MASK, item, - "Only support src & dst port in SCTP"); + "Only support src & dst port & v-tag in SCTP"); if (sctp_mask->hdr.src_port) { hns3_set_bit(rule->input_set, INNER_SRC_PORT, 1); rule->key_conf.mask.src_port = -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.399635500 +0800 +++ 0038-net-hns3-fix-some-error-logs.patch 2023-12-11 17:56:22.977652300 +0800 @@ -1 +1 @@ -From fdafdca875eafe36950542cbfbdb21b01b371081 Mon Sep 17 00:00:00 2001 +From 555126492becbea6c7d53883cef10015c8c2c98a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fdafdca875eafe36950542cbfbdb21b01b371081 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -31 +33 @@ -index a5a7e452d8..7fbe65313c 100644 +index d5c9c22633..da17fa6e69 100644