From patchwork Tue Feb 13 22:53:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 873194 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="A29BhN/G"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VJyFU2Te"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zgyX65Ll1z9t3h for ; Wed, 14 Feb 2018 09:54:14 +1100 (AEDT) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date: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=8iRLnOtOeF6xuuVHlBwte4GHndh8Siygh+h7yXtYfHU=; b=A29BhN/G/9dn1w uxcDX5xyTY3ZNqdauV9znw66fUzdWrVL0fNRSX1egLnhQ3KIK4v2TrWMvZfbwfNGKFRVn6/TI1rOw TXiTY1c8bsfhMcC47WMPYiKXUcwSxh16Qm+WreiGiXjry5f04r37qPQ3MCNs5kNRl10Zu9M+eOa8w A9L8PXN/eIMXz3OvcqCwkZYu5Aub84I+8ZojEZLPfL1v1uV71Q4BIVdiq4V1YfU2MFh1LwG9vum7b aKnrfWsWHJpwIJqwGngLGcTJ9b4tWifvlxPLdZ/4/Z9gPL9vlL4ckTD6EoJHgbz6zkbL1B608bGeq t50iwui8qpnykTX66cRw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eljSj-0001Vu-ND; Tue, 13 Feb 2018 22:54:09 +0000 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eljSh-0001Ih-7Z for lede-dev@lists.infradead.org; Tue, 13 Feb 2018 22:54:08 +0000 Received: by mail-pg0-x241.google.com with SMTP id g2so957878pgn.7 for ; Tue, 13 Feb 2018 14:53:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=gV66U4I1OAx47yo8R7hoiawNwfLQXvysNwjidcnVKPs=; b=VJyFU2TeRpcGZn85BvJPNEou5YBOgR3LzMQDjS48lnNjbKv1Mgzg+CTbqv/3+SwZz0 s0129D4yVi2yKtdrl3N+J48SRlh+y8Qg2taiWK/291zbhjP52x+XPQnmJGYVyGTlPaJC 1yn/b96uTwJ88/6pbgFkO9npe+Rz6+mifRD2t8LPvBjrxkYxJ1DMEKLHwcWzEbq36Te6 lOco7ic224qKEE+KsePofC47HBI2jcMqsCkpwyfGEB+u+SfnKfvSMJjGaPOj2KD504O0 Jrb2X0GBRlHvIqM0a0imQUsBT9OSfgTXU5/JUQQtDRrGXn7zJaWT2PReuj3dsRox6f0e D9xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gV66U4I1OAx47yo8R7hoiawNwfLQXvysNwjidcnVKPs=; b=EP3CRgfjBk5luWc8o1QEqFZTHse8+1LlsfBryNcNupxOP354skCwe4j16Ji9gBIDdn H5YN34NlP+kwXU99DRMWaW6vIFc1VZE4FAWXxjZgNtihzatrxgUn4k5VpWYzpWdDBdGr 5f8BRvsBNdDA2PhXMS5jT2zAJcl/txc2b1QfpLlGsqB01ei3vzdivVHonpqKyk8RHKMI XjmIKL5fCyGmbM3SIim4pcC1WMLuIwozM00XjnyuzPp8XcYZIGZxOKgk/0oAT6nKisDY qe1fVJIXRSGtZ+Up4AjlQzUJRXFCTXjGm0hS9YcaR3KoGFmeUpTjRGFaawuv7eaMi6lb IQOQ== X-Gm-Message-State: APf1xPC6TBKkrAv3vGQEc4eTPiNfJLIJKTW3ZOfJQpkxLC8alBUCpo+o grI7fsTMqBvt0S3ySfjW8Z+7PXoq X-Google-Smtp-Source: AH8x2265fYkVjhotmZErB7lm2Z71sS5CY1KQNf0sv90yqzfU0kMkWC77XtJcfmf4IJsvGVun9J4dLg== X-Received: by 10.98.147.209 with SMTP id r78mr2748484pfk.204.1518562435895; Tue, 13 Feb 2018 14:53:55 -0800 (PST) Received: from mangix.lan (astound-69-42-19-41.ca.astound.net. [69.42.19.41]) by smtp.gmail.com with ESMTPSA id j125sm29841987pgc.29.2018.02.13.14.53.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Feb 2018 14:53:55 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Tue, 13 Feb 2018 14:53:51 -0800 Message-Id: <20180213225351.8560-1-rosenp@gmail.com> X-Mailer: git-send-email 2.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180213_145407_334736_DEDCD3BD X-CRM114-Status: GOOD ( 11.61 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:241 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH] ag71xx: Add some unlikely calls + rearange some stuff in hard_start_xmit. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Based on Qualcomm driver. Improves iperf3 throughput by ~20mbps on transmit on Archer C7v4. Signed-off-by: Rosen Penev --- .../drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index 95682b7641..d32f220178 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -797,11 +797,14 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, if (ag71xx_has_ar8216(ag)) ag71xx_add_ar8216_header(ag, skb); - if (skb->len <= 4) { + dma_cache_sync (NULL, skb->data, skb->len, DMA_TO_DEVICE); + + if (unlikely(skb->len <= 4)) { DBG("%s: packet len is too small\n", ag->dev->name); goto err_drop; } + netdev_sent_queue(dev, skb->len); dma_addr = dma_map_single(&dev->dev, skb->data, skb->len, DMA_TO_DEVICE); @@ -817,27 +820,24 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, ring->buf[i].len = skb->len; ring->buf[i].skb = skb; - netdev_sent_queue(dev, skb->len); - skb_tx_timestamp(skb); desc->ctrl &= ~DESC_EMPTY; ring->curr += n; - /* flush descriptor */ - wmb(); - ring_min = 2; if (ring->desc_split) ring_min *= AG71XX_TX_RING_DS_PER_PKT; - if (ring->curr - ring->dirty >= ring_size - ring_min) { + if (unlikely(ring->curr - ring->dirty >= ring_size - ring_min)) { DBG("%s: tx queue full\n", dev->name); netif_stop_queue(dev); } DBG("%s: packet injected into TX queue\n", ag->dev->name); + /* flush descriptor */ + wmb(); /* enable TX engine */ ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE);