linux-kernel - Re: [PATCH net-next v2] net: mv643xx

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: <1503635699.2499.100.camel@edumazet-glaptop3.roam.corp.google.com>
Date:   Thu, 24 Aug 2017 21:34:59 -0700
From:   Eric Dumazet <eric.dumazet@...il.com>
To:     Florian Fainelli <f.fainelli@...il.com>
Cc:     netdev@...r.kernel.org, davem@...emloft.net, andrew@...n.ch,
        Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>,
        open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH net-next v2] net: mv643xx_eth: Be drop monitor friendly

On Thu, 2017-08-24 at 20:55 -0700, Florian Fainelli wrote:
> txq_reclaim() does the normal transmit queue reclamation and
> rxq_deinit() does the RX ring cleanup, none of these are packet drops,
> so use dev_consume_skb() for both locations.
> 
> Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
> ---
>  drivers/net/ethernet/marvell/mv643xx_eth.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
> index fb2d533ae4ef..81c1fac00d33 100644
> --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
> +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
> @@ -1121,7 +1121,7 @@ static int txq_reclaim(struct tx_queue *txq, int budget, int force)
>  			struct sk_buff *skb = __skb_dequeue(&txq->tx_skb);
>  
>  			if (!WARN_ON(!skb))
> -				dev_kfree_skb(skb);
> +				dev_consume_skb_any(skb);
>  		}
>  
>  		if (cmd_sts & ERROR_SUMMARY) {
> @@ -2024,7 +2024,7 @@ static void rxq_deinit(struct rx_queue *rxq)
>  
>  	for (i = 0; i < rxq->rx_ring_size; i++) {
>  		if (rxq->rx_skb[i]) {
> -			dev_kfree_skb(rxq->rx_skb[i]);
> +			dev_consume_skb_any(rxq->rx_skb[i]);
>  			rxq->rx_desc_count--;
>  		}
>  	}


I do not believe this patch is needed.

dev_kfree_skb() is an alias of consume_skb(), which is already drop
monitor ready ;)