Commit 8fa18a3e authored by Nelson Escobar's avatar Nelson Escobar Committed by Jakub Kicinski
Browse files

net/enic: Allow at least 8 RQs to always be used 



Enic started using netif_get_num_default_rss_queues() to set the number
of RQs used in commit cc94d6c4 ("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: default avatarJohn Daley <johndale@cisco.com>
Reviewed-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarNelson Escobar <neescoba@cisco.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Link: https://patch.msgid.link/20250521-enic_min_8rq-v1-1-691bd2353273@cisco.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 17fcb3dc

drivers/net/ethernet/cisco/enic/enic.h

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/cisco/enic/enic_main.c

+2 −1
Original line number Diff line number Diff line
@@ -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);