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 32466A0C41 for ; Tue, 30 Nov 2021 17:39:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C10E41148; Tue, 30 Nov 2021 17:39:10 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id B28BD41170 for ; Tue, 30 Nov 2021 17:39:08 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 930BC3F1B2 for ; Tue, 30 Nov 2021 16:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290348; bh=lwXgkvTyCGDiOfk6ozzyIQexb9a0v7I/6+GSGtO1AjM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VXe8+O0DLLdTgqCZQ/M6z4emgKx9zI1dfdJuolD6bMnw/P2vZtiyk6lyjdkFkwH4f 5A74kbidiHPBv7+zyK+bcafaEx8c5Kr/x1/APQm06cd/6lXvctctNKidAX3P7HHbtc Ff9m6iFgJR8Cgw/jCz5OgEoqfeJJo1bBv71HVcHKWspdHBx9cbUy9LZKro42SAIJIn RxZNYznQ8OGBJ104MiTimfntbyMFdnunAOHEVVlb2Zvr3q/U380vZNGKmH+z3IlSLt INFV83qXazcnLaVWaqVErsMuY1YuSVaCJBHTUMyg4hdSflWi7qJXYyFOJ7Oej4gj/Y MJSd2+upeuigA== Received: by mail-ed1-f70.google.com with SMTP id k7-20020aa7c387000000b003e7ed87fb31so17576510edq.3 for ; Tue, 30 Nov 2021 08:39:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lwXgkvTyCGDiOfk6ozzyIQexb9a0v7I/6+GSGtO1AjM=; b=Yya1o1A7CPEvKMNOir5ldnioQVHofbWaYp+cUB4BxVOX0BPQbnMt+xfLH0yr7Qd19e 4tC4noBh8bn+/UkJGuwp51pNfpIUow/0jaSfOB7soBwS5hO+qzkKq+vvDonD4nMWSGMU Dc8HmkMI/ghp3krOacIyFGGQ8RvHIXa6qiG48jNbPGEE/Uvg24BFu9DpXtLOhIMtSDT/ FYr8iKzXwrHL3Qq0nmVxAUQa4OhY2ZVW0FP6GehfXxm/hbH+1g+VGFK2yErpQ/rxXN9G X3mMRGsQ7Ns++L/Jf1Wspx9t1BEnyiNuuXQgMxwAqBw3SUfbmFJgU1y6nO0KO/kJTTuo faFg== X-Gm-Message-State: AOAM531cyJwC2wWc3PQyOr/GrfwlGYKKRxklAamaVzNpnFU3OsYsh9dt T6cceCfZfTsVNQXRnIy1h9HRBOrPtJqPfq7wwv3PsYdGi20zWBkGqN7OSFiRwFXkxsbfneF1bq7 3Z79B8FTUpQyRPgr/J9pbErbX X-Received: by 2002:a17:906:f6c2:: with SMTP id jo2mr208739ejb.496.1638290348273; Tue, 30 Nov 2021 08:39:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzk1vsjm5w1ixqNzY1nzTMGYNQVVeQAoH50y2nixjf8ApfeOQ87vLABa6ClKNiNXH258Fr6Lg== X-Received: by 2002:a17:906:f6c2:: with SMTP id jo2mr208719ejb.496.1638290348063; Tue, 30 Nov 2021 08:39:08 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id v13sm9034212ejo.36.2021.11.30.08.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:39:07 -0800 (PST) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: fix input parameters of MAC functions' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:22 +0100 Message-Id: <20211130163605.2460997-58-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a5811ad841482f0d0c12140bbef662517c80b1d2 Thanks. Christian Ehrhardt --- >From a5811ad841482f0d0c12140bbef662517c80b1d2 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 [ 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 07ea1484b3..ea4ae4aebc 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -738,7 +738,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 0b27234161..157dd34d4f 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -1313,28 +1313,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); @@ -1350,38 +1353,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); @@ -1426,7 +1431,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; @@ -1461,10 +1466,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; @@ -1778,8 +1785,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; @@ -1796,7 +1803,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)); @@ -1811,7 +1819,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) */ vf_id = 0; 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"); @@ -1844,7 +1853,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.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:09.394975682 +0100 +++ 0058-net-hns3-fix-input-parameters-of-MAC-functions.patch 2021-11-30 16:50:05.722873031 +0100 @@ -1 +1 @@ -From 60a6b4a574cf3b9415c73c31173eb42deb5ca92b Mon Sep 17 00:00:00 2001 +From a5811ad841482f0d0c12140bbef662517c80b1d2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 60a6b4a574cf3b9415c73c31173eb42deb5ca92b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index a4683de0aa..81bc9e9d98 100644 +index 07ea1484b3..ea4ae4aebc 100644 @@ -25 +26 @@ -@@ -923,7 +923,8 @@ enum hns3_mac_vlan_add_resp_code { +@@ -738,7 +738,8 @@ enum hns3_mac_vlan_add_resp_code { @@ -36 +37 @@ -index 5c8ac5754f..cabf73ffbc 100644 +index 0b27234161..157dd34d4f 100644 @@ -39 +40 @@ -@@ -1427,28 +1427,31 @@ hns3_get_mac_vlan_cmd_status(struct hns3_hw *hw, uint16_t cmdq_resp, +@@ -1313,28 +1313,31 @@ hns3_get_mac_vlan_cmd_status(struct hns3_hw *hw, uint16_t cmdq_resp, @@ -83 +84 @@ -@@ -1464,38 +1467,40 @@ hns3_lookup_mac_vlan_tbl(struct hns3_hw *hw, +@@ -1350,38 +1353,40 @@ hns3_lookup_mac_vlan_tbl(struct hns3_hw *hw, @@ -144 +145 @@ -@@ -1540,7 +1545,7 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1426,7 +1431,7 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) @@ -153 +154 @@ -@@ -1574,10 +1579,12 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1461,10 +1466,12 @@ hns3_add_uc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) @@ -168 +169 @@ -@@ -1867,8 +1874,8 @@ hns3_update_desc_vfid(struct hns3_cmd_desc *desc, uint8_t vfid, bool clr) +@@ -1778,8 +1785,8 @@ hns3_update_desc_vfid(struct hns3_cmd_desc *desc, uint8_t vfid, bool clr) @@ -178 +179 @@ -@@ -1885,7 +1892,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1796,7 +1803,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) @@ -188 +189 @@ -@@ -1899,7 +1907,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1811,7 +1819,8 @@ hns3_add_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) @@ -190 +191 @@ - vf_id = HNS3_PF_FUNC_ID; + vf_id = 0; @@ -198 +199 @@ -@@ -1932,7 +1941,8 @@ hns3_remove_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) +@@ -1844,7 +1853,8 @@ hns3_remove_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr)