| Message ID | 1608892525-21384-1-git-send-email-wangyunjian@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: hns: fix return value check in __lb_other_process() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 7 maintainers not CCed: davem@davemloft.net gustavoars@kernel.org luwei32@huawei.com liguozhu@huawei.com huangdaode@hisilicon.com kuba@kernel.org jesse.brandeburg@intel.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 10 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On 2020/12/25 18:35, wangyunjian wrote: > From: Yunjian Wang <wangyunjian@huawei.com> > > The function skb_copy() could return NULL, the return value > need to be checked. > > Fixes: b5996f11ea54 ("net: add Hisilicon Network Subsystem basic ethernet support") > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> > --- > drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > index 7165da0ee9aa..ad18f0e20a23 100644 > --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > @@ -415,6 +415,10 @@ static void __lb_other_process(struct hns_nic_ring_data *ring_data, > /* for mutl buffer*/ > new_skb = skb_copy(skb, GFP_ATOMIC); > dev_kfree_skb_any(skb); > + if (!new_skb) { > + ndev->stats.rx_dropped++; You can add a new drop type to ring->states, and then add it to ndev->stats.rx_dropped, then you can know that the rx_dropped is from skb_copy() failed. This process is from self-test, maybe you can just add a error message rather than increase the ndev->stats.rx_dropped. > + return; > + } > skb = new_skb; > > check_ok = 0;
> -----Original Message----- > From: liuyonglong > Sent: Saturday, December 26, 2020 2:39 PM > To: wangyunjian <wangyunjian@huawei.com>; netdev@vger.kernel.org > Cc: Zhuangyuzeng (Yisen) <yisen.zhuang@huawei.com>; Salil Mehta > <salil.mehta@huawei.com>; Lilijun (Jerry) <jerry.lilijun@huawei.com>; > xudingke <xudingke@huawei.com> > Subject: Re: [PATCH net] net: hns: fix return value check in > __lb_other_process() > > > On 2020/12/25 18:35, wangyunjian wrote: > > From: Yunjian Wang <wangyunjian@huawei.com> > > > > The function skb_copy() could return NULL, the return value need to be > > checked. > > > > Fixes: b5996f11ea54 ("net: add Hisilicon Network Subsystem basic > > ethernet support") > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> > > --- > > drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > > b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > > index 7165da0ee9aa..ad18f0e20a23 100644 > > --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > > +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c > > @@ -415,6 +415,10 @@ static void __lb_other_process(struct > hns_nic_ring_data *ring_data, > > /* for mutl buffer*/ > > new_skb = skb_copy(skb, GFP_ATOMIC); > > dev_kfree_skb_any(skb); > > + if (!new_skb) { > > > + ndev->stats.rx_dropped++; > You can add a new drop type to ring->states, and then add it to > ndev->stats.rx_dropped, > > then you can know that the rx_dropped is from skb_copy() failed. > > This process is from self-test, maybe you can just add a error message rather > than increase Thanks for your suggestion, I will update it in next version. > > the ndev->stats.rx_dropped. > > > > + return; > > + } > > skb = new_skb; > > > > check_ok = 0;
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c index 7165da0ee9aa..ad18f0e20a23 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -415,6 +415,10 @@ static void __lb_other_process(struct hns_nic_ring_data *ring_data, /* for mutl buffer*/ new_skb = skb_copy(skb, GFP_ATOMIC); dev_kfree_skb_any(skb); + if (!new_skb) { + ndev->stats.rx_dropped++; + return; + } skb = new_skb; check_ok = 0;