net/nfp: fix Rx interrupt
[dpdk.git] / drivers / net / tap / rte_eth_tap.c
index 50a0724..f8d9cc7 100644 (file)
@@ -38,6 +38,7 @@
 #include <rte_malloc.h>
 #include <rte_vdev.h>
 #include <rte_kvargs.h>
+#include <rte_net.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -127,6 +128,10 @@ tap_trigger_cb(int sig __rte_unused)
        tap_trigger = (tap_trigger + 1) | 0x80000000;
 }
 
+static int
+tap_ioctl(struct pmd_internals *pmd, unsigned long request,
+         struct ifreq *ifr, int set);
+
 /* Tun/Tap allocation routine
  *
  * name is the number of the interface to use, unless NULL to take the host
@@ -229,13 +234,12 @@ tun_alloc(struct pmd_internals *pmd, uint16_t qid)
        }
 
        if (qid == 0) {
-               if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) {
-                       RTE_LOG(ERR, PMD, "ioctl failed (SIOCGIFHWADDR) (%s)\n",
-                               ifr.ifr_name);
-                       goto error;
-               }
+               struct ifreq ifr;
 
-               rte_memcpy(&pmd->eth_addr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
+               if (tap_ioctl(pmd, SIOCGIFHWADDR, &ifr, 0) < 0)
+                       goto error;
+               rte_memcpy(&pmd->eth_addr, ifr.ifr_hwaddr.sa_data,
+                          ETHER_ADDR_LEN);
        }
 
        return fd;
@@ -282,6 +286,8 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                mbuf->data_len = len;
                mbuf->pkt_len = len;
                mbuf->port = rxq->in_port;
+               mbuf->packet_type = rte_net_get_ptype(mbuf, NULL,
+                                                     RTE_PTYPE_ALL_MASK);
 
                /* account for the receive frame */
                bufs[num_rx++] = mbuf;
@@ -345,6 +351,10 @@ tap_ioctl(struct pmd_internals *pmd, unsigned long request,
                else
                        ifr->ifr_flags &= ~req_flags;
                break;
+       case SIOCGIFHWADDR:
+       case SIOCSIFHWADDR:
+       case SIOCSIFMTU:
+               break;
        default:
                RTE_LOG(WARNING, PMD, "%s: ioctl() called with wrong arg\n",
                        pmd->name);
@@ -400,6 +410,40 @@ tap_dev_configure(struct rte_eth_dev *dev __rte_unused)
        return 0;
 }
 
+static uint32_t
+tap_dev_speed_capa(void)
+{
+       uint32_t speed = pmd_link.link_speed;
+       uint32_t capa = 0;
+
+       if (speed >= ETH_SPEED_NUM_10M)
+               capa |= ETH_LINK_SPEED_10M;
+       if (speed >= ETH_SPEED_NUM_100M)
+               capa |= ETH_LINK_SPEED_100M;
+       if (speed >= ETH_SPEED_NUM_1G)
+               capa |= ETH_LINK_SPEED_1G;
+       if (speed >= ETH_SPEED_NUM_5G)
+               capa |= ETH_LINK_SPEED_2_5G;
+       if (speed >= ETH_SPEED_NUM_5G)
+               capa |= ETH_LINK_SPEED_5G;
+       if (speed >= ETH_SPEED_NUM_10G)
+               capa |= ETH_LINK_SPEED_10G;
+       if (speed >= ETH_SPEED_NUM_20G)
+               capa |= ETH_LINK_SPEED_20G;
+       if (speed >= ETH_SPEED_NUM_25G)
+               capa |= ETH_LINK_SPEED_25G;
+       if (speed >= ETH_SPEED_NUM_40G)
+               capa |= ETH_LINK_SPEED_40G;
+       if (speed >= ETH_SPEED_NUM_50G)
+               capa |= ETH_LINK_SPEED_50G;
+       if (speed >= ETH_SPEED_NUM_56G)
+               capa |= ETH_LINK_SPEED_56G;
+       if (speed >= ETH_SPEED_NUM_100G)
+               capa |= ETH_LINK_SPEED_100G;
+
+       return capa;
+}
+
 static void
 tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -412,6 +456,7 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->max_tx_queues = internals->nb_queues;
        dev_info->min_rx_bufsize = 0;
        dev_info->pci_dev = NULL;
+       dev_info->speed_capa = tap_dev_speed_capa();
 }
 
 static void
@@ -547,6 +592,26 @@ tap_allmulti_disable(struct rte_eth_dev *dev)
        tap_ioctl(pmd, SIOCSIFFLAGS, &ifr, 0);
 }
 
+
+static void
+tap_mac_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+{
+       struct pmd_internals *pmd = dev->data->dev_private;
+       struct ifreq ifr;
+
+       if (is_zero_ether_addr(mac_addr)) {
+               RTE_LOG(ERR, PMD, "%s: can't set an empty MAC address\n",
+                       dev->data->name);
+               return;
+       }
+
+       ifr.ifr_hwaddr.sa_family = AF_LOCAL;
+       rte_memcpy(ifr.ifr_hwaddr.sa_data, mac_addr, ETHER_ADDR_LEN);
+       if (tap_ioctl(pmd, SIOCSIFHWADDR, &ifr, 1) < 0)
+               return;
+       rte_memcpy(&pmd->eth_addr, mac_addr, ETHER_ADDR_LEN);
+}
+
 static int
 tap_setup_queue(struct rte_eth_dev *dev,
                struct pmd_internals *internals,
@@ -569,6 +634,15 @@ tap_setup_queue(struct rte_eth_dev *dev,
                                        pmd->name, qid);
                                return -1;
                        }
+                       if (qid == 0) {
+                               struct ifreq ifr;
+
+                               ifr.ifr_mtu = dev->data->mtu;
+                               if (tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1) < 0) {
+                                       close(fd);
+                                       return -1;
+                               }
+                       }
                }
        }
 
@@ -665,6 +739,80 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,
        return 0;
 }
 
+static int
+tap_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+{
+       struct pmd_internals *pmd = dev->data->dev_private;
+       struct ifreq ifr = { .ifr_mtu = mtu };
+       int err = 0;
+
+       err = tap_ioctl(pmd, SIOCSIFMTU, &ifr, 1);
+       if (!err)
+               dev->data->mtu = mtu;
+
+       return err;
+}
+
+static int
+tap_set_mc_addr_list(struct rte_eth_dev *dev __rte_unused,
+                    struct ether_addr *mc_addr_set __rte_unused,
+                    uint32_t nb_mc_addr __rte_unused)
+{
+       /*
+        * Nothing to do actually: the tap has no filtering whatsoever, every
+        * packet is received.
+        */
+       return 0;
+}
+
+static const uint32_t*
+tap_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused)
+{
+       static const uint32_t ptypes[] = {
+               RTE_PTYPE_INNER_L2_ETHER,
+               RTE_PTYPE_INNER_L2_ETHER_VLAN,
+               RTE_PTYPE_INNER_L2_ETHER_QINQ,
+               RTE_PTYPE_INNER_L3_IPV4,
+               RTE_PTYPE_INNER_L3_IPV4_EXT,
+               RTE_PTYPE_INNER_L3_IPV6,
+               RTE_PTYPE_INNER_L3_IPV6_EXT,
+               RTE_PTYPE_INNER_L4_FRAG,
+               RTE_PTYPE_INNER_L4_UDP,
+               RTE_PTYPE_INNER_L4_TCP,
+               RTE_PTYPE_INNER_L4_SCTP,
+               RTE_PTYPE_L2_ETHER,
+               RTE_PTYPE_L2_ETHER_VLAN,
+               RTE_PTYPE_L2_ETHER_QINQ,
+               RTE_PTYPE_L3_IPV4,
+               RTE_PTYPE_L3_IPV4_EXT,
+               RTE_PTYPE_L3_IPV6_EXT,
+               RTE_PTYPE_L3_IPV6,
+               RTE_PTYPE_L4_FRAG,
+               RTE_PTYPE_L4_UDP,
+               RTE_PTYPE_L4_TCP,
+               RTE_PTYPE_L4_SCTP,
+       };
+
+       return ptypes;
+}
+
+static int
+tap_flow_ctrl_get(struct rte_eth_dev *dev __rte_unused,
+                 struct rte_eth_fc_conf *fc_conf)
+{
+       fc_conf->mode = RTE_FC_NONE;
+       return 0;
+}
+
+static int
+tap_flow_ctrl_set(struct rte_eth_dev *dev __rte_unused,
+                 struct rte_eth_fc_conf *fc_conf)
+{
+       if (fc_conf->mode != RTE_FC_NONE)
+               return -ENOTSUP;
+       return 0;
+}
+
 static const struct eth_dev_ops ops = {
        .dev_start              = tap_dev_start,
        .dev_stop               = tap_dev_stop,
@@ -675,6 +823,8 @@ static const struct eth_dev_ops ops = {
        .tx_queue_setup         = tap_tx_queue_setup,
        .rx_queue_release       = tap_rx_queue_release,
        .tx_queue_release       = tap_tx_queue_release,
+       .flow_ctrl_get          = tap_flow_ctrl_get,
+       .flow_ctrl_set          = tap_flow_ctrl_set,
        .link_update            = tap_link_update,
        .dev_set_link_up        = tap_link_set_up,
        .dev_set_link_down      = tap_link_set_down,
@@ -682,8 +832,12 @@ static const struct eth_dev_ops ops = {
        .promiscuous_disable    = tap_promisc_disable,
        .allmulticast_enable    = tap_allmulti_enable,
        .allmulticast_disable   = tap_allmulti_disable,
+       .mac_addr_set           = tap_mac_set,
+       .mtu_set                = tap_mtu_set,
+       .set_mc_addr_list       = tap_set_mc_addr_list,
        .stats_get              = tap_stats_get,
        .stats_reset            = tap_stats_reset,
+       .dev_supported_ptypes_get = tap_dev_supported_ptypes_get,
 };
 
 static int
@@ -732,6 +886,7 @@ eth_dev_tap_create(const char *name, char *tap_name)
        /* Setup some default values */
        data->dev_private = pmd;
        data->port_id = dev->data->port_id;
+       data->mtu = dev->data->mtu;
        data->dev_flags = RTE_ETH_DEV_DETACHABLE;
        data->kdrv = RTE_KDRV_NONE;
        data->drv_name = pmd_tap_drv.driver.name;