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 AFFDB433D8 for ; Mon, 11 Dec 2023 11:16:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA22A42686; Mon, 11 Dec 2023 11:16:10 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2078.outbound.protection.outlook.com [40.107.223.78]) by mails.dpdk.org (Postfix) with ESMTP id 88D5C40E0F for ; Mon, 11 Dec 2023 11:16:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j1XdVINaUtQ0FDT960Rehv1Op7wvmEhYPaVUlFQscqeliLTSfbheHpP7IDd3EgS0qi9uBZmCROqjni1polhRHPWEJYGge4cR8GpP1AY7FF2UMLsI9Je1bWkeZQ2qmWEZ/W9QQNFof/GqERhaRQEnS55Yc1I+9NSuVz/cyO4wcG9GHFpeV0+KvItH6PDd9UeCJntOfMTWPUATtPJjER79NZbGktFQkn7xJU5B7NSFhO+sP6MsTW5xZ5PkKqjvGEWMovYEcaG3qHqz9eGW06aeL1H7Xh+8F3rKmM9g6sjbL0YYqdT7GjUzhpQh6lk4sxpYWMgdDWaiS5l5HORVidQi8g== 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=CG8U9i5wExFX6/wWGJSbPBoTTgmK459IG/MRVXUoGU4=; b=ZamUczvjFv7rbWUJqO7lKXzBSaG8iKkN6WdQL2fDh6hMHdG3Gp6XG6davnQSx9dkuNs2iQrOmWL64jnE+MJO10I3xVRxOhBs6crlbVgWtQLawZYn3M+sAfmquVDqw4JWpt/GU/XUpGRON8WfYtT4VhjiUalh1Xi55PyDUV2tFNL8plXVNk5/iv4u9nodw7t2B0jFghcjiPK8TXo10qpK22hbWUsuaAu1zigXagFwM5/vKO152iOQTvt2IBsKUQmeWKxmLI29kBaUJ808tSNHpxN8XWMxNFy0wOEKogSrxT0RKtGZWKxkgH+ODDHSPIBdU73lygj2e6dZg+937JuPGw== 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=CG8U9i5wExFX6/wWGJSbPBoTTgmK459IG/MRVXUoGU4=; b=YDAgm8PLO62QJLhqx6ipSt3AcSH7Jfv1UFnH0Lp5XEDI4VppzPhn+R9IIaPQKEV63RlVUHU5qMRTMXeDlAUSMfxfcHjPgtVGuJ7rb6TcwN62A5GD/CM3JiwANemQDQamyQSXHGKCbTyShjkmraNM7oz3RIwdmnJ7iAReaHin4dl+1WqdRHGvBKmqyGnAKmcyJyo2nSUmsKgQH1IyNsSq7ko6mEPNUFdxTjGOshejUWlHRSaq+gMkjzJVxLtS6hi/uW3J9MHGsF2z6RTbSUM2A2x7ll1VZwxkoFgLY6BQW2FKwSr1u97mEYbJhVVoWEEO9ei2MyBY+LJPIWlPgOhYWQ== Received: from BLAPR05CA0001.namprd05.prod.outlook.com (2603:10b6:208:36e::6) by PH0PR12MB5436.namprd12.prod.outlook.com (2603:10b6:510:eb::11) 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:06 +0000 Received: from MN1PEPF0000ECD5.namprd02.prod.outlook.com (2603:10b6:208:36e:cafe::62) by BLAPR05CA0001.outlook.office365.com (2603:10b6:208:36e::6) 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:06 +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:05 +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:48 -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:47 -0800 From: Xueming Li To: Jie Hai CC: dpdk stable Subject: patch 'net/hns3: fix some return values' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:02 +0800 Message-ID: <20231211101226.2122-38-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_|PH0PR12MB5436:EE_ X-MS-Office365-Filtering-Correlation-Id: 83183940-f239-4215-eebc-08dbfa322fd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7u8Rfcs9tqouUcP4URiHe187imittIf0gjMFYtsIhfQADq7kMV3E2TKNaRcHTKyXIO2f8zBIzWq1D3W1OWC4pf9BUhkoY1p+ycu57BhUv6Oyis4P5ckUpuGY9lIvrhTUvYQ3lQcE8XYVd7EmJiGLeUyiXwenGTZ74iypD11/SRSkwkNqDnwCGhmiSh4mGI2oZbsjqzsvZmIueYmQGchC8oSn1byx90XACdN0MjJ91HNXy7XLseu3Io00MLI9+MDj9FlUfN/qZWRO2k0CFf/oLV6phamtyKtJil69jJPVb/prAoRpCy/iR8WDrX44jPDDJIuEfIuhRV319N9ZjtKLbd9JSlywaWXhSvmMJ7lSbosWZ9nzGm7KhqFzgxgejgXJHrvBEdh9MuO/QRQs2wDdvl32jpzx/DIJuN/YH1tqW8gibetw76tQCczVy3JSxwmv3HjWGgCSrOue9KJahLFB0enDmp+/sK5DYgPVAj56ZPVRoEtavxs1eVRDrDFtjm6bm5gYtVTGS1Xr+jIiRHXlKTIKi1uyh4h9/xSMswD0VBLo3uYh9EWIDrC3xmdWKvFLS+0QxCMf3q8AobM5u0MoPnve2JybU4daWbDCCg2AB8Fg3xJvJikGa7gLXxqzjd3pljkThy6RCkTRxivy4HX9O9kfgXkegP9KkPFV9ViZzKqMaVuxmmXXcl49mx5jPk/AHyn8eo0CJ0plpgdRtTGDM5zHW8kJgO/8rfu8Kn5BkijdBzGQ0L6LRbQ1L48etqQl1Io5rX88JqCZsvykP0R7QTD4H42Eh/XPqGlTwra7OTk= 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:05.8818 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 83183940-f239-4215-eebc-08dbfa322fd4 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: PH0PR12MB5436 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=84b217ed2cf446539ff591af5c52eec75e3bdf84 Thanks. Xueming Li --- >From 84b217ed2cf446539ff591af5c52eec75e3bdf84 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Tue, 31 Oct 2023 20:23:56 +0800 Subject: [PATCH] net/hns3: fix some return values Cc: Xueming Li [ upstream commit 08159599978f7f7eb6c4aaed7c290e33b8bc3d64 ] 1. Fix the return value of hns3_get_imissed_stats_num as 'uint16_t'. 2. Add some error check for return value. Fixes: fcba820d9b9e ("net/hns3: support flow director") Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_ethdev_vf.c | 5 ++++- drivers/net/hns3/hns3_fdir.c | 2 +- drivers/net/hns3/hns3_stats.c | 15 ++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 3cbf2ed2a7..64f4dd148c 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -2162,8 +2162,11 @@ hns3vf_reinit_dev(struct hns3_adapter *hns) */ if (pci_dev->kdrv == RTE_PCI_KDRV_IGB_UIO || pci_dev->kdrv == RTE_PCI_KDRV_UIO_GENERIC) { - if (hns3vf_enable_msix(pci_dev, true)) + ret = hns3vf_enable_msix(pci_dev, true); + if (ret != 0) { hns3_err(hw, "Failed to enable msix"); + return ret; + } } rte_intr_enable(pci_dev->intr_handle); diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c index 48a91fb517..a3e79619ec 100644 --- a/drivers/net/hns3/hns3_fdir.c +++ b/drivers/net/hns3/hns3_fdir.c @@ -974,7 +974,7 @@ int hns3_fdir_filter_program(struct hns3_adapter *hns, rule->key_conf.spec.src_port, rule->key_conf.spec.dst_port, ret); else - hns3_remove_fdir_filter(hw, fdir_info, &rule->key_conf); + ret = hns3_remove_fdir_filter(hw, fdir_info, &rule->key_conf); return ret; } diff --git a/drivers/net/hns3/hns3_stats.c b/drivers/net/hns3/hns3_stats.c index c2e692a2c5..9a1e8935e5 100644 --- a/drivers/net/hns3/hns3_stats.c +++ b/drivers/net/hns3/hns3_stats.c @@ -771,7 +771,7 @@ hns3_mac_stats_reset(struct hns3_hw *hw) return 0; } -static int +static uint16_t hns3_get_imissed_stats_num(struct hns3_adapter *hns) { #define NO_IMISSED_STATS_NUM 0 @@ -993,7 +993,7 @@ hns3_imissed_stats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, struct hns3_adapter *hns = dev->data->dev_private; struct hns3_hw *hw = &hns->hw; struct hns3_rx_missed_stats *imissed_stats = &hw->imissed_stats; - int imissed_stats_num; + uint16_t imissed_stats_num; int cnt = *count; char *addr; uint16_t i; @@ -1170,7 +1170,7 @@ hns3_imissed_stats_name_get(struct rte_eth_dev *dev, { struct hns3_adapter *hns = dev->data->dev_private; uint32_t cnt = *count; - int imissed_stats_num; + uint16_t imissed_stats_num; uint16_t i; imissed_stats_num = hns3_get_imissed_stats_num(hns); @@ -1539,8 +1539,13 @@ hns3_stats_init(struct hns3_hw *hw) return ret; } - if (!hns->is_vf) - hns3_mac_stats_reset(hw); + if (!hns->is_vf) { + ret = hns3_mac_stats_reset(hw); + if (ret) { + hns3_err(hw, "reset mac stats failed, ret = %d", ret); + return ret; + } + } return hns3_tqp_stats_init(hw); } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.368063600 +0800 +++ 0037-net-hns3-fix-some-return-values.patch 2023-12-11 17:56:22.977652300 +0800 @@ -1 +1 @@ -From 08159599978f7f7eb6c4aaed7c290e33b8bc3d64 Mon Sep 17 00:00:00 2001 +From 84b217ed2cf446539ff591af5c52eec75e3bdf84 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 08159599978f7f7eb6c4aaed7c290e33b8bc3d64 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 0a227e6e45..156fb905f9 100644 +index 3cbf2ed2a7..64f4dd148c 100644 @@ -23 +25 @@ -@@ -2081,8 +2081,11 @@ hns3vf_reinit_dev(struct hns3_adapter *hns) +@@ -2162,8 +2162,11 @@ hns3vf_reinit_dev(struct hns3_adapter *hns) @@ -37 +39 @@ -index c80fa59e63..d100e58d10 100644 +index 48a91fb517..a3e79619ec 100644 @@ -40 +42 @@ -@@ -978,7 +978,7 @@ int hns3_fdir_filter_program(struct hns3_adapter *hns, +@@ -974,7 +974,7 @@ int hns3_fdir_filter_program(struct hns3_adapter *hns,