From patchwork Mon Dec 4 19:40:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 844391 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=65.50.211.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="Zz0r8uaD"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IbNNPBMB"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3yrFfq1Xhjz9sBd for ; Tue, 5 Dec 2017 06:43:31 +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:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V6G5pIU9TCpauRn7yC9D6S91VbZ+0QIvZBeB5nOMOl4=; b=Zz0r8uaD9SIrwD wzCucaDnQCJ9rrH1C8Yv0FYuUAWcGDYI04VDak5mKoJkjNVsN8FOFoWwyRMyG2UVe/2+A9FmGN9ct KxDxCDUMJWsYC0UsPiY03N8ZJmMqhJBsfai8Fpjqu99ZnATRJjtWwQUDwIrjq3hKubmIb7P3ejWPv ydA0TPQZFTOlZOpq/btfXCqKwQs4+ko0ZzIU6/1eDTbw6egOhGk7qyfcvcuUkMUNZEq5QCMgK2av7 MRcwoffp9Bk8YRJGiU6JPcYAmO5rcxlsEBtOI0e58Fpkei1YTJx665uAd0TrLnuVqG1AWQYAp6NaC e4OsMPzxaN1If53zwmdA==; 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 1eLweB-0008OM-SU; Mon, 04 Dec 2017 19:43:23 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eLwbm-0007UL-M8 for lede-dev@lists.infradead.org; Mon, 04 Dec 2017 19:41:01 +0000 Received: by mail-pf0-x244.google.com with SMTP id d23so9293682pfe.9 for ; Mon, 04 Dec 2017 11:40:34 -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:in-reply-to:references; bh=EZjUzMJjFYnUs+Ff/qcvP13GpcDIlXW9hx50iR7VACs=; b=IbNNPBMBWkQjoYXvGBqGyTvG21n/a1pV6Zwr5fEf/K6DKf7CZf8NcLCg66AuK7392C dvTlAE+WzCLVRD0poTXkkbq/76r/VrwlBio48vfvCWbyv9RD3O3isxFAVWWf81UtCv5k y0M+Dtyl41dnHASsi2kuhNyZVPKSdzlIJOCrFbGLqfZlqgHRVa8hnOr0yq+aTJyLMkgJ 6K8aETHm0d91xw5QvrPWB/S34pcdyjL9+KGatlpBm5CQiCzSXegiIKfdvHTWVdA/qXSg GtIymmydh1CcS7r/WSiKn+LKHBdHgkAxDHsYhsdfa09USRsXoknsaN0Q6DIY4SNdOg+F THMw== 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:in-reply-to :references; bh=EZjUzMJjFYnUs+Ff/qcvP13GpcDIlXW9hx50iR7VACs=; b=jrDfhEW5nrPVTHsVRRwyiqykTWV7LGNhvUUaUYCcS55kotY2yLwpJvaiTDCg2opfW1 +X+jipI+enrgaTDfnmyMINH7jRfOiPxjcga0oJG+tGuJnfQiB6y96XGzAYe9XaWQpzub Atp8KrCfg1N75EQ2gtA3Ua9ULXq53wHvupWu6LQFBYmmck9ezUXumeE8pl2srgg8VKd8 OL7rnBWrIDqweW8DlDmyq2QO4t6kIv50Y6X9P/LwI1K3p9jWZPNHURepQ1q8xi+IPsep HuEHh4laKLVMwVfE11aKmT5AtKr1OlHPwNB+NOOswLxeCq2H1GzVuFSSOJLuHIRq+iA1 D0OQ== X-Gm-Message-State: AKGB3mINUYcsC1mOzFhxuzdaEyfusEXToDphs8y1TSlE3HUkv8ARuEty YA51W96Y3dRkVs34flo2XmTNHFEk X-Google-Smtp-Source: AGs4zMZXn0w7VXXDeIf5Gt0Aqe86mGKEGN+B77xiK9d61UNjdL3cMX56ivB9Uzk4K4x2N/vyMga0Kg== X-Received: by 10.84.139.1 with SMTP id 1mr4850062plq.178.1512416433614; Mon, 04 Dec 2017 11:40:33 -0800 (PST) Received: from DESKTOP-CEH0M93.lan (astound-64-85-248-45.ca.astound.net. [64.85.248.45]) by smtp.gmail.com with ESMTPSA id w3sm22889590pge.59.2017.12.04.11.40.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 11:40:33 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Mon, 4 Dec 2017 11:40:21 -0800 Message-Id: <1512416424-629-2-git-send-email-rosenp@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512416424-629-1-git-send-email-rosenp@gmail.com> References: <1512416424-629-1-git-send-email-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171204_114057_112765_0D1AB3F7 X-CRM114-Status: GOOD ( 11.08 ) 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:c00:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH 2/5] Revert "ag71xx: Switch from driver to kernel macro for NAPI_WEIGHT." 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 The motivation for this was misguided. It turns out tuning the NAPI weight could be useful for testing purposes. Therefore reverting. Signed-off-by: Rosen Penev --- .../linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 5 +++-- .../files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c | 6 +++--- .../ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h index 7b1cc1e..898bde1 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h @@ -40,6 +40,7 @@ #define AG71XX_DRV_NAME "ag71xx" #define AG71XX_DRV_VERSION "0.5.35" +#define AG71XX_NAPI_WEIGHT 64 #define AG71XX_OOM_REFILL (1 + HZ/10) #define AG71XX_INT_ERR (AG71XX_INT_RX_BE | AG71XX_INT_TX_BE) @@ -135,8 +136,8 @@ struct ag71xx_napi_stats { unsigned long tx_packets; unsigned long tx_packets_max; - unsigned long rx[NAPI_POLL_WEIGHT + 1]; - unsigned long tx[NAPI_POLL_WEIGHT + 1]; + unsigned long rx[AG71XX_NAPI_WEIGHT + 1]; + unsigned long tx[AG71XX_NAPI_WEIGHT + 1]; }; struct ag71xx_debug { diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c index 89cea0c..c86803c 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c @@ -78,7 +78,7 @@ void ag71xx_debugfs_update_napi_stats(struct ag71xx *ag, int rx, int tx) if (rx) { stats->rx_count++; stats->rx_packets += rx; - if (rx <= NAPI_POLL_WEIGHT) + if (rx <= AG71XX_NAPI_WEIGHT) stats->rx[rx]++; if (rx > stats->rx_packets_max) stats->rx_packets_max = rx; @@ -87,7 +87,7 @@ void ag71xx_debugfs_update_napi_stats(struct ag71xx *ag, int rx, int tx) if (tx) { stats->tx_count++; stats->tx_packets += tx; - if (tx <= NAPI_POLL_WEIGHT) + if (tx <= AG71XX_NAPI_WEIGHT) stats->tx[tx]++; if (tx > stats->tx_packets_max) stats->tx_packets_max = tx; @@ -121,7 +121,7 @@ static ssize_t read_file_napi_stats(struct file *file, char __user *user_buf, len += snprintf(buf + len, buflen - len, "%3s %10s %10s\n", "len", "rx", "tx"); - for (i = 1; i <= NAPI_POLL_WEIGHT; i++) + for (i = 1; i <= AG71XX_NAPI_WEIGHT; i++) len += snprintf(buf + len, buflen - len, "%3d: %10lu %10lu\n", i, stats->rx[i], stats->tx[i]); 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 e9a3d59..566e951 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 @@ -1360,7 +1360,7 @@ static int ag71xx_probe(struct platform_device *pdev) memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN); - netif_napi_add(dev, &ag->napi, ag71xx_poll, NAPI_POLL_WEIGHT); + netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT); ag71xx_dump_regs(ag);