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 E2058A034F for ; Wed, 10 Nov 2021 07:45:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC83C4014D; Wed, 10 Nov 2021 07:45:03 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2043.outbound.protection.outlook.com [40.107.220.43]) by mails.dpdk.org (Postfix) with ESMTP id 38F7E4014D for ; Wed, 10 Nov 2021 07:45:02 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l8DcknWwANkr4ylt5ZJLMBduRsD/oH1MGyeg4qKCIWZkt4QiLEaRuc2b+vUH9aZYBmtjvhew95AeJcAui4m3fwoP6O94l4mm8GPs1QAoXupLoCHk4kAZcfLSKsRgsjQgfjfY5qM64/NVXOMYUSmdpRExp4Wb0XgLtQ4yEs/YBhOYHwJS9n3Ykchj1Dbl5a70DmPA9dCAc0DbrjnKP/XIKP7E3Aubkgm+psIShtscjLBJ5fOF9n3m55iaYmiHrRg/djZNiZbNM4Rp3dTfUDCW31qD1MUyaC6PY3RFN9fI4eEnTq0hvpx3QvZWogWt66ss3PFSyKZerdBvdqdoj+XefA== 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=rmtcnq918hAsuJMB7pdlsmj5E76hRsP6l5wXYUK8DnA=; b=X01DobVmJtOzknN55eVicmHfLzVwGLrmPvmjNJ/F4oga9LYsPk1UU09lAtvNoDOS8wAHB2sryDA9RXWPFC4Sl7tb5RzEGdlvs1wamytaCh3qmCiBcsoPsCRgdScTDaib6Q61Hpz38lqy72jEb5gTKV9XZnZ07CjmuwaJcoXfZ2J7DDuXivDOnjdODZs2QB0YjUiQAST1nG3f0vxUHNgyKsYdTVHfxbLQ1D4cUu4sBokk3kOOzuy7elfnx2bRudXRCFDnpB2VgI/ttaX75I9YVvB25A6gmukJ4G9q5wdosN/M69CmkvXoAwqmNHSfSaoSDmGh6q2uGygMF+DMrWVwAA== 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=quarantine sp=quarantine 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=rmtcnq918hAsuJMB7pdlsmj5E76hRsP6l5wXYUK8DnA=; b=HOHO+E1y5hKaa4Oa4hsWAU1+u/DxnzlB2WWNr42w/Z4s5bH1gahRubR/v+3rHbY1wb/qYKlWgdVhJgmdF/rqY1AccFuiRyi5/hKrQYzXiXoT2K5rYaRlclPihB2obWV6kR8Hc4gOnUw+4ixYxH7TJVBU7+YmVRxkF0Ahre9bHWN5bPYZSOpPC7hA9Ggw7pJihwIqXNVusFbo+2JJPgpbD2sBcP7lPMLTHOty3InReBKN74l3kFQ/ijeBHtYZZ//Bm+xTPWugamsRGRboFRd9Awd0R9x/+K7/ZOesTcwbxGm9sfVHBmYeGUMCY+XJjYfTJtOOsnvrx8kHPQl0chdpIA== Received: from BN6PR22CA0056.namprd22.prod.outlook.com (2603:10b6:404:ca::18) by CH2PR12MB4908.namprd12.prod.outlook.com (2603:10b6:610:6b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:45:00 +0000 Received: from BN8NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:404:ca:cafe::c4) by BN6PR22CA0056.outlook.office365.com (2603:10b6:404:ca::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:45:00 +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 BN8NAM11FT049.mail.protection.outlook.com (10.13.177.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:44:59 +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.18; Wed, 10 Nov 2021 06:44:57 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Min Hu , dpdk stable Date: Wed, 10 Nov 2021 14:29:55 +0800 Message-ID: <20211110063216.2744012-112-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-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: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 015fcf7f-02e3-4033-6cac-08d9a4159db9 X-MS-TrafficTypeDiagnostic: CH2PR12MB4908: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oFfY73QST7up5z1WJmCLy367lnRctnuojNsasE+diki+f5Zcs0zTZeRfFGhwao90HuJ/YliE06RDrzPZrvtyhp3facSkvmGykGdVpJ1UO8mwli4/Rr7coCe7gdClxkW5fV2sZqGaxO353DS8ZXXplIwunkaptToHYocayFHOApfABD0WlzZxDeyyRtI1d8TobKOJgPqdykjd1Jvdtm3vW+bMD3Sn/Ei+x/7prDh9nPqlqPvgINfn3z9ehb7T9IiihhPd93fs5PqvvQzRF/DMzKhCyYHgJmQaGOG7ma8yxcs37UG6OiKnjF9JkhkIy1brQ8DxftP3YJuQt1PBkd/tI2ExWVQ10WuzQvgN510ZRNuqDU8fnRot93h/SwXILbuNT+a7OcORk7VLmvtuAb84aF7lNqXBFv6IrTSyfc+z9gqG9rRzUPD32mHhL42Qb9p0zgM2nd4rJ1Hw8v7Ai+PL/OrQbUwa7aBfp0yx+gu6p3aruRostvBwKGnXSWaARxWuGLFAgTxXvIRIDMAFEgaGBc6cHsFTZSeDQS/mu0hQCn0XFsOFsEHXHN0u++xYRSYRMIS8v32PSFKtbYsk9rQkrAoDtsFOE+UNBR5fs8BqXTK91IcMetTj9qSvMJC8fj3tbclmkSqq/v4HTTCzpLc937dqTTg3pRGu6nxNP0Amk1YFpuG1U91pmFNvbFN1gUX4Jj6T6a9fVFHpWJbs2GRPjqpun6+fNkB52BYXhzSnYTI1sbqCGy7o2r9yZKa7FponLAMYlGwsW+48Qh1M/9Ap0oUEPXY5vgjdz7i+4WZeHmOvjRsX1Qy0/6mpbsYCEzuIUsCT7O23EgEQxXKXlJLORw== 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)(36840700001)(46966006)(2906002)(6286002)(2616005)(86362001)(336012)(4001150100001)(40140700001)(356005)(7636003)(53546011)(83380400001)(54906003)(4326008)(186003)(426003)(26005)(5660300002)(16526019)(8676002)(70586007)(36756003)(7696005)(55016002)(6916009)(316002)(82310400003)(30864003)(36860700001)(1076003)(508600001)(8936002)(47076005)(70206006)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:44:59.5410 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 015fcf7f-02e3-4033-6cac-08d9a4159db9 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: BN8NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4908 Subject: [dpdk-stable] patch 'net/hns3: fix input parameters of MAC functions' has been queued to stable release 20.11.4 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.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 11/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/288a450bb909e5e1acb8fc323cc555b3eb645f59 Thanks. Xueming Li --- >From 288a450bb909e5e1acb8fc323cc555b3eb645f59 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 22 Sep 2021 11:41:52 +0800 Subject: [PATCH] net/hns3: fix input parameters of MAC functions Cc: Xueming Li [ upstream commit 60a6b4a574cf3b9415c73c31173eb42deb5ca92b ] When adding multicast and unicast MAC addresses, three descriptors and one descriptor are required for querying or adding MAC VLAN table, respectively. This patch uses the number of descriptors as input parameter to complete this task to make the function more secure. Fixes: 7d7f9f80bbfb ("net/hns3: support MAC address related operations") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_cmd.h | 3 +- drivers/net/hns3/hns3_ethdev.c | 88 +++++++++++++++++++--------------- 2 files changed, 51 insertions(+), 40 deletions(-) diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h index 041f2fa789..0463acb215 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -812,7 +812,8 @@ enum hns3_mac_vlan_add_resp_code { HNS3_ADD_MC_OVERFLOW, /* ADD failed for MC overflow */ }; -#define HNS3_MC_MAC_VLAN_ADD_DESC_NUM 3 +#define HNS3_MC_MAC_VLAN_OPS_DESC_NUM 3 +#define HNS3_UC_MAC_VLAN_OPS_DESC_NUM 1 #define HNS3_MAC_VLAN_BIT0_EN_B 0 #define HNS3_MAC_VLAN_BIT1_EN_B 1 diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index abe31c841e..d318b9b7f7 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -1344,28 +1344,31 @@ hns3_get_mac_vlan_cmd_status(struct hns3_hw *hw, uint16_t cmdq_resp, static int hns3_lookup_mac_vlan_tbl(struct hns3_hw *hw, struct hns3_mac_vlan_tbl_entry_cmd *req, - struct hns3_cmd_desc *desc, bool is_mc) + struct hns3_cmd_desc *desc, uint8_t desc_num) { uint8_t resp_code; uint16_t retval; int ret; + int i; - hns3_cmd_setup_basic_desc(&desc[0], HNS3_OPC_MAC_VLAN_ADD, true); - if (is_mc) { - desc[0].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); - memcpy(desc[0].data, req, - sizeof(struct hns3_mac_vlan_tbl_entry_cmd)); - hns3_cmd_setup_basic_desc(&desc[1], HNS3_OPC_MAC_VLAN_ADD, - true); - desc[1].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); - hns3_cmd_setup_basic_desc(&desc[2], HNS3_OPC_MAC_VLAN_ADD, + if (desc_num == HNS3_MC_MAC_VLAN_OPS_DESC_NUM) { + for (i = 0; i < desc_num - 1; i++) { + hns3_cmd_setup_basic_desc(&desc[i], + HNS3_OPC_MAC_VLAN_ADD, true); + desc[i].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); + if (i == 0) + memcpy(desc[i].data, req, + sizeof(struct hns3_mac_vlan_tbl_entry_cmd)); + } + hns3_cmd_setup_basic_desc(&desc[i], HNS3_OPC_MAC_VLAN_ADD, true); - ret = hns3_cmd_send(hw, desc, HNS3_MC_MAC_VLAN_ADD_DESC_NUM); } else { + hns3_cmd_setup_basic_desc(&desc[0], HNS3_OPC_MAC_VLAN_ADD, + true); memcpy(desc[0].data, req, sizeof(struct hns3_mac_vlan_tbl_entry_cmd)); - ret = hns3_cmd_send(hw, desc, 1); } + ret = hns3_cmd_send(hw, desc, desc_num); if (ret) { hns3_err(hw, "lookup mac addr failed for cmd_send, ret =%d.", ret); @@ -1381,38 +1384,40 @@ hns3_lookup_mac_vlan_tbl(struct hns3_hw *hw, static int hns3_add_mac_vlan_tbl(struct hns3_hw *hw, struct hns3_mac_vlan_tbl_entry_cmd *req, - struct hns3_cmd_desc *mc_desc) + struct hns3_cmd_desc *desc, uint8_t desc_num) { uint8_t resp_code; uint16_t retval; int cfg_status; int ret; + int i; - if (mc_desc == NULL) { - struct hns3_cmd_desc desc; - - hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_MAC_VLAN_ADD, false); - memcpy(desc.data, req, + if (desc_num == HNS3_UC_MAC_VLAN_OPS_DESC_NUM) { + hns3_cmd_setup_basic_desc(desc, HNS3_OPC_MAC_VLAN_ADD, false); + memcpy(desc->data, req, sizeof(struct hns3_mac_vlan_tbl_entry_cmd)); - ret = hns3_cmd_send(hw, &desc, 1); - resp_code = (rte_le_to_cpu_32(desc.data[0]) >> 8) & 0xff; - retval = rte_le_to_cpu_16(desc.retval); + ret = hns3_cmd_send(hw, desc, desc_num); + resp_code = (rte_le_to_cpu_32(desc->data[0]) >> 8) & 0xff; + retval = rte_le_to_cpu_16(desc->retval); cfg_status = hns3_get_mac_vlan_cmd_status(hw, retval, resp_code, HNS3_MAC_VLAN_ADD); } else { - hns3_cmd_reuse_desc(&mc_desc[0], false); - mc_desc[0].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); - hns3_cmd_reuse_desc(&mc_desc[1], false); - mc_desc[1].flag |= rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); - hns3_cmd_reuse_desc(&mc_desc[2], false); - mc_desc[2].flag &= rte_cpu_to_le_16(~HNS3_CMD_FLAG_NEXT); - memcpy(mc_desc[0].data, req, + for (i = 0; i < desc_num; i++) { + hns3_cmd_reuse_desc(&desc[i], false); + if (i == desc_num - 1) + desc[i].flag &= + rte_cpu_to_le_16(~HNS3_CMD_FLAG_NEXT); + else + desc[i].flag |= + rte_cpu_to_le_16(HNS3_CMD_FLAG_NEXT); + } + memcpy(desc[0].data, req, sizeof(struct hns3_mac_vlan_tbl_entry_cmd)); - mc_desc[0].retval = 0; - ret = hns3_cmd_send(hw, mc_desc, HNS3_MC_MAC_VLAN_ADD_DESC_NUM); - resp_code = (rte_le_to_cpu_32(mc_desc[0].data[0]) >> 8) & 0xff; - retval = rte_le_to_cpu_16(mc_desc[0].retval); + desc[0].retval = 0; + ret = hns3_cmd_send(hw, desc, desc_num); + resp_code = (rte_le_to_cpu_32(desc[0].data[0]) >> 8) & 0xff; + retval = rte_le_to_cpu_16(desc[0].retval); cfg_status = hns3_get_mac_vlan_cmd_status(hw, retval, resp_code, HNS3_MAC_VLAN_ADD); @@ -1457,7 +1462,7 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); struct hns3_mac_vlan_tbl_entry_cmd req; struct hns3_pf *pf = &hns->pf; - struct hns3_cmd_desc desc[3]; + struct hns3_cmd_desc desc; char mac_str[RTE_ETHER_ADDR_FMT_SIZE]; uint16_t egress_port = 0; uint8_t vf_id; @@ -1491,10 +1496,12 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) * it if the entry is inexistent. Repeated unicast entry * is not allowed in the mac vlan table. */ - ret = hns3_lookup_mac_vlan_tbl(hw, &req, desc, false); + ret = hns3_lookup_mac_vlan_tbl(hw, &req, &desc, + HNS3_UC_MAC_VLAN_OPS_DESC_NUM); if (ret == -ENOENT) { if (!hns3_is_umv_space_full(hw)) { - ret = hns3_add_mac_vlan_tbl(hw, &req, NULL); + ret = hns3_add_mac_vlan_tbl(hw, &req, &desc, + HNS3_UC_MAC_VLAN_OPS_DESC_NUM); if (!ret) hns3_update_umv_space(hw, false); return ret; @@ -1799,8 +1806,8 @@ hns3_update_desc_vfid(struct hns3_cmd_desc *desc, uint8_t vfid, bool clr) static int hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) { + struct hns3_cmd_desc desc[HNS3_MC_MAC_VLAN_OPS_DESC_NUM]; struct hns3_mac_vlan_tbl_entry_cmd req; - struct hns3_cmd_desc desc[3]; char mac_str[RTE_ETHER_ADDR_FMT_SIZE]; uint8_t vf_id; int ret; @@ -1817,7 +1824,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) memset(&req, 0, sizeof(req)); hns3_set_bit(req.entry_type, HNS3_MAC_VLAN_BIT0_EN_B, 0); hns3_prepare_mac_addr(&req, mac_addr->addr_bytes, true); - ret = hns3_lookup_mac_vlan_tbl(hw, &req, desc, true); + ret = hns3_lookup_mac_vlan_tbl(hw, &req, desc, + HNS3_MC_MAC_VLAN_OPS_DESC_NUM); if (ret) { /* This mac addr do not exist, add new entry for it */ memset(desc[0].data, 0, sizeof(desc[0].data)); @@ -1831,7 +1839,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) */ vf_id = HNS3_PF_FUNC_ID; hns3_update_desc_vfid(desc, vf_id, false); - ret = hns3_add_mac_vlan_tbl(hw, &req, desc); + ret = hns3_add_mac_vlan_tbl(hw, &req, desc, + HNS3_MC_MAC_VLAN_OPS_DESC_NUM); if (ret) { if (ret == -ENOSPC) hns3_err(hw, "mc mac vlan table is full"); @@ -1864,7 +1873,8 @@ hns3_remove_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) memset(&req, 0, sizeof(req)); hns3_set_bit(req.entry_type, HNS3_MAC_VLAN_BIT0_EN_B, 0); hns3_prepare_mac_addr(&req, mac_addr->addr_bytes, true); - ret = hns3_lookup_mac_vlan_tbl(hw, &req, desc, true); + ret = hns3_lookup_mac_vlan_tbl(hw, &req, desc, + HNS3_MC_MAC_VLAN_OPS_DESC_NUM); if (ret == 0) { /* * This mac addr exist, remove this handle's VFID for it. -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:06.925876972 +0800 +++ 0111-net-hns3-fix-input-parameters-of-MAC-functions.patch 2021-11-10 14:17:01.880746009 +0800 @@ -1 +1 @@ -From 60a6b4a574cf3b9415c73c31173eb42deb5ca92b Mon Sep 17 00:00:00 2001 +From 288a450bb909e5e1acb8fc323cc555b3eb645f59 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 60a6b4a574cf3b9415c73c31173eb42deb5ca92b ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index a4683de0aa..81bc9e9d98 100644 +index 041f2fa789..0463acb215 100644 @@ -25 +27 @@ -@@ -923,7 +923,8 @@ enum hns3_mac_vlan_add_resp_code { +@@ -812,7 +812,8 @@ enum hns3_mac_vlan_add_resp_code { @@ -36 +38 @@ -index 5c8ac5754f..cabf73ffbc 100644 +index abe31c841e..d318b9b7f7 100644 @@ -39 +41 @@ -@@ -1427,28 +1427,31 @@ hns3_get_mac_vlan_cmd_status(struct hns3_hw *hw, uint16_t cmdq_resp, +@@ -1344,28 +1344,31 @@ hns3_get_mac_vlan_cmd_status(struct hns3_hw *hw, uint16_t cmdq_resp, @@ -83 +85 @@ -@@ -1464,38 +1467,40 @@ hns3_lookup_mac_vlan_tbl(struct hns3_hw *hw, +@@ -1381,38 +1384,40 @@ hns3_lookup_mac_vlan_tbl(struct hns3_hw *hw, @@ -144 +146 @@ -@@ -1540,7 +1545,7 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1457,7 +1462,7 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) @@ -153 +155 @@ -@@ -1574,10 +1579,12 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1491,10 +1496,12 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) @@ -168 +170 @@ -@@ -1867,8 +1874,8 @@ hns3_update_desc_vfid(struct hns3_cmd_desc *desc, uint8_t vfid, bool clr) +@@ -1799,8 +1806,8 @@ hns3_update_desc_vfid(struct hns3_cmd_desc *desc, uint8_t vfid, bool clr) @@ -178 +180 @@ -@@ -1885,7 +1892,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1817,7 +1824,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) @@ -188 +190 @@ -@@ -1899,7 +1907,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1831,7 +1839,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) @@ -198 +200 @@ -@@ -1932,7 +1941,8 @@ hns3_remove_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1864,7 +1873,8 @@ hns3_remove_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)