From: Jian Shen <shenjian15@huawei.com>

The hclge_sync_vlan_filter is called in periodic task,

trying to remove VLAN from vlan_del_fail_bmap. It can

be concurrence with VLAN adding operation from user.

So once user failed to delete a VLAN id, and add it

again soon, it may be removed by the periodic task,

which may cause the software configuration being

inconsistent with hardware. So add mutex handling

to avoid this.

user hns3 driver

periodic task

│

add vlan 10 ───── hns3_vlan_rx_add_vid │

│ (suppose success) │

│ │

del vlan 10 ───── hns3_vlan_rx_kill_vid │

│ (suppose fail,add to │

│ vlan_del_fail_bmap) │

│ │

add vlan 10 ───── hns3_vlan_rx_add_vid │

(suppose success) │

foreach vlan_del_fail_bmp

del vlan 10

Fixes: fe4144d47eef ("net: hns3: sync VLAN filter entries when kill VLAN ID failed")

Signed-off-by: Jian Shen <shenjian15@huawei.com>

Signed-off-by: Jijie Shao <shaojijie@huawei.com>

---

.../hisilicon/hns3/hns3pf/hclge_main.c | 21 +++++++++++++------

.../hisilicon/hns3/hns3vf/hclgevf_main.c | 11 ++++++++--

2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

@@ -XXX,XX +XXX,XX @@ 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)

@@ -XXX,XX +XXX,XX @@ 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)

@@ -XXX,XX +XXX,XX @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,

     * handle mailbox. Just record the vlan id, and remove it after

     * reset finished.

     */

+    mutex_lock(&hdev->vport_lock);

    if ((test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state) ||

     test_bit(HCLGE_STATE_RST_FAIL, &hdev->state)) && is_kill) {

        set_bit(vlan_id, vport->vlan_del_fail_bmap);

+        mutex_unlock(&hdev->vport_lock);

        return -EBUSY;

+    } else if (!is_kill && test_bit(vlan_id, vport->vlan_del_fail_bmap)) {

+        clear_bit(vlan_id, vport->vlan_del_fail_bmap);

    }

+    mutex_unlock(&hdev->vport_lock);

    /* when port base vlan enabled, we use port base vlan as the vlan

     * filter entry. In this case, we don't update vlan filter table

@@ -XXX,XX +XXX,XX @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,

         * and try to remove it from hw later, to be consistence

         * with stack

         */

+        mutex_lock(&hdev->vport_lock);

        set_bit(vlan_id, vport->vlan_del_fail_bmap);

+        mutex_unlock(&hdev->vport_lock);

    }

    hclge_set_vport_vlan_fltr_change(vport);

@@ -XXX,XX +XXX,XX @@ static void hclge_sync_vlan_filter(struct hclge_dev *hdev)

    int i, ret, sync_cnt = 0;

    u16 vlan_id;

+    mutex_lock(&hdev->vport_lock);

    /* start from vport 1 for PF is always alive */

    for (i = 0; i < hdev->num_alloc_vport; i++) {

        struct hclge_vport *vport = &hdev->vport[i];

@@ -XXX,XX +XXX,XX @@ static void hclge_sync_vlan_filter(struct hclge_dev *hdev)

            ret = hclge_set_vlan_filter_hw(hdev, htons(ETH_P_8021Q),

                         vport->vport_id, vlan_id,

                         true);

-            if (ret && ret != -EINVAL)

+            if (ret && ret != -EINVAL) {

+                mutex_unlock(&hdev->vport_lock);

                return;

+            }

            clear_bit(vlan_id, vport->vlan_del_fail_bmap);

            hclge_rm_vport_vlan_table(vport, vlan_id, false);

            hclge_set_vport_vlan_fltr_change(vport);

            sync_cnt++;

-            if (sync_cnt >= HCLGE_MAX_SYNC_COUNT)

+            if (sync_cnt >= HCLGE_MAX_SYNC_COUNT) {

+                mutex_unlock(&hdev->vport_lock);

                return;

+            }

            vlan_id = find_first_bit(vport->vlan_del_fail_bmap,

                         VLAN_N_VID);

        }

    }

+    mutex_unlock(&hdev->vport_lock);

    hclge_sync_vlan_fltr_state(hdev);

}

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

@@ -XXX,XX +XXX,XX @@ static int hclgevf_set_vlan_filter(struct hnae3_handle *handle,

     test_bit(HCLGEVF_STATE_RST_FAIL, &hdev->state)) && is_kill) {

        set_bit(vlan_id, hdev->vlan_del_fail_bmap);

        return -EBUSY;

+    } else if (!is_kill && test_bit(vlan_id, hdev->vlan_del_fail_bmap)) {

+        clear_bit(vlan_id, hdev->vlan_del_fail_bmap);

    }

    hclgevf_build_send_msg(&send_msg, HCLGE_MBX_SET_VLAN,

@@ -XXX,XX +XXX,XX @@ static void hclgevf_sync_vlan_filter(struct hclgevf_dev *hdev)

    int ret, sync_cnt = 0;

    u16 vlan_id;

+    if (bitmap_empty(hdev->vlan_del_fail_bmap, VLAN_N_VID))

+        return;

+

+    rtnl_lock();

    vlan_id = find_first_bit(hdev->vlan_del_fail_bmap, VLAN_N_VID);

    while (vlan_id != VLAN_N_VID) {

        ret = hclgevf_set_vlan_filter(handle, htons(ETH_P_8021Q),

                     vlan_id, true);

        if (ret)

-            return;

+            break;

        clear_bit(vlan_id, hdev->vlan_del_fail_bmap);

        sync_cnt++;

        if (sync_cnt >= HCLGEVF_MAX_SYNC_COUNT)

-            return;

+            break;

        vlan_id = find_first_bit(hdev->vlan_del_fail_bmap, VLAN_N_VID);

    }

+    rtnl_unlock();

}

static int hclgevf_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool enable)

--

2.30.0

From: Yonglong Liu <liuyonglong@huawei.com>

In hclgevf_mbx_handler() and hclgevf_get_mbx_resp() functions,

there is a typical store-store and load-load scenario between

received_resp and additional_info. This patch adds barrier

to fix the problem.

Fixes: 4671042f1ef0 ("net: hns3: add match_id to check mailbox response from PF to VF")

Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>

Signed-off-by: Jijie Shao <shaojijie@huawei.com>

---

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 7 +++++++

1 file changed, 7 insertions(+)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c

@@ -XXX,XX +XXX,XX @@ static int hclgevf_get_mbx_resp(struct hclgevf_dev *hdev, u16 code0, u16 code1,

        i++;

    }

+    /* ensure additional_info will be seen after received_resp */

+    smp_rmb();

+

    if (i >= HCLGEVF_MAX_TRY_TIMES) {

        dev_err(&hdev->pdev->dev,

            "VF could not get mbx(%u,%u) resp(=%d) from PF in %d tries\n",

@@ -XXX,XX +XXX,XX @@ static void hclgevf_handle_mbx_response(struct hclgevf_dev *hdev,

    resp->resp_status = hclgevf_resp_to_errno(resp_status);

    memcpy(resp->additional_info, req->msg.resp_data,

     HCLGE_MBX_MAX_RESP_DATA_SIZE * sizeof(u8));

+

+    /* ensure additional_info will be seen before setting received_resp */

+    smp_wmb();

+

    if (match_id) {

        /* If match_id is not zero, it means PF support match_id.

         * if the match_id is right, VF get the right response, or

--

2.30.0

From: Jian Shen <shenjian15@huawei.com>

Currently, the FEC capability bit is default set for device version V2.

It's incorrect for the copper port. Eventhough it doesn't make the nic

work abnormal, but the capability information display in debugfs may

confuse user. So clear it when driver get the port type inforamtion.

Fixes: 433ccce83504 ("net: hns3: use FEC capability queried from firmware")

Signed-off-by: Jian Shen <shenjian15@huawei.com>

Signed-off-by: Jijie Shao <shaojijie@huawei.com>

---

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 +

1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

@@ -XXX,XX +XXX,XX @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)

        goto err_msi_irq_uninit;

    if (hdev->hw.mac.media_type == HNAE3_MEDIA_TYPE_COPPER) {

+        clear_bit(HNAE3_DEV_SUPPORT_FEC_B, ae_dev->caps);

        if (hnae3_dev_phy_imp_supported(hdev))

            ret = hclge_update_tp_port_info(hdev);

        else

--

2.30.0

From: Yonglong Liu <liuyonglong@huawei.com>

When a VF is calling hns3_init_mac_addr(), get_mac_addr() may

return fail, then the value of mac_addr_temp is not initialized.

Fixes: 76ad4f0ee747 ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC")

Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>

Signed-off-by: Jijie Shao <shaojijie@huawei.com>

---

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

@@ -XXX,XX +XXX,XX @@ static int hns3_init_mac_addr(struct net_device *netdev)

    struct hns3_nic_priv *priv = netdev_priv(netdev);

    char format_mac_addr[HNAE3_FORMAT_MAC_ADDR_LEN];

    struct hnae3_handle *h = priv->ae_handle;

-    u8 mac_addr_temp[ETH_ALEN];

+    u8 mac_addr_temp[ETH_ALEN] = {0};

    int ret = 0;

    if (h->ae_algo->ops->get_mac_addr)

--

2.30.0