diff options
author | Michael Chan <michael.chan@broadcom.com> | 2018-03-31 13:54:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-03-31 23:24:19 -0400 |
commit | 1d3ef13dd48da9177e417379644be9003bc459cc (patch) | |
tree | dc524fd9cbf09dca1a057be5a9439152a7d4bead | |
parent | d4f52de02f04f0a7dfcb1d0228a2ff58b06aa230 (diff) |
bnxt_en: Adjust default rings for multi-port NICs.
Change the default ring logic to select default number of rings to be up to
8 per port if the default rings x NIC ports <= total CPUs.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 45d45321acb2..82a3aad27dd2 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c | |||
@@ -8393,9 +8393,15 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh) | |||
8393 | if (sh) | 8393 | if (sh) |
8394 | bp->flags |= BNXT_FLAG_SHARED_RINGS; | 8394 | bp->flags |= BNXT_FLAG_SHARED_RINGS; |
8395 | dflt_rings = netif_get_num_default_rss_queues(); | 8395 | dflt_rings = netif_get_num_default_rss_queues(); |
8396 | /* Reduce default rings to reduce memory usage on multi-port cards */ | 8396 | /* Reduce default rings on multi-port cards so that total default |
8397 | if (bp->port_count > 1) | 8397 | * rings do not exceed CPU count. |
8398 | dflt_rings = min_t(int, dflt_rings, 4); | 8398 | */ |
8399 | if (bp->port_count > 1) { | ||
8400 | int max_rings = | ||
8401 | max_t(int, num_online_cpus() / bp->port_count, 1); | ||
8402 | |||
8403 | dflt_rings = min_t(int, dflt_rings, max_rings); | ||
8404 | } | ||
8399 | rc = bnxt_get_dflt_rings(bp, &max_rx_rings, &max_tx_rings, sh); | 8405 | rc = bnxt_get_dflt_rings(bp, &max_rx_rings, &max_tx_rings, sh); |
8400 | if (rc) | 8406 | if (rc) |
8401 | return rc; | 8407 | return rc; |