net: hns3: use HCLGEVF_STATE_NIC_REGISTERED to indicate VF NIC client has registered

When VF NIC client's init_instance() succeeds, it means this client
has been registered successfully, so we use HCLGEVF_STATE_NIC_REGISTERED
to indicate that. And before calling VF NIC client's uninit_instance(),
we clear this state.

So any operation of VF NIC client from HCLGEVF is not allowed if this
state is not set.

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 5d53467ee2d211f30af3cc0cafbe5b47cb07190a..8b3f8fdd44920604701a0ded6a146bb28257dd93 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -1306,6 +1306,10 @@ static int hclgevf_notify_client(struct hclgevf_dev *hdev,
        struct hnae3_handle *handle = &hdev->nic;
        int ret;
 
+       if (!test_bit(HCLGEVF_STATE_NIC_REGISTERED, &hdev->state) ||
+           !client)
+               return 0;
+
        if (!client->ops->reset_notify)
                return -EOPNOTSUPP;
 
@@ -2265,6 +2269,7 @@ static int hclgevf_init_client_instance(struct hnae3_client *client,
                        goto clear_nic;
 
                hnae3_set_client_init_flag(client, ae_dev, 1);
+               set_bit(HCLGEVF_STATE_NIC_REGISTERED, &hdev->state);
 
                if (netif_msg_drv(&hdev->nic))
                        hclgevf_info_show(hdev);
@@ -2342,6 +2347,8 @@ static void hclgevf_uninit_client_instance(struct hnae3_client *client,
        /* un-init nic/unic, if this was not called by roce client */
        if (client->ops->uninit_instance && hdev->nic_client &&
            client->type != HNAE3_CLIENT_ROCE) {
+               clear_bit(HCLGEVF_STATE_NIC_REGISTERED, &hdev->state);
+
                client->ops->uninit_instance(&hdev->nic, 0);
                hdev->nic_client = NULL;
                hdev->nic.client = NULL;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
index cc52f54f8c088ecdae89c45335b99851e1b42f32..eab1095bf2217caa2589ca4d375979a4c0b96bbb 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
@@ -130,6 +130,7 @@ enum hclgevf_states {
        HCLGEVF_STATE_DOWN,
        HCLGEVF_STATE_DISABLED,
        HCLGEVF_STATE_IRQ_INITED,
+       HCLGEVF_STATE_NIC_REGISTERED,
        /* task states */
        HCLGEVF_STATE_SERVICE_SCHED,
        HCLGEVF_STATE_RST_SERVICE_SCHED,