i40e: limit lan queue count in large cpu count machine
Subsystems (3)
PATCH 1/1 i40e: limit lan queue count in large cpu count machine
When a machine has more cpus than queuepairs, e.g. 512 cores, the counting gets a little funky and turns off Flow Director with the message:
not enough queues for Flow Director. Flow Director feature is disabled
This patch limits the number of lan queues initially allocated to be sure we have some left for FD and other features.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +7 -4
@@ -11059,6 +11059,7 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)static void i40e_determine_queue_usage (struct i40e_pf *pf) {int queues_left; +int q_max; pf->num_lan_qps =0 ;
@@ -11105,10 +11106,12 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) I40E_FLAG_DCB_ENABLED);dev_info (&pf->pdev->dev,"not enough queues for DCB. DCB is disabled.\n" ); } - pf->num_lan_qps =max_t (int, pf->rss_size_max, -num_online_cpus ()); - pf->num_lan_qps =min_t (int, pf->num_lan_qps, - pf->hw.func_caps.num_tx_qp); + +/* limit lan qps to the smaller of qps, cpus or msix */ + q_max =max_t (int, pf->rss_size_max,num_online_cpus ()); + q_max =min_t (int, q_max, pf->hw.func_caps.num_tx_qp); + q_max =min_t (int, q_max, pf->hw.func_caps.num_msix_vectors); + pf->num_lan_qps = q_max; queues_left -= pf->num_lan_qps; }
Signature · 1 line
1.7.1
Bowers
PATCH 1/1 i40e: limit lan queue count in large cpu count machine
Quoted 14 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Shannon Nelson
Sent: Monday, July 24, 2017 6:18 PM
To: davem at davemloft.net; netdev at vger.kernel.org
Cc: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH net-next] i40e: limit lan queue count in large cpu count machineWhen a machine has more cpus than queuepairs, e.g. 512 cores, the counting gets a little funky and turns off Flow Director with the message:
not enough queues for Flow Director. Flow Director feature is disabled
Quoted 7 lines
This patch limits the number of lan queues initially allocated to be sure we have some left for FD and other features.
Signed-off-by Shannon Nelson <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
PATCH 1/1 i40e: limit lan queue count in large cpu count machine
In reply to Shannon NelsonHey Jeff,
Any clues on when this patch, still sitting at "Under Review", will get moved along?
sln
Quoted 43 lines · Shannon Nelson
When a machine has more cpus than queuepairs, e.g. 512 cores, the counting gets a little funky and turns off Flow Director with the message:
not enough queues for Flow Director. Flow Director feature is disabledThis patch limits the number of lan queues initially allocated to be sure we have some left for FD and other features.
Signed-off-by Shannon Nelson <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/i40e/i40e_main.c +7
-4@@ -11059,6 +11059,7 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)static void i40e_determine_queue_usage (struct i40e_pf *pf) {int queues_left; +int q_max; pf->num_lan_qps =0 ;@@ -11105,10 +11106,12 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) I40E_FLAG_DCB_ENABLED);dev_info (&pf->pdev->dev,"not enough queues for DCB. DCB is disabled.\n" ); } - pf->num_lan_qps =max_t (int, pf->rss_size_max, -num_online_cpus ()); - pf->num_lan_qps =min_t (int, pf->num_lan_qps, - pf->hw.func_caps.num_tx_qp); + +/* limit lan qps to the smaller of qps, cpus or msix */ + q_max =max_t (int, pf->rss_size_max,num_online_cpus ()); + q_max =min_t (int, q_max, pf->hw.func_caps.num_tx_qp); + q_max =min_t (int, q_max, pf->hw.func_caps.num_msix_vectors); + pf->num_lan_qps = q_max; queues_left -= pf->num_lan_qps; }
PATCH 1/1 i40e: limit lan queue count in large cpu count machine
Quoted 5 lines · Shannon Nelson
Hey Jeff,
Any clues on when this patch, still sitting at "Under Review", will get
moved along?
I have 15 patches ready to push to Dave, and your patch is literally the next in line. But the window is closing, if not closed already. I could try and push a series of 16 patches, but I do not want to push my luck with Dave especially that this would be a pull request right at the deadline of net-next closing.
Your patch does "fix" the driver, so I have no problem pushing it to net (4.14) once Dave and Linus get done syncing their trees this week.
Quoted 52 lines · Shannon Nelson
Quoted 50 lines
When a machine has more cpus than queuepairs, e.g. 512 cores, the counting gets a little funky and turns off Flow Director with the message:
not enough queues for Flow Director. Flow Director feature is
disabledThis patch limits the number of lan queues initially allocated to be sure we have some left for FD and other features.
Signed-off-by Shannon Nelson <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/i40e/i40e_main.c +3
-4@@ -11059,6 +11059,7 @@ static int i40e_setup_pf_switch(struct i40e_pf *pf, bool reinit)static void i40e_determine_queue_usage (struct i40e_pf *pf) {int queues_left; +int q_max; pf->num_lan_qps =0 ;@@ -11105,10 +11106,12 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) I40E_FLAG_DCB_ENABLED); dev_info(&pf->pdev->dev, "not enough queues for DCB. DCB is disabled.\n"); } - pf->num_lan_qps =max_t (int, pf->rss_size_max, -num_online_cpus ()); - pf->num_lan_qps =min_t (int, pf->num_lan_qps, - pf- >hw.func_caps.num_tx_qp); + +/* limit lan qps to the smaller of qps, cpus or msix */
drivers/net/ethernet/intel/i40e/i40e_main.c +1
-0+ q_max = max_t(int, pf->rss_size_max,
num_online_cpus());drivers/net/ethernet/intel/i40e/i40e_main.c +1
-0+ q_max = min_t(int, q_max, pf-Quoted 1 line
hw.func_caps.num_tx_qp);
drivers/net/ethernet/intel/i40e/i40e_main.c +1
-0+ q_max = min_t(int, q_max, pf-Quoted 1 line
hw.func_caps.num_msix_vectors);
drivers/net/ethernet/intel/i40e/i40e_main.c +1
-0+ pf->num_lan_qps = q_max;
Quoted 8 lines
Quoted 3 lines
queues_left -= pf->num_lan_qps; }_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20170905/7a110a1e/attachment.asc>