net: hns3: add vlan list lock to protect vlan list

[ Upstream commit 1932a624ab88ff407d1a1d567fe581faa15dc725 ]

When adding port base VLAN, vf VLAN need to remove from HW and modify
the vlan state in vf VLAN list as false. If the periodicity task is
freeing the same node, it may cause "use after free" error.
This patch adds a vlan list lock to protect the vlan list.

Fixes: c6075b193462 ("net: hns3: Record VF vlan tables")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 0338b4ffa003e33273b043160d932bbc8321b317..3ba24c6d004d94f0e7fbd193a17d6547b06c9e1c 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -10237,19 +10237,28 @@ static void hclge_add_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,
                                       bool writen_to_tbl)
 {
        struct hclge_vport_vlan_cfg *vlan, *tmp;
+       struct hclge_dev *hdev = vport->back;
 
-       list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node)
-               if (vlan->vlan_id == vlan_id)
+       mutex_lock(&hdev->vport_lock);
+
+       list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node) {
+               if (vlan->vlan_id == vlan_id) {
+                       mutex_unlock(&hdev->vport_lock);
                        return;
+               }
+       }
 
        vlan = kzalloc(sizeof(*vlan), GFP_KERNEL);
-       if (!vlan)
+       if (!vlan) {
+               mutex_unlock(&hdev->vport_lock);
                return;
+       }
 
        vlan->hd_tbl_status = writen_to_tbl;
        vlan->vlan_id = vlan_id;
 
        list_add_tail(&vlan->node, &vport->vlan_list);
+       mutex_unlock(&hdev->vport_lock);
 }
 
 static int hclge_add_vport_all_vlan_table(struct hclge_vport *vport)
@@ -10258,6 +10267,8 @@ static int hclge_add_vport_all_vlan_table(struct hclge_vport *vport)
        struct hclge_dev *hdev = vport->back;
        int ret;
 
+       mutex_lock(&hdev->vport_lock);
+
        list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node) {
                if (!vlan->hd_tbl_status) {
                        ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q),
@@ -10267,12 +10278,16 @@ static int hclge_add_vport_all_vlan_table(struct hclge_vport *vport)
                                dev_err(&hdev->pdev->dev,
                                        "restore vport vlan list failed, ret=%d\n",
                                        ret);
+
+                               mutex_unlock(&hdev->vport_lock);
                                return ret;
                        }
                }
                vlan->hd_tbl_status = true;
        }
 
+       mutex_unlock(&hdev->vport_lock);
+
        return 0;
 }
 
@@ -10282,6 +10297,8 @@ static void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,
        struct hclge_vport_vlan_cfg *vlan, *tmp;
        struct hclge_dev *hdev = vport->back;
 
+       mutex_lock(&hdev->vport_lock);
+
        list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node) {
                if (vlan->vlan_id == vlan_id) {
                        if (is_write_tbl && vlan->hd_tbl_status)
@@ -10296,6 +10313,8 @@ static void hclge_rm_vport_vlan_table(struct hclge_vport *vport, u16 vlan_id,
                        break;
                }
        }
+
+       mutex_unlock(&hdev->vport_lock);
 }
 
 void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list)
@@ -10303,6 +10322,8 @@ void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list)
        struct hclge_vport_vlan_cfg *vlan, *tmp;
        struct hclge_dev *hdev = vport->back;
 
+       mutex_lock(&hdev->vport_lock);
+
        list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node) {
                if (vlan->hd_tbl_status)
                        hclge_set_vlan_filter_hw(hdev,
@@ -10318,6 +10339,7 @@ void hclge_rm_vport_all_vlan_table(struct hclge_vport *vport, bool is_del_list)
                }
        }
        clear_bit(vport->vport_id, hdev->vf_vlan_full);
+       mutex_unlock(&hdev->vport_lock);
 }
 
 void hclge_uninit_vport_vlan_table(struct hclge_dev *hdev)
@@ -10326,6 +10348,8 @@ void hclge_uninit_vport_vlan_table(struct hclge_dev *hdev)
        struct hclge_vport *vport;
        int i;
 
+       mutex_lock(&hdev->vport_lock);
+
        for (i = 0; i < hdev->num_alloc_vport; i++) {
                vport = &hdev->vport[i];
                list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node) {
@@ -10333,6 +10357,8 @@ void hclge_uninit_vport_vlan_table(struct hclge_dev *hdev)
                        kfree(vlan);
                }
        }
+
+       mutex_unlock(&hdev->vport_lock);
 }
 
 void hclge_restore_vport_port_base_vlan_config(struct hclge_dev *hdev)
@@ -10372,6 +10398,8 @@ void hclge_restore_vport_vlan_table(struct hclge_vport *vport)
        struct hclge_dev *hdev = vport->back;
        int ret;
 
+       mutex_lock(&hdev->vport_lock);
+
        if (vport->port_base_vlan_cfg.state == HNAE3_PORT_BASE_VLAN_DISABLE) {
                list_for_each_entry_safe(vlan, tmp, &vport->vlan_list, node) {
                        ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q),
@@ -10382,6 +10410,8 @@ void hclge_restore_vport_vlan_table(struct hclge_vport *vport)
                        vlan->hd_tbl_status = true;
                }
        }
+
+       mutex_unlock(&hdev->vport_lock);
 }
 
 /* For global reset and imp reset, hardware will clear the mac table,
@@ -12279,8 +12309,8 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
        hclge_misc_irq_uninit(hdev);
        hclge_devlink_uninit(hdev);
        hclge_pci_uninit(hdev);
-       mutex_destroy(&hdev->vport_lock);
        hclge_uninit_vport_vlan_table(hdev);
+       mutex_destroy(&hdev->vport_lock);
        ae_dev->priv = NULL;
 }
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index 801268b61e962b2c224daf22ff8fb52016b85d37..c841cce2d0253c9dab542df61ac672ba84899fe0 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -1087,6 +1087,7 @@ struct hclge_vport {
        spinlock_t mac_list_lock; /* protect mac address need to add/detele */
        struct list_head uc_mac_list;   /* Store VF unicast table */
        struct list_head mc_mac_list;   /* Store VF multicast table */
+
        struct list_head vlan_list;     /* Store VF vlan table */
 };