From mboxrd@z Thu Jan  1 00:00:00 1970
From: tanhuazhong <tanhuazhong@huawei.com>
Subject: Re: [Patch V4 net 01/11] net: hns3: add error handler for
 hns3_nic_init_vector_data()
Date: Tue, 30 Oct 2018 18:19:24 +0800
Message-ID: <5a43b6ca-8345-83b9-2f52-2efe2f0b9c1e@huawei.com>
References: <1540821261-55002-1-git-send-email-tanhuazhong@huawei.com>
 <1540821261-55002-2-git-send-email-tanhuazhong@huawei.com>
 <bca282be-8688-0e16-e785-986dac0e7ed8@cogentembedded.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 8bit
Cc: <netdev@vger.kernel.org>, <linuxarm@huawei.com>,
        <salil.mehta@huawei.com>, <yisen.zhuang@huawei.com>,
        <lipeng321@huawei.com>, <linyunsheng@huawei.com>
To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
        <davem@davemloft.net>
Return-path: <netdev-owner@vger.kernel.org>
Received: from szxga04-in.huawei.com ([45.249.212.190]:14586 "EHLO huawei.com"
        rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
        id S1726679AbeJ3TM1 (ORCPT <rfc822;netdev@vger.kernel.org>);
        Tue, 30 Oct 2018 15:12:27 -0400
In-Reply-To: <bca282be-8688-0e16-e785-986dac0e7ed8@cogentembedded.com>
Content-Language: en-US
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>



On 2018/10/30 17:11, Sergei Shtylyov wrote:
> On 10/29/2018 4:54 PM, Huazhong Tan wrote:
> 
>> When hns3_nic_init_vector_data() fails to map ring to vector,
>> it should cancel the netif_napi_add() that has been successfully
>> done and then exits.
>>
>> Fixes: 76ad4f0ee747 ("net: hns3: Add support of HNS3 Ethernet Driver 
>> for hip08 SoC")
>> Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
>> ---
>>   drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 10 ++++++++--
>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c 
>> b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
>> index 32f3aca8..d9066c5 100644
>> --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
>> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
>> @@ -2821,7 +2821,7 @@ static int hns3_nic_init_vector_data(struct 
>> hns3_nic_priv *priv)
>>       struct hnae3_handle *h = priv->ae_handle;
>>       struct hns3_enet_tqp_vector *tqp_vector;
>>       int ret = 0;
>> -    u16 i;
>> +    int i, j;
>>       hns3_nic_set_cpumask(priv);
>> @@ -2868,13 +2868,19 @@ static int hns3_nic_init_vector_data(struct 
>> hns3_nic_priv *priv)
>>           hns3_free_vector_ring_chain(tqp_vector, &vector_ring_chain);
>>           if (ret)
>> -            return ret;
>> +            goto map_ring_fail;
>>           netif_napi_add(priv->netdev, &tqp_vector->napi,
>>                      hns3_nic_common_poll, NAPI_POLL_WEIGHT);
>>       }
>>       return 0;
>> +
>> +map_ring_fail:
>> +    for (j = i - 1; j >= 0; j--)
>> +        netif_napi_del(&priv->tqp_vector[j].napi);
> 
>     'j' doesn't seem needed as well.
> 

yes, it will be change to below one.

+
+map_ring_fail:
+	while(i--)
+		netif_napi_del(&priv->tqp_vector[i].napi);
+
+	return ret;

> [...]
> 
> MBR, Sergei
> 
> .

Thanks, Huazhong.

>