New upstream version 17.11-rc3

[deb_dpdk.git] / drivers / net / af_packet / rte_eth_af_packet.c

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 9a47852..fa84eb9 100644 (file)
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -41,7 +41,7 @@
 #include <rte_ethdev_vdev.h>
 #include <rte_malloc.h>
 #include <rte_kvargs.h>
-#include <rte_vdev.h>
+#include <rte_bus_vdev.h>
 
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
@@ -59,6 +59,7 @@
 #define ETH_AF_PACKET_BLOCKSIZE_ARG    "blocksz"
 #define ETH_AF_PACKET_FRAMESIZE_ARG    "framesz"
 #define ETH_AF_PACKET_FRAMECOUNT_ARG   "framecnt"
+#define ETH_AF_PACKET_QDISC_BYPASS_ARG "qdisc_bypass"
 
 #define DFLT_BLOCK_SIZE                (1 << 12)
 #define DFLT_FRAME_SIZE                (1 << 11)
@@ -75,7 +76,7 @@ struct pkt_rx_queue {
        unsigned int framenum;
 
        struct rte_mempool *mb_pool;
-       uint8_t in_port;
+       uint16_t in_port;
 
        volatile unsigned long rx_pkts;
        volatile unsigned long err_pkts;
@@ -115,6 +116,7 @@ static const char *valid_arguments[] = {
        ETH_AF_PACKET_BLOCKSIZE_ARG,
        ETH_AF_PACKET_FRAMESIZE_ARG,
        ETH_AF_PACKET_FRAMECOUNT_ARG,
+       ETH_AF_PACKET_QDISC_BYPASS_ARG,
        NULL
 };
 
@@ -165,7 +167,7 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                /* check for vlan info */
                if (ppd->tp_status & TP_STATUS_VLAN_VALID) {
                        mbuf->vlan_tci = ppd->tp_vlan_tci;
-                       mbuf->ol_flags |= (PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED);
+                       mbuf->ol_flags |= (PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
                }
 
                /* release incoming frame and advance ring buffer */
@@ -216,7 +218,7 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                mbuf = *bufs++;
 
                /* drop oversized packets */
-               if (rte_pktmbuf_data_len(mbuf) > pkt_q->frame_data_size) {
+               if (mbuf->pkt_len > pkt_q->frame_data_size) {
                        rte_pktmbuf_free(mbuf);
                        continue;
                }
@@ -237,8 +239,17 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                /* copy the tx frame data */
                pbuf = (uint8_t *) ppd + TPACKET2_HDRLEN -
                        sizeof(struct sockaddr_ll);
-               memcpy(pbuf, rte_pktmbuf_mtod(mbuf, void*), rte_pktmbuf_data_len(mbuf));
-               ppd->tp_len = ppd->tp_snaplen = rte_pktmbuf_data_len(mbuf);
+
+               struct rte_mbuf *tmp_mbuf = mbuf;
+               while (tmp_mbuf) {
+                       uint16_t data_len = rte_pktmbuf_data_len(tmp_mbuf);
+                       memcpy(pbuf, rte_pktmbuf_mtod(tmp_mbuf, void*), data_len);
+                       pbuf += data_len;
+                       tmp_mbuf = tmp_mbuf->next;
+               }
+
+               ppd->tp_len = mbuf->pkt_len;
+               ppd->tp_snaplen = mbuf->pkt_len;
 
                /* release incoming frame and advance ring buffer */
                ppd->tp_status = TP_STATUS_SEND_REQUEST;
@@ -320,7 +331,7 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->min_rx_bufsize = 0;
 }
 
-static void
+static int
 eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
 {
        unsigned i, imax;
@@ -353,6 +364,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
        igb_stats->opackets = tx_total;
        igb_stats->oerrors = tx_err_total;
        igb_stats->obytes = tx_bytes_total;
+       return 0;
 }
 
 static void
@@ -550,6 +562,7 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
                        unsigned int blockcnt,
                        unsigned int framesize,
                        unsigned int framecnt,
+                      unsigned int qdisc_bypass,
                        struct pmd_internals **internals,
                        struct rte_eth_dev **eth_dev,
                        struct rte_kvargs *kvlist)
@@ -571,9 +584,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 #if defined(PACKET_FANOUT)
        int fanout_arg;
 #endif
-#if defined(PACKET_QDISC_BYPASS)
-       int bypass;
-#endif
 
        for (k_idx = 0; k_idx < kvlist->count; k_idx++) {
                pair = &kvlist->pairs[k_idx];
@@ -689,9 +699,8 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
                }
 
 #if defined(PACKET_QDISC_BYPASS)
-               bypass = 1;
                rc = setsockopt(qsockfd, SOL_PACKET, PACKET_QDISC_BYPASS,
-                               &bypass, sizeof(bypass));
+                               &qdisc_bypass, sizeof(qdisc_bypass));
                if (rc == -1) {
                        RTE_LOG(ERR, PMD,
                                "%s: could not set PACKET_QDISC_BYPASS "
@@ -699,6 +708,8 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
                                pair->value);
                        goto error;
                }
+#else
+               RTE_SET_USED(qdisc_bypass);
 #endif
 
                rc = setsockopt(qsockfd, SOL_PACKET, PACKET_RX_RING, req, sizeof(*req));
@@ -803,7 +814,6 @@ rte_pmd_init_internals(struct rte_vdev_device *dev,
 
        (*eth_dev)->data = data;
        (*eth_dev)->dev_ops = &ops;
-       (*eth_dev)->data->dev_flags = RTE_ETH_DEV_DETACHABLE;
 
        return 0;
 
@@ -842,6 +852,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
        unsigned int framesize = DFLT_FRAME_SIZE;
        unsigned int framecount = DFLT_FRAME_COUNT;
        unsigned int qpairs = 1;
+       unsigned int qdisc_bypass = 1;
 
        /* do some parameter checking */
        if (*sockfd < 0)
@@ -893,6 +904,16 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
                        }
                        continue;
                }
+               if (strstr(pair->key, ETH_AF_PACKET_QDISC_BYPASS_ARG) != NULL) {
+                       qdisc_bypass = atoi(pair->value);
+                       if (qdisc_bypass > 1) {
+                               RTE_LOG(ERR, PMD,
+                                       "%s: invalid bypass value\n",
+                                       name);
+                               return -1;
+                       }
+                       continue;
+               }
        }
 
        if (framesize > blocksize) {
@@ -918,6 +939,7 @@ rte_eth_from_packet(struct rte_vdev_device *dev,
        if (rte_pmd_init_internals(dev, *sockfd, qpairs,
                                   blocksize, blockcount,
                                   framesize, framecount,
+                                  qdisc_bypass,
                                   &internals, &eth_dev,
                                   kvlist) < 0)
                return -1;
@@ -1012,4 +1034,5 @@ RTE_PMD_REGISTER_PARAM_STRING(net_af_packet,
        "qpairs=<int> "
        "blocksz=<int> "
        "framesz=<int> "
-       "framecnt=<int>");
+       "framecnt=<int> "
+       "qdisc_bypass=<0|1>");