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: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c
index 4974923b9d4498d8fb990b1877e28fc7358c3125..0d81117f019c48f1ce95ae03d9973bfd9665259d 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nic_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nic_main.c
@@ -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;

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index 0c106350d5a8f4037d99bbf9ffb7a14921a529ec..d9efe2fb7b8186f23d3f8a576260760a9742116e 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -1537,14 +1537,13 @@ 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,
-                            (MAX_SQS_PER_VF + 1) * MAX_CMP_QUEUES_PER_QS);
+               qcount = min_t(int, num_online_cpus(),
+                              (MAX_SQS_PER_VF + 1) * MAX_CMP_QUEUES_PER_QS);
        }
 
        netdev = alloc_etherdev_mqs(sizeof(struct nicvf), qcount, qcount);

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
index 0ff8e60deccb78a941f73163212a25b23301f871..e521a94dc79fc0fb2854a9faeee94b4cd35abde8 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
@@ -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;

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.h b/drivers/net/ethernet/cavium/thunder/nicvf_queues.h
index 6673e1133523881a4c1719e7d6ca4c123f7a8e1e..869f3386028b1e765c4860cf86560f1f6b564b42 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.h
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.h
@@ -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))