From: Madalin Bucur <madalin.bucur@freescale.com>
To: <netdev@vger.kernel.org>
Cc: <linuxppc-dev@lists.ozlabs.org>, <linux-kernel@vger.kernel.org>,
<scottwood@freescale.com>, <igal.liberman@freescale.com>,
<ppc@mindchasers.com>, <joe@perches.com>, <pebolle@tiscali.nl>,
<joakim.tjernlund@transmode.se>,
Madalin Bucur <madalin.bucur@freescale.com>
Subject: [PATCH 03/10] dpaa_eth: add configurable bpool thresholds
Date: Wed, 22 Jul 2015 19:16:39 +0300 [thread overview]
Message-ID: <1437581806-17420-3-git-send-email-madalin.bucur@freescale.com> (raw)
In-Reply-To: <1437581806-17420-2-git-send-email-madalin.bucur@freescale.com>
Allow the user to tweak the refill threshold and the total number
of buffers in the buffer pool. The provided values are for one CPU.
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
---
drivers/net/ethernet/freescale/dpaa/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 3 ---
drivers/net/ethernet/freescale/dpaa/dpaa_eth_sg.c | 6 +++---
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/freescale/dpaa/Kconfig b/drivers/net/ethernet/freescale/dpaa/Kconfig
index 1f3a203..9e6a39f 100644
--- a/drivers/net/ethernet/freescale/dpaa/Kconfig
+++ b/drivers/net/ethernet/freescale/dpaa/Kconfig
@@ -11,6 +11,24 @@ menuconfig FSL_DPAA_ETH
if FSL_DPAA_ETH
+config FSL_DPAA_ETH_MAX_BUF_COUNT
+ int "Maximum number of buffers in private bpool"
+ range 64 2048
+ default "128"
+ ---help---
+ The maximum number of buffers to be by default allocated in the DPAA-Ethernet private port's
+ buffer pool. One needn't normally modify this, as it has probably been tuned for performance
+ already. This cannot be lower than DPAA_ETH_REFILL_THRESHOLD.
+
+config FSL_DPAA_ETH_REFILL_THRESHOLD
+ int "Private bpool refill threshold"
+ range 32 FSL_DPAA_ETH_MAX_BUF_COUNT
+ default "80"
+ ---help---
+ The DPAA-Ethernet driver will start replenishing buffer pools whose count
+ falls below this threshold. This must be related to DPAA_ETH_MAX_BUF_COUNT. One needn't normally
+ modify this value unless one has very specific performance reasons.
+
config FSL_DPAA_CS_THRESHOLD_1G
hex "Egress congestion threshold on 1G ports"
range 0x1000 0x10000000
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 500d0e3..fc2071e 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -475,7 +475,7 @@ dpa_priv_bp_probe(struct device *dev)
return ERR_PTR(-ENOMEM);
dpa_bp->percpu_count = devm_alloc_percpu(dev, *dpa_bp->percpu_count);
- dpa_bp->target_count = FSL_DPAA_ETH_MAX_BUF_COUNT;
+ dpa_bp->target_count = CONFIG_FSL_DPAA_ETH_MAX_BUF_COUNT;
dpa_bp->seed_cb = dpa_bp_priv_seed;
dpa_bp->free_buf_cb = _dpa_bp_free_pf;
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h
index 08c1b01..fc6c5dc 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.h
@@ -126,9 +126,6 @@ struct dpa_buffer_layout_s {
#define DPAA_ETH_RX_QUEUES 128
-#define FSL_DPAA_ETH_MAX_BUF_COUNT 128
-#define FSL_DPAA_ETH_REFILL_THRESHOLD 80
-
/* More detailed FQ types - used for fine-grained WQ assignments */
enum dpa_fq_type {
FQ_TYPE_RX_DEFAULT = 1, /* Rx Default FQs */
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sg.c
index b865d2a..d781219 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sg.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth_sg.c
@@ -151,7 +151,7 @@ int dpaa_eth_refill_bpools(struct dpa_bp *dpa_bp, int *countptr)
int count = *countptr;
int new_bufs;
- if (unlikely(count < FSL_DPAA_ETH_REFILL_THRESHOLD)) {
+ if (unlikely(count < CONFIG_FSL_DPAA_ETH_REFILL_THRESHOLD)) {
do {
new_bufs = _dpa_bp_add_8_bufs(dpa_bp);
if (unlikely(!new_bufs)) {
@@ -162,10 +162,10 @@ int dpaa_eth_refill_bpools(struct dpa_bp *dpa_bp, int *countptr)
break;
}
count += new_bufs;
- } while (count < FSL_DPAA_ETH_MAX_BUF_COUNT);
+ } while (count < CONFIG_FSL_DPAA_ETH_MAX_BUF_COUNT);
*countptr = count;
- if (unlikely(count < FSL_DPAA_ETH_MAX_BUF_COUNT))
+ if (unlikely(count < CONFIG_FSL_DPAA_ETH_MAX_BUF_COUNT))
return -ENOMEM;
}
--
1.7.11.7
next prev parent reply other threads:[~2015-07-22 16:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-22 16:16 [PATCH 01/10] devres: add devm_alloc_percpu() Madalin Bucur
2015-07-22 16:16 ` [PATCH 02/10] dpaa_eth: add support for DPAA Ethernet Madalin Bucur
2015-07-22 16:16 ` Madalin Bucur [this message]
2015-07-22 16:16 ` [PATCH 04/10] dpaa_eth: add support for S/G frames Madalin Bucur
2015-07-22 16:16 ` [PATCH 05/10] dpaa_eth: add driver's Tx queue selection mechanism Madalin Bucur
2015-07-22 16:16 ` [PATCH 06/10] dpaa_eth: add ethtool functionality Madalin Bucur
2015-07-22 16:16 ` [PATCH 07/10] dpaa_eth: add sysfs exports Madalin Bucur
2015-07-22 16:16 ` [PATCH 08/10] dpaa_eth: add debugfs counters Madalin Bucur
2015-07-22 16:16 ` [PATCH 09/10] dpaa_eth: add debugfs entries Madalin Bucur
2015-07-22 16:16 ` [PATCH 10/10] dpaa_eth: add trace points Madalin Bucur
2015-07-22 17:47 ` [PATCH 03/10] dpaa_eth: add configurable bpool thresholds Joe Perches
2015-07-24 15:49 ` Madalin-Cristian Bucur
2015-07-26 23:35 ` David Miller
2015-07-27 12:54 ` Madalin-Cristian Bucur
2015-07-22 17:37 ` [PATCH 02/10] dpaa_eth: add support for DPAA Ethernet Joe Perches
2015-07-24 15:45 ` Madalin-Cristian Bucur
2015-07-27 18:59 ` Scott Wood
2015-07-29 14:15 ` Joakim Tjernlund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437581806-17420-3-git-send-email-madalin.bucur@freescale.com \
--to=madalin.bucur@freescale.com \
--cc=igal.liberman@freescale.com \
--cc=joakim.tjernlund@transmode.se \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=pebolle@tiscali.nl \
--cc=ppc@mindchasers.com \
--cc=scottwood@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).