[PATCH net-next 16/19] net: hns: fix bug that alloc skb fail lead to port unavailable

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Yisen Zhuang <Yisen.Zhuang@huawei.com>
Newsgroups	linux.kernel
Subject	[PATCH net-next 16/19] net: hns: fix bug that alloc skb fail lead to port unavailable
Date	Tue, 21 Jun 2016 05:50:01 +0200
Message-ID	<rMkRj-qs-9@gated-at.bofh.it> (permalink)
References	<rMkHD-l2-5@gated-at.bofh.it>
X-Original-To	<davem@davemloft.net>, <yisen.zhuang@huawei.com>, <salil.mehta@huawei.com>, <yankejian@huawei.com>
X-Mailer	git-send-email 1.9.1
MIME-Version	1.0
Content-Type	text/plain
X-Originating-IP	[10.67.212.75]
X-Cfilter-Loop	Reflected
X-Mirapoint-Virus-Rapid-Raw	score=unknown(0), refid=str=0001.0A090204.5768B6A8.00A2,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32
X-Mirapoint-Loop-ID	c6b92e928cd82f7f60f9d7cd836f6e00
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	43
Organization	linux.* mail to news gateway
X-Original-Cc	<liguozhu@huawei.com>, <huangdaode@hisilicon.com>, <arnd@arndb.de>, <andriy.shevchenko@linux.intel.com>, <andrew@lunn.ch>, <geliangtang@163.com>, <ivecera@redhat.com>, <fengguang.wu@intel.com>, <charles.chenxin@huawei.com>, <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linuxarm@huawei.com>
X-Original-Date	Tue, 21 Jun 2016 11:56:36 +0800
X-Original-Message-ID	<1466481399-70080-17-git-send-email-Yisen.Zhuang@huawei.com>
X-Original-References	<1466481399-70080-1-git-send-email-Yisen.Zhuang@huawei.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1427242

Show key headers only | View raw

From: Jun He <hjat2005@huawei.com>

When hns_nic_poll_rx_skb alloc skb fail, it will break receive cycle and
read new fbd_num to start new receive cycle. It recomputes cycle num is
fbd_num minus clean_count, actually this cycle num is too big because
it drop out receive cycle. It brings about the port unavailable.

So we will goto out when alloc skb fail to fix this bug.

Signed-off-by: Jun He <hjat2005@huawei.com>
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com>
---
 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_enet.c b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
index f49246d..c0ce37b 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c
@@ -768,10 +768,10 @@ recv:
 			clean_count = 0;
 		}
 
-		/* poll one pkg*/
+		/* poll one pkt*/
 		err = hns_nic_poll_rx_skb(ring_data, &skb, &bnum);
 		if (unlikely(!skb)) /* this fault cannot be repaired */
-			break;
+			goto out;
 
 		recv_bds += bnum;
 		clean_count += bnum;
@@ -797,6 +797,7 @@ recv:
 		}
 	}
 
+out:
 	/* make all data has been write before submit */
 	if (clean_count > 0)
 		hns_nic_alloc_rx_buffers(ring_data, clean_count);
-- 
1.9.1

Thread

[PATCH net-next 00/19] net: hns: fix some bugs in hns driver Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 08/19] net: hns: fix ethtool loopback fail bug Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 16/19] net: hns: fix bug that alloc skb fail lead to port unavailable Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
    Re: [PATCH net-next 16/19] net: hns: fix bug that alloc skb fail lead  to port unavailable Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-06-21 15:30 +0200
      Re: [PATCH net-next 16/19] net: hns: fix bug that alloc skb fail lead  to port unavailable Yisen Zhuang <Yisen.zhuang@huawei.com> - 2016-06-22 03:50 +0200
  [PATCH net-next 05/19] net: hns: Remove unnecessary device resource free Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame statistics Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
    Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame  statistics Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-06-21 12:50 +0200
      Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame  statistics Yisen Zhuang <Yisen.zhuang@huawei.com> - 2016-06-22 03:50 +0200
        Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame  statistics Andy Shevchenko <andriy.shevchenko@linux.intel.com> - 2016-06-22 11:50 +0200
          Re: [PATCH net-next 10/19] net: hns: bugfix about pfc pause frame  statistics Yisen Zhuang <Yisen.zhuang@huawei.com> - 2016-06-23 07:50 +0200
  [PATCH net-next 18/19] net: hns: change the default coalesce usecs Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 04/19] net: hns: typo fix of annotation info for hns_nic_reset_subtask() Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 12/19] net: hns: fix bug of getting the wrong tcam data Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 15/19] net: hns: bug fix about led control logic when link down Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 03/19] net: hns: add skb_reset_mac_header() after skb being alloc Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 17/19] net: hns: fix sbm default parameters config error Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 02/19] net: hns: fix hns dsaf v1 dont support tx_pause close Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  [PATCH net-next 14/19] net: hns: delete redundancy ring enable operations Yisen Zhuang <Yisen.Zhuang@huawei.com> - 2016-06-21 05:50 +0200
  Re: [PATCH net-next 00/19] net: hns: fix some bugs in hns driver David Miller <davem@davemloft.net> - 2016-06-21 11:00 +0200

csiph-web