Merge branch 'thunderx-xdp'

Sunil Goutham says:

====================
net: thunderx: Adds XDP support

This patch series adds support for XDP to ThunderX NIC driver
which is used on CN88xx, CN81xx and CN83xx platforms.

Patches 1-4 are performance improvement and cleanup patches
which are done keeping XDP performance bottlenecks in view.
Rest of the patches adds actual XDP support.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 657 insertions, 124 deletions

diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h
index 6fb44218bf55..4a02e618e318 100644
--- a/drivers/net/ethernet/cavium/thunder/nic.h
+++ b/drivers/net/ethernet/cavium/thunder/nic.h
@@ -252,12 +252,14 @@ struct nicvf_drv_stats {
         u64 tx_csum_overflow;
 
         /* driver debug stats */
-        u64 rcv_buffer_alloc_failures;
         u64 tx_tso;
         u64 tx_timeout;
         u64 txq_stop;
         u64 txq_wake;
 
+        u64 rcv_buffer_alloc_failures;
+        u64 page_alloc;
+
         struct u64_stats_sync   syncp;
 };
 
@@ -266,9 +268,9 @@ struct nicvf {
         struct net_device       *netdev;
         struct pci_dev          *pdev;
         void __iomem            *reg_base;
+        struct bpf_prog         *xdp_prog;
 #define MAX_QUEUES_PER_QSET                     8
         struct queue_set        *qs;
-        struct nicvf_cq_poll    *napi[8];
         void                    *iommu_domain;
         u8                      vf_id;
         u8                      sqs_id;
@@ -294,6 +296,7 @@ struct nicvf {
         /* Queue count */
         u8                      rx_queues;
         u8                      tx_queues;
+        u8                      xdp_tx_queues;
         u8                      max_queues;
 
         u8                      node;
@@ -318,6 +321,9 @@ struct nicvf {
         struct nicvf_drv_stats  __percpu *drv_stats;
         struct bgx_stats        bgx_stats;
 
+        /* Napi */
+        struct nicvf_cq_poll    *napi[8];
+
         /* MSI-X  */
         u8                      num_vec;
         char                    irq_name[NIC_VF_MSIX_VECTORS][IFNAMSIZ + 15];
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
index 02a986cdbb39..b9ece9cbf98b 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
@@ -100,11 +100,12 @@ static const struct nicvf_stat nicvf_drv_stats[] = {
         NICVF_DRV_STAT(tx_csum_overlap),
         NICVF_DRV_STAT(tx_csum_overflow),
 
-        NICVF_DRV_STAT(rcv_buffer_alloc_failures),
         NICVF_DRV_STAT(tx_tso),
         NICVF_DRV_STAT(tx_timeout),
         NICVF_DRV_STAT(txq_stop),
         NICVF_DRV_STAT(txq_wake),
+        NICVF_DRV_STAT(rcv_buffer_alloc_failures),
+        NICVF_DRV_STAT(page_alloc),
 };
 
 static const struct nicvf_stat nicvf_queue_stats[] = {
@@ -720,7 +721,7 @@ static int nicvf_set_channels(struct net_device *dev,
         struct nicvf *nic = netdev_priv(dev);
         int err = 0;
         bool if_up = netif_running(dev);
-        int cqcount;
+        u8 cqcount, txq_count;
 
         if (!channel->rx_count || !channel->tx_count)
                 return -EINVAL;
@@ -729,10 +730,26 @@ static int nicvf_set_channels(struct net_device *dev,
         if (channel->tx_count > nic->max_queues)
                 return -EINVAL;
 
+        if (nic->xdp_prog &&
+            ((channel->tx_count + channel->rx_count) > nic->max_queues)) {
+                netdev_err(nic->netdev,
+                           "XDP mode, RXQs + TXQs > Max %d\n",
+                           nic->max_queues);
+                return -EINVAL;
+        }
+
         if (if_up)
                 nicvf_stop(dev);
 
-        cqcount = max(channel->rx_count, channel->tx_count);
+        nic->rx_queues = channel->rx_count;
+        nic->tx_queues = channel->tx_count;
+        if (!nic->xdp_prog)
+                nic->xdp_tx_queues = 0;
+        else
+                nic->xdp_tx_queues = channel->rx_count;
+
+        txq_count = nic->xdp_tx_queues + nic->tx_queues;
+        cqcount = max(nic->rx_queues, txq_count);
 
         if (cqcount > MAX_CMP_QUEUES_PER_QS) {
                 nic->sqs_count = roundup(cqcount, MAX_CMP_QUEUES_PER_QS);
@@ -741,12 +758,10 @@ static int nicvf_set_channels(struct net_device *dev,
                 nic->sqs_count = 0;
         }
 
-        nic->qs->rq_cnt = min_t(u32, channel->rx_count, MAX_RCV_QUEUES_PER_QS);
-        nic->qs->sq_cnt = min_t(u32, channel->tx_count, MAX_SND_QUEUES_PER_QS);
+        nic->qs->rq_cnt = min_t(u8, nic->rx_queues, MAX_RCV_QUEUES_PER_QS);
+        nic->qs->sq_cnt = min_t(u8, txq_count, MAX_SND_QUEUES_PER_QS);
         nic->qs->cq_cnt = max(nic->qs->rq_cnt, nic->qs->sq_cnt);
 
-        nic->rx_queues = channel->rx_count;
-        nic->tx_queues = channel->tx_count;
         err = nicvf_set_real_num_queues(dev, nic->tx_queues, nic->rx_queues);
         if (err)
                 return err;
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index 81a2fcb3cb1b..d6477af88085 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -17,6 +17,9 @@
 #include <linux/prefetch.h>
 #include <linux/irq.h>
 #include <linux/iommu.h>
+#include <linux/bpf.h>
+#include <linux/bpf_trace.h>
+#include <linux/filter.h>
 
 #include "nic_reg.h"
 #include "nic.h"
@@ -397,8 +400,10 @@ static void nicvf_request_sqs(struct nicvf *nic)
 
         if (nic->rx_queues > MAX_RCV_QUEUES_PER_QS)
                 rx_queues = nic->rx_queues - MAX_RCV_QUEUES_PER_QS;
-        if (nic->tx_queues > MAX_SND_QUEUES_PER_QS)
-                tx_queues = nic->tx_queues - MAX_SND_QUEUES_PER_QS;
+
+        tx_queues = nic->tx_queues + nic->xdp_tx_queues;
+        if (tx_queues > MAX_SND_QUEUES_PER_QS)
+                tx_queues = tx_queues - MAX_SND_QUEUES_PER_QS;
 
         /* Set no of Rx/Tx queues in each of the SQsets */
         for (sqs = 0; sqs < nic->sqs_count; sqs++) {
@@ -496,12 +501,99 @@ static int nicvf_init_resources(struct nicvf *nic)
         return 0;
 }
 
+static inline bool nicvf_xdp_rx(struct nicvf *nic, struct bpf_prog *prog,
+