From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF4F7C43381 for ; Thu, 14 Feb 2019 14:55:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E155222DA for ; Thu, 14 Feb 2019 14:55:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="nH6O2aLJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407470AbfBNOzm (ORCPT ); Thu, 14 Feb 2019 09:55:42 -0500 Received: from m12-11.163.com ([220.181.12.11]:52355 "EHLO m12-11.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406934AbfBNOzl (ORCPT ); Thu, 14 Feb 2019 09:55:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=jQ7YnsWdPKb2F/NFEh kYvhqxCSGQcRlZYb1FC7gXvmY=; b=nH6O2aLJqct49+NNBH+Bs75j2Qm9fi5Tfv MwmDZIpo+jw+5xaZ45/EQyJWlATQRv+eXAGXBgQM/AI6/ZhMSNqkUp0p7/C/ZPQ3 XsQJIO9wxjVEnjNvag4lhi5eAXlBNmX7FAVzv4yk1ahjTOZrKOqWjNNlibKjOe77 wq297RWR4= Received: from yangwei-T440.lan (unknown [171.223.99.216]) by smtp7 (Coremail) with SMTP id C8CowAC3x0tTgWVc95OmFg--.30251S3; Thu, 14 Feb 2019 22:55:16 +0800 (CST) From: Yang Wei To: netdev@vger.kernel.org Cc: davem@davemloft.net, klassert@kernel.org, anna-maria@linutronix.de, bigeasy@linutronix.de, yang.wei9@zte.com.cn, albin_yang@163.com Subject: [PATCH net] net: 3com: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles Date: Thu, 14 Feb 2019 22:55:14 +0800 Message-Id: <1550156114-4518-1-git-send-email-albin_yang@163.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: C8CowAC3x0tTgWVc95OmFg--.30251S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZrWDur1Uur4fXw4xJw4ruFg_yoW8KF4xpr W2kFWUurn7JF1Y93Z5Gw4UWF4rJa1ftF93Wr1ru3Z3ur15Ar45WFykXFyjkrs8KrZ5GF12 yr4ayrWSgas8Ja7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jVQ6JUUUUU= X-Originating-IP: [171.223.99.216] X-CM-SenderInfo: pdoex0xb1d0wi6rwjhhfrp/1tbiERRbolWBkLMxJgAAsc Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Yang Wei dev_consume_skb_irq() should be called when skb xmit done. It makes drop profiles(dropwatch, perf) more friendly. Signed-off-by: Yang Wei --- drivers/net/ethernet/3com/3c515.c | 4 ++-- drivers/net/ethernet/3com/3c59x.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c index b648e3f..808abb6 100644 --- a/drivers/net/ethernet/3com/3c515.c +++ b/drivers/net/ethernet/3com/3c515.c @@ -1177,7 +1177,7 @@ static irqreturn_t corkscrew_interrupt(int irq, void *dev_id) if (inl(ioaddr + DownListPtr) == isa_virt_to_bus(&lp->tx_ring[entry])) break; /* It still hasn't been processed. */ if (lp->tx_skbuff[entry]) { - dev_kfree_skb_irq(lp->tx_skbuff[entry]); + dev_consume_skb_irq(lp->tx_skbuff[entry]); lp->tx_skbuff[entry] = NULL; } dirty_tx++; @@ -1192,7 +1192,7 @@ static irqreturn_t corkscrew_interrupt(int irq, void *dev_id) #ifdef VORTEX_BUS_MASTER if (status & DMADone) { outw(0x1000, ioaddr + Wn7_MasterStatus); /* Ack the event. */ - dev_kfree_skb_irq(lp->tx_skb); /* Release the transferred buffer */ + dev_consume_skb_irq(lp->tx_skb); /* Release the transferred buffer */ netif_wake_queue(dev); } #endif diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index 40f421d..1470514 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c @@ -2307,7 +2307,7 @@ _vortex_interrupt(int irq, struct net_device *dev) dma_unmap_single(vp->gendev, vp->tx_skb_dma, (vp->tx_skb->len + 3) & ~3, DMA_TO_DEVICE); pkts_compl++; bytes_compl += vp->tx_skb->len; - dev_kfree_skb_irq(vp->tx_skb); /* Release the transferred buffer */ + dev_consume_skb_irq(vp->tx_skb); /* Release the transferred buffer */ if (ioread16(ioaddr + TxFree) > 1536) { /* * AKPM: FIXME: I don't think we need this. If the queue was stopped due to @@ -2449,7 +2449,7 @@ _boomerang_interrupt(int irq, struct net_device *dev) #endif pkts_compl++; bytes_compl += skb->len; - dev_kfree_skb_irq(skb); + dev_consume_skb_irq(skb); vp->tx_skbuff[entry] = NULL; } else { pr_debug("boomerang_interrupt: no skb!\n"); -- 2.7.4