From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752087AbdHYEfD (ORCPT ); Fri, 25 Aug 2017 00:35:03 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:38494 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751426AbdHYEfB (ORCPT ); Fri, 25 Aug 2017 00:35:01 -0400 Message-ID: <1503635699.2499.100.camel@edumazet-glaptop3.roam.corp.google.com> Subject: Re: [PATCH net-next v2] net: mv643xx_eth: Be drop monitor friendly From: Eric Dumazet To: Florian Fainelli Cc: netdev@vger.kernel.org, davem@davemloft.net, andrew@lunn.ch, Sebastian Hesselbarth , open list Date: Thu, 24 Aug 2017 21:34:59 -0700 In-Reply-To: <20170825035540.26713-1-f.fainelli@gmail.com> References: <20170825035540.26713-1-f.fainelli@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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 ;)