From patchwork Fri Oct 22 09:19:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "humin (Q)" X-Patchwork-Id: 102642 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F1E20A0C43; Fri, 22 Oct 2021 11:22:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06C43411A4; Fri, 22 Oct 2021 11:22:03 +0200 (CEST) Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by mails.dpdk.org (Postfix) with ESMTP id D23BA41179 for ; Fri, 22 Oct 2021 11:21:58 +0200 (CEST) Received: from dggeme756-chm.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4HbJjj08Xnz8tsP; Fri, 22 Oct 2021 17:20:41 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.15; Fri, 22 Oct 2021 17:21:57 +0800 From: "Min Hu (Connor)" To: CC: , Date: Fri, 22 Oct 2021 17:19:56 +0800 Message-ID: <20211022092006.60959-6-humin29@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211022092006.60959-1-humin29@huawei.com> References: <20211022092006.60959-1-humin29@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggeme756-chm.china.huawei.com (10.3.19.102) X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH 05/14] net/hns3: remove redundant adding multicast MAC interface X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Huisong Li This patch removes hns3_add_mc_addr_common() in PF and hns3vf_add_mc_addr_common() in VF. Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 31 ++++++++----------------------- drivers/net/hns3/hns3_ethdev_vf.c | 30 ++++++++---------------------- 2 files changed, 16 insertions(+), 45 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 1650ec77bb..eac89eacce 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -1632,25 +1632,6 @@ hns3_find_duplicate_mc_addr(struct hns3_hw *hw, struct rte_ether_addr *mc_addr) return false; } -static int -hns3_add_mc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) -{ - char mac_str[RTE_ETHER_ADDR_FMT_SIZE]; - int ret; - - if (hns3_find_duplicate_mc_addr(hw, mac_addr)) - return -EINVAL; - - ret = hns3_add_mc_mac_addr(hw, mac_addr); - if (ret) { - hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, - mac_addr); - hns3_err(hw, "failed to add mc mac addr(%s), ret = %d", - mac_str, ret); - } - return ret; -} - static int hns3_remove_mc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) { @@ -1686,11 +1667,15 @@ hns3_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, * using the rte_eth_dev_mac_addr_add API function to set MC mac address * may affect the specifications of UC mac addresses. */ - if (rte_is_multicast_ether_addr(mac_addr)) - ret = hns3_add_mc_addr_common(hw, mac_addr); - else + if (rte_is_multicast_ether_addr(mac_addr)) { + if (hns3_find_duplicate_mc_addr(hw, mac_addr)) { + rte_spinlock_unlock(&hw->lock); + return -EINVAL; + } + ret = hns3_add_mc_mac_addr(hw, mac_addr); + } else { ret = hns3_add_uc_mac_addr(hw, mac_addr); - + } if (ret) { rte_spinlock_unlock(&hw->lock); hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 61489a537f..abb9211a09 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -204,25 +204,6 @@ hns3vf_remove_uc_mac_addr(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) return ret; } -static int -hns3vf_add_mc_addr_common(struct hns3_hw *hw, struct rte_ether_addr *mac_addr) -{ - char mac_str[RTE_ETHER_ADDR_FMT_SIZE]; - int ret; - - if (hns3_find_duplicate_mc_addr(hw, mac_addr)) - return -EINVAL; - - ret = hns3vf_add_mc_mac_addr(hw, mac_addr); - if (ret) { - hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE, - mac_addr); - hns3_err(hw, "failed to add mc mac addr(%s), ret = %d", - mac_str, ret); - } - return ret; -} - static int hns3vf_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, __rte_unused uint32_t idx, @@ -243,10 +224,15 @@ hns3vf_add_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, * using the rte_eth_dev_mac_addr_add API function to set MC mac address * may affect the specifications of UC mac addresses. */ - if (rte_is_multicast_ether_addr(mac_addr)) - ret = hns3vf_add_mc_addr_common(hw, mac_addr); - else + if (rte_is_multicast_ether_addr(mac_addr)) { + if (hns3_find_duplicate_mc_addr(hw, mac_addr)) { + rte_spinlock_unlock(&hw->lock); + return -EINVAL; + } + ret = hns3vf_add_mc_mac_addr(hw, mac_addr); + } else { ret = hns3vf_add_uc_mac_addr(hw, mac_addr); + } rte_spinlock_unlock(&hw->lock); if (ret) {