netdev - Re: [PATCH net-next 03/10] r8169: Call dev_kfree_skby_any instead of dev_kfree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1394589773.21721.35.camel@edumazet-glaptop2.roam.corp.google.com>
Date:	Tue, 11 Mar 2014 19:02:53 -0700
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	"Eric W. Biederman" <ebiederm@...ssion.com>
Cc:	David Miller <davem@...emloft.net>, netdev@...r.kernel.org,
	xiyou.wangcong@...il.com, mpm@...enic.com, satyam.sharma@...il.com
Subject: Re: [PATCH net-next 03/10] r8169: Call dev_kfree_skby_any instead
 of dev_kfree_skb.

On Tue, 2014-03-11 at 14:16 -0700, Eric W. Biederman wrote:
> Replace dev_kfree_skb with dev_kfree_skb_any in functions that can
> be called in hard irq and other contexts.
> 
> Signed-off-by: "Eric W. Biederman" <ebiederm@...ssion.com>
> ---
>  drivers/net/ethernet/realtek/r8169.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index e9779653cd4c..cf947337e0d6 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -5834,7 +5834,7 @@ static void rtl8169_tx_clear_range(struct rtl8169_private *tp, u32 start,
>  					     tp->TxDescArray + entry);
>  			if (skb) {
>  				tp->dev->stats.tx_dropped++;
> -				dev_kfree_skb(skb);
> +				dev_kfree_skb_any(skb);
>  				tx_skb->skb = NULL;
>  			}
>  		}
> @@ -6059,7 +6059,7 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
>  err_dma_1:
>  	rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd);
>  err_dma_0:
> -	dev_kfree_skb(skb);
> +	dev_kfree_skb_any(skb);
>  err_update_stats:
>  	dev->stats.tx_dropped++;
>  	return NETDEV_TX_OK;
> @@ -6142,7 +6142,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
>  			tp->tx_stats.packets++;
>  			tp->tx_stats.bytes += tx_skb->skb->len;
>  			u64_stats_update_end(&tp->tx_stats.syncp);
> -			dev_kfree_skb(tx_skb->skb);
> +			dev_kfree_skb_any(tx_skb->skb);
>  			tx_skb->skb = NULL;
>  		}
>  		dirty_tx++;

If this code can either run from softirq or hardirq, then
rtl8169_get_stats64() should block hard irq, not only soft irq.

Ie not use u64_stats_fetch_{begin|retry}_bh()




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html