[PATCH net-next] net/enic: Allow at least 8 RQs to always be used

[PATCH net-next] net/enic: Allow at least 8 RQs to always be used

[Nelson Escobar]

Enic started using netif_get_num_default_rss_queues() to set the number
of RQs used in commit cc94d6c4d40c ("enic: Adjust used MSI-X
wq/rq/cq/interrupt resources in a more robust way")

This resulted in machines with less than 16 cpus using less than 8 RQs.
Allow enic to use at least 8 RQs no matter how many cpus are in the
machine to not impact existing enic workloads after a kernel upgrade.

Reviewed-by: John Daley <johndale@cisco.com>
Reviewed-by: Satish Kharat <satishkh@cisco.com>
Signed-off-by: Nelson Escobar <neescoba@cisco.com>
---
 drivers/net/ethernet/cisco/enic/enic.h      | 1 +
 drivers/net/ethernet/cisco/enic/enic_main.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
index 9c12e967e9f1299e1cf3e280a16fb9bf93ac607b..301b3f3114afa8f60c34c05661ee3cf67d4d6808 100644
--- a/drivers/net/ethernet/cisco/enic/enic.h
+++ b/drivers/net/ethernet/cisco/enic/enic.h
@@ -26,6 +26,7 @@
 
 #define ENIC_WQ_MAX		256
 #define ENIC_RQ_MAX		256
+#define ENIC_RQ_MIN_DEFAULT	8
 
 #define ENIC_WQ_NAPI_BUDGET	256
 
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index c753c35b26ebd12c500f2056b3eb583de8c6b076..6ef8a0d90bce38781d931f62518cf9bafb223288 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2296,7 +2296,8 @@ static int enic_adjust_resources(struct enic *enic)
 		 * used based on which resource is the most constrained
 		 */
 		wq_avail = min(enic->wq_avail, ENIC_WQ_MAX);
-		rq_default = netif_get_num_default_rss_queues();
+		rq_default = max(netif_get_num_default_rss_queues(),
+				 ENIC_RQ_MIN_DEFAULT);
 		rq_avail = min3(enic->rq_avail, ENIC_RQ_MAX, rq_default);
 		max_queues = min(enic->cq_avail,
 				 enic->intr_avail - ENIC_MSIX_RESERVED_INTR);

---
base-commit: ae605349e1fa5a29cdeecf52f92aa76850900d90
change-id: 20250513-enic_min_8rq-421f23897dc2

Best regards,
-- 
Nelson Escobar <neescoba@cisco.com>

Re: [PATCH net-next] net/enic: Allow at least 8 RQs to always be used

[Michal Swiatkowski]

On Wed, May 21, 2025 at 01:19:29AM +0000, Nelson Escobar wrote:
> Enic started using netif_get_num_default_rss_queues() to set the number
> of RQs used in commit cc94d6c4d40c ("enic: Adjust used MSI-X
> wq/rq/cq/interrupt resources in a more robust way")
> 
> This resulted in machines with less than 16 cpus using less than 8 RQs.
> Allow enic to use at least 8 RQs no matter how many cpus are in the
> machine to not impact existing enic workloads after a kernel upgrade.
> 
> Reviewed-by: John Daley <johndale@cisco.com>
> Reviewed-by: Satish Kharat <satishkh@cisco.com>
> Signed-off-by: Nelson Escobar <neescoba@cisco.com>
> ---
>  drivers/net/ethernet/cisco/enic/enic.h      | 1 +
>  drivers/net/ethernet/cisco/enic/enic_main.c | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
> index 9c12e967e9f1299e1cf3e280a16fb9bf93ac607b..301b3f3114afa8f60c34c05661ee3cf67d4d6808 100644
> --- a/drivers/net/ethernet/cisco/enic/enic.h
> +++ b/drivers/net/ethernet/cisco/enic/enic.h
> @@ -26,6 +26,7 @@
>  
>  #define ENIC_WQ_MAX		256
>  #define ENIC_RQ_MAX		256
> +#define ENIC_RQ_MIN_DEFAULT	8
>  
>  #define ENIC_WQ_NAPI_BUDGET	256
>  
> diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
> index c753c35b26ebd12c500f2056b3eb583de8c6b076..6ef8a0d90bce38781d931f62518cf9bafb223288 100644
> --- a/drivers/net/ethernet/cisco/enic/enic_main.c
> +++ b/drivers/net/ethernet/cisco/enic/enic_main.c
> @@ -2296,7 +2296,8 @@ static int enic_adjust_resources(struct enic *enic)
>  		 * used based on which resource is the most constrained
>  		 */
>  		wq_avail = min(enic->wq_avail, ENIC_WQ_MAX);
> -		rq_default = netif_get_num_default_rss_queues();
> +		rq_default = max(netif_get_num_default_rss_queues(),
> +				 ENIC_RQ_MIN_DEFAULT);
>  		rq_avail = min3(enic->rq_avail, ENIC_RQ_MAX, rq_default);
>  		max_queues = min(enic->cq_avail,
>  				 enic->intr_avail - ENIC_MSIX_RESERVED_INTR);
> 
> ---
> base-commit: ae605349e1fa5a29cdeecf52f92aa76850900d90
> change-id: 20250513-enic_min_8rq-421f23897dc2
> 
> Best regards,

Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>

> -- 
> Nelson Escobar <neescoba@cisco.com>

Re: [PATCH net-next] net/enic: Allow at least 8 RQs to always be used

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 21 May 2025 01:19:29 +0000 you wrote:
> Enic started using netif_get_num_default_rss_queues() to set the number
> of RQs used in commit cc94d6c4d40c ("enic: Adjust used MSI-X
> wq/rq/cq/interrupt resources in a more robust way")
> 
> This resulted in machines with less than 16 cpus using less than 8 RQs.
> Allow enic to use at least 8 RQs no matter how many cpus are in the
> machine to not impact existing enic workloads after a kernel upgrade.
> 
> [...]

Here is the summary with links:
  - [net-next] net/enic: Allow at least 8 RQs to always be used
    https://git.kernel.org/netdev/net-next/c/8fa18a3e8c0d

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html