From patchwork Tue Apr 11 08:34:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Wang X-Patchwork-Id: 9674703 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 617FB60381 for ; Tue, 11 Apr 2017 08:35:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54C0826BE9 for ; Tue, 11 Apr 2017 08:35:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4851C2817F; Tue, 11 Apr 2017 08:35:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D98DC26BE9 for ; Tue, 11 Apr 2017 08:35:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=l3//YUtpr7B8u8XkJSrF4dnJqEPR40iA2XaShn1nQww=; b=VjbyBuuRfw/O6Y apJtdEqyL9fr7f+RpdhXE1HAeBjOLWXRedL1GDwXeWqrD2GePHtILfNSL0zpO8LT3GApCkuCNCHyD ZOOCEEyelhbqoz6fszu9tgnU2wap3cz1ErVuJbS0N3beogJ+FOu2cCEG+xQmvKbFQspV/J7Wz3k1G JrXOCBLqMj5M6/RbUeQ5tPpOe9FKmECrpqar2VJQpJRh8GIy8PC52jCGLciVPYBmI63IjD5TgkGbS 13ZllHzUiCfz5v0Y1xFpbx7xCLrLaA0OsgqC3qFhA76cDXWGraZ0VyNdqZQveZo2Vi1mQLcwZ0wW/ djV9lKPprbv3AZLTXEhA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cxrGl-0002XL-Ou; Tue, 11 Apr 2017 08:35:23 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cxrGk-0002X3-Gy for linux-mediatek@bombadil.infradead.org; Tue, 11 Apr 2017 08:35:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Type:MIME-Version:Message-ID: Date:Subject:CC:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=UBUtsdlbRdnxRgVTFJDEGX4hNBzE6cbutMlH9nA1VYo=; b=fK2qptCKaykFrEltVA3cM27qf8 fo/BHspkNtpWwtprHEVqDNUDR6z4TEeAO22R7EBSmQMUglAZf6KbKIa9bSxRGufVqDL4uxyTtII25 24eaJ04g7SmSNarY9BC9If1h/cqIrkQDKhXFdGUGxSznd2jqa9ubvY+V59dc8vRfjwUnc5SqvSh9/ 3cA6Oe0WcW2ZfGlemDSbx06AhhGyf98r2ZdcmLxR5/hcgsrTtsN7MwxVb5yfn6NZo11CEMMqkRXfv BtxvHGszHqqDkzYrqG+4G8yMXdGa+2IYB8RCqgq5MLnf8yc3Ox1xhJ5Jnpw7Y86pxYrPTG/hhuzc/ iT1cYLUA==; Received: from [210.61.82.184] (helo=mailgw02.mediatek.com) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cxrGe-0005Jv-38 for linux-mediatek@lists.infradead.org; Tue, 11 Apr 2017 08:35:21 +0000 Received: from mtkhts07.mediatek.inc [(172.21.101.69)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 83394516; Tue, 11 Apr 2017 16:34:29 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkhts07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.266.1; Tue, 11 Apr 2017 16:34:28 +0800 From: To: , Subject: [PATCH net-next] net: ethernet: mediatek: enhance TX path with recycling more SKBs in one poll Date: Tue, 11 Apr 2017 16:34:27 +0800 Message-ID: <1491899667-19596-1-git-send-email-sean.wang@mediatek.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170411_043516_367705_77D2462F X-CRM114-Status: GOOD ( 14.68 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nbd@openwrt.org, keyhaede@gmail.com, netdev@vger.kernel.org, Sean Wang , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Wang The patch adds the enhancement for recycling more TX completed SKBs in one NAPI polling handler if NAPI budgets are still available and hardware raises status bit shown for certain SKBs are aready done. Signed-off-by: Sean Wang --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 14e1bd1..ac8f1b9 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -1074,10 +1074,13 @@ static int mtk_napi_tx(struct napi_struct *napi, int budget) struct mtk_eth *eth = container_of(napi, struct mtk_eth, tx_napi); u32 status, mask; int tx_done = 0; + int remain_budget = budget; mtk_handle_status_irq(eth); + +poll_again: mtk_w32(eth, MTK_TX_DONE_INT, MTK_QMTK_INT_STATUS); - tx_done = mtk_poll_tx(eth, budget); + tx_done = mtk_poll_tx(eth, remain_budget); if (unlikely(netif_msg_intr(eth))) { status = mtk_r32(eth, MTK_QMTK_INT_STATUS); @@ -1087,17 +1090,19 @@ static int mtk_napi_tx(struct napi_struct *napi, int budget) tx_done, status, mask); } - if (tx_done == budget) + if (tx_done == remain_budget) return budget; status = mtk_r32(eth, MTK_QMTK_INT_STATUS); - if (status & MTK_TX_DONE_INT) - return budget; + if (status & MTK_TX_DONE_INT) { + remain_budget -= tx_done; + goto poll_again; + } napi_complete(napi); mtk_irq_enable(eth, MTK_QDMA_INT_MASK, MTK_TX_DONE_INT); - return tx_done; + return tx_done + budget - remain_budget; } static int mtk_napi_rx(struct napi_struct *napi, int budget)