Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a397ebe authored by Sunil Goutham's avatar Sunil Goutham Committed by David S. Miller
Browse files

net: thunderx: Set queue count based on number of CPUs 



81xx has only 4 CPUs, so it doesn't make sense to initialize
entire Qset i.e 8 queues by default. Made changes to queue
initialization to init queues equal to number of CPUs or
8 queues whichever is lesser. Also this will be applicable to
VMs with VNIC VF attached and having less VCPUs

Signed-off-by: default avatarSunil Goutham <sgoutham@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0025d93e

drivers/net/ethernet/cavium/thunder/nic_main.c

+6 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,12 @@ static int nic_num_sqs_en(struct nicpf *nic, int vf_en) 
	int pos, sqs_per_vf = MAX_SQS_PER_VF_SINGLE_NODE;

	u16 total_vf;



	/* Secondary Qsets are needed only if CPU count is

	 * morethan MAX_QUEUES_PER_QSET.

	 */

	if (num_online_cpus() <= MAX_QUEUES_PER_QSET)

		return 0;



	/* Check if its a multi-node environment */

	if (nr_node_ids > 1)

		sqs_per_vf = MAX_SQS_PER_VF;

drivers/net/ethernet/cavium/thunder/nicvf_main.c

+3 −4
Original line number Diff line number Diff line
@@ -1537,13 +1537,12 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_release_regions;

	}



	qcount = MAX_CMP_QUEUES_PER_QS;

	qcount = netif_get_num_default_rss_queues();



	/* Restrict multiqset support only for host bound VFs */

	if (pdev->is_virtfn) {

		/* Set max number of queues per VF */

		qcount = roundup(num_online_cpus(), MAX_CMP_QUEUES_PER_QS);

		qcount = min(qcount,

		qcount = min_t(int, num_online_cpus(),

			       (MAX_SQS_PER_VF + 1) * MAX_CMP_QUEUES_PER_QS);

	}

drivers/net/ethernet/cavium/thunder/nicvf_queues.c

+4 −4
Original line number Diff line number Diff line
@@ -762,10 +762,10 @@ int nicvf_set_qset_resources(struct nicvf *nic) 
	nic->qs = qs;



	/* Set count of each queue */

	qs->rbdr_cnt = RBDR_CNT;

	qs->rq_cnt = RCV_QUEUE_CNT;

	qs->sq_cnt = SND_QUEUE_CNT;

	qs->cq_cnt = CMP_QUEUE_CNT;

	qs->rbdr_cnt = DEFAULT_RBDR_CNT;

	qs->rq_cnt = min_t(u8, MAX_RCV_QUEUES_PER_QS, num_online_cpus());

	qs->sq_cnt = min_t(u8, MAX_SND_QUEUES_PER_QS, num_online_cpus());

	qs->cq_cnt = max_t(u8, qs->rq_cnt, qs->sq_cnt);



	/* Set queue lengths */

	qs->rbdr_len = RCV_BUF_COUNT;

drivers/net/ethernet/cavium/thunder/nicvf_queues.h

+1 −4
Original line number Diff line number Diff line
@@ -57,10 +57,7 @@ 
#define CMP_QUEUE_SIZE6		6ULL /* 64K entries */



/* Default queue count per QS, its lengths and threshold values */

#define RBDR_CNT		1

#define RCV_QUEUE_CNT		8

#define SND_QUEUE_CNT		8

#define CMP_QUEUE_CNT		8 /* Max of RCV and SND qcount */

#define DEFAULT_RBDR_CNT	1



#define SND_QSIZE		SND_QUEUE_SIZE2

#define SND_QUEUE_LEN		(1ULL << (SND_QSIZE + 10))