73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
From c0087473b7918d790771c873f0e63afb381ad5c2 Mon Sep 17 00:00:00 2001
|
|
From: Jian Shen <shenjian15@huawei.com>
|
|
Date: Thu, 12 Mar 2020 15:11:06 +0800
|
|
Subject: [PATCH 014/283] net: hns3: clear port base VLAN when unload PF
|
|
|
|
mainline inclusion
|
|
from mainline-v5.6-rc1
|
|
commit 59359fc8a2f7af062777692e6a7aae73483729ec
|
|
category: cleanup
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EJ0A
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=59359fc8a2f7af062777692e6a7aae73483729ec
|
|
|
|
--------------------------------
|
|
|
|
Currently, PF missed to clear the port base VLAN for VF when
|
|
unload. In this case, the VLAN id will remain in the VLAN
|
|
table. This patch fixes it.
|
|
|
|
Fixes: 92f11ea177cd ("net: hns3: fix set port based VLAN issue for VF")
|
|
Signed-off-by: Jian Shen <shenjian15@huawei.com>
|
|
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
.../hisilicon/hns3/hns3pf/hclge_main.c | 23 +++++++++++++++++++
|
|
1 file changed, 23 insertions(+)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index 7b60829d8bba..fa19e8514710 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -9307,6 +9307,28 @@ static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid,
|
|
return 0;
|
|
}
|
|
|
|
+static void hclge_clear_vf_vlan(struct hclge_dev *hdev)
|
|
+{
|
|
+ struct hclge_vlan_info *vlan_info;
|
|
+ struct hclge_vport *vport;
|
|
+ int ret;
|
|
+ int vf;
|
|
+
|
|
+ /* clear port base vlan for all vf */
|
|
+ for (vf = HCLGE_VF_VPORT_START_NUM; vf < hdev->num_alloc_vport; vf++) {
|
|
+ vport = &hdev->vport[vf];
|
|
+ vlan_info = &vport->port_base_vlan_cfg.vlan_info;
|
|
+
|
|
+ ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q),
|
|
+ vport->vport_id,
|
|
+ vlan_info->vlan_tag, true);
|
|
+ if (ret)
|
|
+ dev_err(&hdev->pdev->dev,
|
|
+ "failed to clear vf vlan for vf%d, ret = %d\n",
|
|
+ vf - HCLGE_VF_VPORT_START_NUM, ret);
|
|
+ }
|
|
+}
|
|
+
|
|
int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,
|
|
u16 vlan_id, bool is_kill)
|
|
{
|
|
@@ -10843,6 +10865,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
|
|
struct hclge_mac *mac = &hdev->hw.mac;
|
|
|
|
hclge_reset_vf_rate(hdev);
|
|
+ hclge_clear_vf_vlan(hdev);
|
|
hclge_misc_affinity_teardown(hdev);
|
|
hclge_state_uninit(hdev);
|
|
hclge_uninit_vport_mac_table(hdev);
|
|
--
|
|
2.34.1
|
|
|