/*
- * Copyright (c) 2014 Nicira, Inc.
+ * Copyright (c) 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <config.h>
-#include <stdio.h>
#include <string.h>
#include <signal.h>
#include <stdlib.h>
#include <sched.h>
#include <stdlib.h>
#include <unistd.h>
+#include <sys/stat.h>
#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "dirs.h"
+#include "dp-packet.h"
#include "dpif-netdev.h"
+#include "fatal-signal.h"
#include "list.h"
#include "netdev-dpdk.h"
#include "netdev-provider.h"
#include "netdev-vport.h"
#include "odp-util.h"
#include "ofp-print.h"
-#include "ofpbuf.h"
+#include "ovs-numa.h"
#include "ovs-thread.h"
#include "ovs-rcu.h"
-#include "packet-dpif.h"
#include "packets.h"
#include "shash.h"
#include "sset.h"
#include "unaligned.h"
#include "timeval.h"
#include "unixctl.h"
-#include "vlog.h"
+#include "openvswitch/vlog.h"
+
+#include "rte_config.h"
+#include "rte_mbuf.h"
+#include "rte_virtio_net.h"
VLOG_DEFINE_THIS_MODULE(dpdk);
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
/*
* need to reserve tons of extra space in the mbufs so we can align the
* DMA addresses to 4KB.
+ * The minimum mbuf size is limited to avoid scatter behaviour and drop in
+ * performance for standard Ethernet MTU.
*/
+#define ETHER_HDR_MAX_LEN (ETHER_HDR_LEN + ETHER_CRC_LEN + (2 * VLAN_HEADER_LEN))
+#define MTU_TO_FRAME_LEN(mtu) ((mtu) + ETHER_HDR_LEN + ETHER_CRC_LEN)
+#define MTU_TO_MAX_FRAME_LEN(mtu) ((mtu) + ETHER_HDR_MAX_LEN)
+#define FRAME_LEN_TO_MTU(frame_len) ((frame_len)- ETHER_HDR_LEN - ETHER_CRC_LEN)
+#define MBUF_SIZE(mtu) ( MTU_TO_MAX_FRAME_LEN(mtu) \
+ + sizeof(struct dp_packet) \
+ + RTE_PKTMBUF_HEADROOM)
+#define NETDEV_DPDK_MBUF_ALIGN 1024
+
+/* Max and min number of packets in the mempool. OVS tries to allocate a
+ * mempool with MAX_NB_MBUF: if this fails (because the system doesn't have
+ * enough hugepages) we keep halving the number until the allocation succeeds
+ * or we reach MIN_NB_MBUF */
+
+#define MAX_NB_MBUF (4096 * 64)
+#define MIN_NB_MBUF (4096 * 4)
+#define MP_CACHE_SZ RTE_MEMPOOL_CACHE_MAX_SIZE
+
+/* MAX_NB_MBUF can be divided by 2 many times, until MIN_NB_MBUF */
+BUILD_ASSERT_DECL(MAX_NB_MBUF % ROUND_DOWN_POW2(MAX_NB_MBUF/MIN_NB_MBUF) == 0);
+
+/* The smallest possible NB_MBUF that we're going to try should be a multiple
+ * of MP_CACHE_SZ. This is advised by DPDK documentation. */
+BUILD_ASSERT_DECL((MAX_NB_MBUF / ROUND_DOWN_POW2(MAX_NB_MBUF/MIN_NB_MBUF))
+ % MP_CACHE_SZ == 0);
-#define MTU_TO_MAX_LEN(mtu) ((mtu) + ETHER_HDR_LEN + ETHER_CRC_LEN)
-#define MBUF_SIZE(mtu) (MTU_TO_MAX_LEN(mtu) + (512) + \
- sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
-
-/* TODO: mempool size should be based on system resources. */
-#define NB_MBUF (4096 * 64)
-#define MP_CACHE_SZ (256 * 2)
#define SOCKET0 0
-#define NON_PMD_THREAD_TX_QUEUE 0
-
#define NIC_PORT_RX_Q_SIZE 2048 /* Size of Physical NIC RX Queue, Max (n+32<=4096)*/
#define NIC_PORT_TX_Q_SIZE 2048 /* Size of Physical NIC TX Queue, Max (n+32<=4096)*/
-/* TODO: Needs per NIC value for these constants. */
-#define RX_PTHRESH 32 /* Default values of RX prefetch threshold reg. */
-#define RX_HTHRESH 32 /* Default values of RX host threshold reg. */
-#define RX_WTHRESH 16 /* Default values of RX write-back threshold reg. */
+#define OVS_VHOST_MAX_QUEUE_NUM 1024 /* Maximum number of vHost TX queues. */
+
+static char *cuse_dev_name = NULL; /* Character device cuse_dev_name. */
+static char *vhost_sock_dir = NULL; /* Location of vhost-user sockets */
-#define TX_PTHRESH 36 /* Default values of TX prefetch threshold reg. */
-#define TX_HTHRESH 0 /* Default values of TX host threshold reg. */
-#define TX_WTHRESH 0 /* Default values of TX write-back threshold reg. */
+/*
+ * Maximum amount of time in micro seconds to try and enqueue to vhost.
+ */
+#define VHOST_ENQ_RETRY_USECS 100
static const struct rte_eth_conf port_conf = {
.rxmode = {
.rx_adv_conf = {
.rss_conf = {
.rss_key = NULL,
- .rss_hf = ETH_RSS_IPV4_TCP | ETH_RSS_IPV4 | ETH_RSS_IPV6,
+ .rss_hf = ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP,
},
},
.txmode = {
},
};
-static const struct rte_eth_rxconf rx_conf = {
- .rx_thresh = {
- .pthresh = RX_PTHRESH,
- .hthresh = RX_HTHRESH,
- .wthresh = RX_WTHRESH,
- },
-};
+enum { MAX_TX_QUEUE_LEN = 384 };
+enum { DPDK_RING_SIZE = 256 };
+BUILD_ASSERT_DECL(IS_POW2(DPDK_RING_SIZE));
+enum { DRAIN_TSC = 200000ULL };
-static const struct rte_eth_txconf tx_conf = {
- .tx_thresh = {
- .pthresh = TX_PTHRESH,
- .hthresh = TX_HTHRESH,
- .wthresh = TX_WTHRESH,
- },
- .tx_free_thresh = 0,
- .tx_rs_thresh = 0,
- .txq_flags = ETH_TXQ_FLAGS_NOMULTSEGS|ETH_TXQ_FLAGS_NOOFFLOADS,
+enum dpdk_dev_type {
+ DPDK_DEV_ETH = 0,
+ DPDK_DEV_VHOST = 1,
};
-enum { MAX_RX_QUEUE_LEN = 64 };
-enum { MAX_TX_QUEUE_LEN = 64 };
-enum { DRAIN_TSC = 200000ULL };
-
static int rte_eal_init_ret = ENODEV;
static struct ovs_mutex dpdk_mutex = OVS_MUTEX_INITIALIZER;
/* Contains all 'struct dpdk_dev's. */
-static struct list dpdk_list OVS_GUARDED_BY(dpdk_mutex)
- = LIST_INITIALIZER(&dpdk_list);
+static struct ovs_list dpdk_list OVS_GUARDED_BY(dpdk_mutex)
+ = OVS_LIST_INITIALIZER(&dpdk_list);
+
+static struct ovs_list dpdk_mp_list OVS_GUARDED_BY(dpdk_mutex)
+ = OVS_LIST_INITIALIZER(&dpdk_mp_list);
-static struct list dpdk_mp_list OVS_GUARDED_BY(dpdk_mutex)
- = LIST_INITIALIZER(&dpdk_mp_list);
+/* This mutex must be used by non pmd threads when allocating or freeing
+ * mbufs through mempools. Since dpdk_queue_pkts() and dpdk_queue_flush() may
+ * use mempools, a non pmd thread should hold this mutex while calling them */
+static struct ovs_mutex nonpmd_mempool_mutex = OVS_MUTEX_INITIALIZER;
struct dpdk_mp {
struct rte_mempool *mp;
int mtu;
int socket_id;
int refcount;
- struct list list_node OVS_GUARDED_BY(dpdk_mutex);
+ struct ovs_list list_node OVS_GUARDED_BY(dpdk_mutex);
};
+/* There should be one 'struct dpdk_tx_queue' created for
+ * each cpu core. */
struct dpdk_tx_queue {
- rte_spinlock_t tx_lock;
+ bool flush_tx; /* Set to true to flush queue everytime */
+ /* pkts are queued. */
int count;
+ rte_spinlock_t tx_lock; /* Protects the members and the NIC queue
+ * from concurrent access. It is used only
+ * if the queue is shared among different
+ * pmd threads (see 'txq_needs_locking'). */
+ int map; /* Mapping of configured vhost-user queues
+ * to enabled by guest. */
uint64_t tsc;
struct rte_mbuf *burst_pkts[MAX_TX_QUEUE_LEN];
};
+/* dpdk has no way to remove dpdk ring ethernet devices
+ so we have to keep them around once they've been created
+*/
+
+static struct ovs_list dpdk_ring_list OVS_GUARDED_BY(dpdk_mutex)
+ = OVS_LIST_INITIALIZER(&dpdk_ring_list);
+
+struct dpdk_ring {
+ /* For the client rings */
+ struct rte_ring *cring_tx;
+ struct rte_ring *cring_rx;
+ unsigned int user_port_id; /* User given port no, parsed from port name */
+ int eth_port_id; /* ethernet device port id */
+ struct ovs_list list_node OVS_GUARDED_BY(dpdk_mutex);
+};
+
struct netdev_dpdk {
struct netdev up;
int port_id;
int max_packet_len;
+ enum dpdk_dev_type type;
- struct dpdk_tx_queue tx_q[NR_QUEUE];
+ struct dpdk_tx_queue *tx_q;
struct ovs_mutex mutex OVS_ACQ_AFTER(dpdk_mutex);
int mtu;
int socket_id;
int buf_size;
- struct netdev_stats stats_offset;
struct netdev_stats stats;
+ /* Protects stats */
+ rte_spinlock_t stats_lock;
- uint8_t hwaddr[ETH_ADDR_LEN];
+ struct eth_addr hwaddr;
enum netdev_flags flags;
struct rte_eth_link link;
int link_reset_cnt;
+ /* The user might request more txqs than the NIC has. We remap those
+ * ('up.n_txq') on these ('real_n_txq').
+ * If the numbers match, 'txq_needs_locking' is false, otherwise it is
+ * true and we will take a spinlock on transmission */
+ int real_n_txq;
+ int real_n_rxq;
+ bool txq_needs_locking;
+
+ /* virtio-net structure for vhost device */
+ OVSRCU_TYPE(struct virtio_net *) virtio_dev;
+
+ /* Identifier used to distinguish vhost devices from each other */
+ char vhost_id[PATH_MAX];
+
/* In dpdk_list. */
- struct list list_node OVS_GUARDED_BY(dpdk_mutex);
+ struct ovs_list list_node OVS_GUARDED_BY(dpdk_mutex);
};
struct netdev_rxq_dpdk {
int port_id;
};
+static bool dpdk_thread_is_pmd(void);
+
static int netdev_dpdk_construct(struct netdev *);
+struct virtio_net * netdev_dpdk_get_virtio(const struct netdev_dpdk *dev);
+
static bool
is_dpdk_class(const struct netdev_class *class)
{
return class->construct == netdev_dpdk_construct;
}
-/* TODO: use dpdk malloc for entire OVS. infact huge page shld be used
- * for all other sengments data, bss and text. */
+/* DPDK NIC drivers allocate RX buffers at a particular granularity, typically
+ * aligned at 1k or less. If a declared mbuf size is not a multiple of this
+ * value, insufficient buffers are allocated to accomodate the packet in its
+ * entirety. Furthermore, certain drivers need to ensure that there is also
+ * sufficient space in the Rx buffer to accommodate two VLAN tags (for QinQ
+ * frames). If the RX buffer is too small, then the driver enables scatter RX
+ * behaviour, which reduces performance. To prevent this, use a buffer size that
+ * is closest to 'mtu', but which satisfies the aforementioned criteria.
+ */
+static uint32_t
+dpdk_buf_size(int mtu)
+{
+ return ROUND_UP((MTU_TO_MAX_FRAME_LEN(mtu) + RTE_PKTMBUF_HEADROOM),
+ NETDEV_DPDK_MBUF_ALIGN);
+}
+
+/* XXX: use dpdk malloc for entire OVS. in fact huge page should be used
+ * for all other segments data, bss and text. */
static void *
dpdk_rte_mzalloc(size_t sz)
return ptr;
}
+/* XXX this function should be called only by pmd threads (or by non pmd
+ * threads holding the nonpmd_mempool_mutex) */
void
-free_dpdk_buf(struct dpif_packet *p)
-{
- struct ofpbuf *buf = &p->ofpbuf;
- struct rte_mbuf *pkt = (struct rte_mbuf *) buf->dpdk_buf;
-
- rte_mempool_put(pkt->pool, pkt);
-}
-
-static void
-__rte_pktmbuf_init(struct rte_mempool *mp,
- void *opaque_arg OVS_UNUSED,
- void *_m,
- unsigned i OVS_UNUSED)
+free_dpdk_buf(struct dp_packet *p)
{
- struct rte_mbuf *m = _m;
- uint32_t buf_len = mp->elt_size - sizeof(struct dpif_packet);
-
- RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct dpif_packet));
-
- memset(m, 0, mp->elt_size);
-
- /* start of buffer is just after mbuf structure */
- m->buf_addr = (char *)m + sizeof(struct dpif_packet);
- m->buf_physaddr = rte_mempool_virt2phy(mp, m) +
- sizeof(struct dpif_packet);
- m->buf_len = (uint16_t)buf_len;
+ struct rte_mbuf *pkt = (struct rte_mbuf *) p;
- /* keep some headroom between start of buffer and data */
- m->pkt.data = (char*) m->buf_addr + RTE_MIN(RTE_PKTMBUF_HEADROOM, m->buf_len);
-
- /* init some constant fields */
- m->type = RTE_MBUF_PKT;
- m->pool = mp;
- m->pkt.nb_segs = 1;
- m->pkt.in_port = 0xff;
+ rte_pktmbuf_free_seg(pkt);
}
static void
{
struct rte_mbuf *m = _m;
- __rte_pktmbuf_init(mp, opaque_arg, _m, i);
+ rte_pktmbuf_init(mp, opaque_arg, _m, i);
- ofpbuf_init_dpdk((struct ofpbuf *) m, m->buf_len);
+ dp_packet_init_dpdk((struct dp_packet *) m, m->buf_len);
}
static struct dpdk_mp *
{
struct dpdk_mp *dmp = NULL;
char mp_name[RTE_MEMPOOL_NAMESIZE];
+ unsigned mp_size;
+ struct rte_pktmbuf_pool_private mbp_priv;
LIST_FOR_EACH (dmp, list_node, &dpdk_mp_list) {
if (dmp->socket_id == socket_id && dmp->mtu == mtu) {
dmp->socket_id = socket_id;
dmp->mtu = mtu;
dmp->refcount = 1;
+ mbp_priv.mbuf_data_room_size = MBUF_SIZE(mtu) - sizeof(struct dp_packet);
+ mbp_priv.mbuf_priv_size = sizeof (struct dp_packet) - sizeof (struct rte_mbuf);
+
+ mp_size = MAX_NB_MBUF;
+ do {
+ if (snprintf(mp_name, RTE_MEMPOOL_NAMESIZE, "ovs_mp_%d_%d_%u",
+ dmp->mtu, dmp->socket_id, mp_size) < 0) {
+ return NULL;
+ }
- snprintf(mp_name, RTE_MEMPOOL_NAMESIZE, "ovs_mp_%d", dmp->mtu);
- dmp->mp = rte_mempool_create(mp_name, NB_MBUF, MBUF_SIZE(mtu),
- MP_CACHE_SZ,
- sizeof(struct rte_pktmbuf_pool_private),
- rte_pktmbuf_pool_init, NULL,
- ovs_rte_pktmbuf_init, NULL,
- socket_id, 0);
+ dmp->mp = rte_mempool_create(mp_name, mp_size, MBUF_SIZE(mtu),
+ MP_CACHE_SZ,
+ sizeof(struct rte_pktmbuf_pool_private),
+ rte_pktmbuf_pool_init, &mbp_priv,
+ ovs_rte_pktmbuf_init, NULL,
+ socket_id, 0);
+ } while (!dmp->mp && rte_errno == ENOMEM && (mp_size /= 2) >= MIN_NB_MBUF);
if (dmp->mp == NULL) {
return NULL;
+ } else {
+ VLOG_DBG("Allocated \"%s\" mempool with %u mbufs", mp_name, mp_size );
}
list_push_back(&dpdk_mp_list, &dmp->list_node);
return NULL;
}
+static int
+dpdk_eth_dev_queue_setup(struct netdev_dpdk *dev, int n_rxq, int n_txq)
+{
+ int diag = 0;
+ int i;
+
+ /* A device may report more queues than it makes available (this has
+ * been observed for Intel xl710, which reserves some of them for
+ * SRIOV): rte_eth_*_queue_setup will fail if a queue is not
+ * available. When this happens we can retry the configuration
+ * and request less queues */
+ while (n_rxq && n_txq) {
+ if (diag) {
+ VLOG_INFO("Retrying setup with (rxq:%d txq:%d)", n_rxq, n_txq);
+ }
+
+ diag = rte_eth_dev_configure(dev->port_id, n_rxq, n_txq, &port_conf);
+ if (diag) {
+ break;
+ }
+
+ for (i = 0; i < n_txq; i++) {
+ diag = rte_eth_tx_queue_setup(dev->port_id, i, NIC_PORT_TX_Q_SIZE,
+ dev->socket_id, NULL);
+ if (diag) {
+ VLOG_INFO("Interface %s txq(%d) setup error: %s",
+ dev->up.name, i, rte_strerror(-diag));
+ break;
+ }
+ }
+
+ if (i != n_txq) {
+ /* Retry with less tx queues */
+ n_txq = i;
+ continue;
+ }
+
+ for (i = 0; i < n_rxq; i++) {
+ diag = rte_eth_rx_queue_setup(dev->port_id, i, NIC_PORT_RX_Q_SIZE,
+ dev->socket_id, NULL,
+ dev->dpdk_mp->mp);
+ if (diag) {
+ VLOG_INFO("Interface %s rxq(%d) setup error: %s",
+ dev->up.name, i, rte_strerror(-diag));
+ break;
+ }
+ }
+
+ if (i != n_rxq) {
+ /* Retry with less rx queues */
+ n_rxq = i;
+ continue;
+ }
+
+ dev->up.n_rxq = n_rxq;
+ dev->real_n_txq = n_txq;
+
+ return 0;
+ }
+
+ return diag;
+}
+
+
static int
dpdk_eth_dev_init(struct netdev_dpdk *dev) OVS_REQUIRES(dpdk_mutex)
{
struct rte_pktmbuf_pool_private *mbp_priv;
+ struct rte_eth_dev_info info;
struct ether_addr eth_addr;
int diag;
- int i;
+ int n_rxq, n_txq;
if (dev->port_id < 0 || dev->port_id >= rte_eth_dev_count()) {
- return -ENODEV;
+ return ENODEV;
}
- diag = rte_eth_dev_configure(dev->port_id, NR_QUEUE, NR_QUEUE, &port_conf);
- if (diag) {
- VLOG_ERR("eth dev config error %d",diag);
- return diag;
- }
+ rte_eth_dev_info_get(dev->port_id, &info);
- for (i = 0; i < NR_QUEUE; i++) {
- diag = rte_eth_tx_queue_setup(dev->port_id, i, NIC_PORT_TX_Q_SIZE,
- dev->socket_id, &tx_conf);
- if (diag) {
- VLOG_ERR("eth dev tx queue setup error %d",diag);
- return diag;
- }
- }
+ n_rxq = MIN(info.max_rx_queues, dev->up.n_rxq);
+ n_txq = MIN(info.max_tx_queues, dev->up.n_txq);
- for (i = 0; i < NR_QUEUE; i++) {
- diag = rte_eth_rx_queue_setup(dev->port_id, i, NIC_PORT_RX_Q_SIZE,
- dev->socket_id,
- &rx_conf, dev->dpdk_mp->mp);
- if (diag) {
- VLOG_ERR("eth dev rx queue setup error %d",diag);
- return diag;
- }
+ diag = dpdk_eth_dev_queue_setup(dev, n_rxq, n_txq);
+ if (diag) {
+ VLOG_ERR("Interface %s(rxq:%d txq:%d) configure error: %s",
+ dev->up.name, n_rxq, n_txq, rte_strerror(-diag));
+ return -diag;
}
diag = rte_eth_dev_start(dev->port_id);
if (diag) {
- VLOG_ERR("eth dev start error %d",diag);
- return diag;
+ VLOG_ERR("Interface %s start error: %s", dev->up.name,
+ rte_strerror(-diag));
+ return -diag;
}
rte_eth_promiscuous_enable(dev->port_id);
memset(ð_addr, 0x0, sizeof(eth_addr));
rte_eth_macaddr_get(dev->port_id, ð_addr);
VLOG_INFO_RL(&rl, "Port %d: "ETH_ADDR_FMT"",
- dev->port_id, ETH_ADDR_ARGS(eth_addr.addr_bytes));
+ dev->port_id, ETH_ADDR_BYTES_ARGS(eth_addr.addr_bytes));
- memcpy(dev->hwaddr, eth_addr.addr_bytes, ETH_ADDR_LEN);
+ memcpy(dev->hwaddr.ea, eth_addr.addr_bytes, ETH_ADDR_LEN);
rte_eth_link_get_nowait(dev->port_id, &dev->link);
mbp_priv = rte_mempool_get_priv(dev->dpdk_mp->mp);
return &netdev->up;
}
+static void
+netdev_dpdk_alloc_txq(struct netdev_dpdk *netdev, unsigned int n_txqs)
+{
+ unsigned i;
+
+ netdev->tx_q = dpdk_rte_mzalloc(n_txqs * sizeof *netdev->tx_q);
+ for (i = 0; i < n_txqs; i++) {
+ int numa_id = ovs_numa_get_numa_id(i);
+
+ if (!netdev->txq_needs_locking) {
+ /* Each index is considered as a cpu core id, since there should
+ * be one tx queue for each cpu core. If the corresponding core
+ * is not on the same numa node as 'netdev', flags the
+ * 'flush_tx'. */
+ netdev->tx_q[i].flush_tx = netdev->socket_id == numa_id;
+ } else {
+ /* Queues are shared among CPUs. Always flush */
+ netdev->tx_q[i].flush_tx = true;
+ }
+
+ /* Initialize map for vhost devices. */
+ netdev->tx_q[i].map = -1;
+ rte_spinlock_init(&netdev->tx_q[i].tx_lock);
+ }
+}
+
static int
-netdev_dpdk_construct(struct netdev *netdev_)
+netdev_dpdk_init(struct netdev *netdev_, unsigned int port_no,
+ enum dpdk_dev_type type)
+ OVS_REQUIRES(dpdk_mutex)
{
struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
- unsigned int port_no;
- char *cport;
- int err;
- int i;
+ int sid;
+ int err = 0;
+ uint32_t buf_size;
- if (rte_eal_init_ret) {
- return rte_eal_init_ret;
+ ovs_mutex_init(&netdev->mutex);
+ ovs_mutex_lock(&netdev->mutex);
+
+ rte_spinlock_init(&netdev->stats_lock);
+
+ /* If the 'sid' is negative, it means that the kernel fails
+ * to obtain the pci numa info. In that situation, always
+ * use 'SOCKET0'. */
+ if (type == DPDK_DEV_ETH) {
+ sid = rte_eth_dev_socket_id(port_no);
+ } else {
+ sid = rte_lcore_to_socket_id(rte_get_master_lcore());
}
- ovs_mutex_lock(&dpdk_mutex);
- cport = netdev_->name + 4; /* Names always start with "dpdk" */
+ netdev->socket_id = sid < 0 ? SOCKET0 : sid;
+ netdev->port_id = port_no;
+ netdev->type = type;
+ netdev->flags = 0;
+ netdev->mtu = ETHER_MTU;
+ netdev->max_packet_len = MTU_TO_FRAME_LEN(netdev->mtu);
- if (strncmp(netdev_->name, "dpdk", 4)) {
- err = ENODEV;
- goto unlock_dpdk;
+ buf_size = dpdk_buf_size(netdev->mtu);
+ netdev->dpdk_mp = dpdk_mp_get(netdev->socket_id, FRAME_LEN_TO_MTU(buf_size));
+ if (!netdev->dpdk_mp) {
+ err = ENOMEM;
+ goto unlock;
+ }
+
+ netdev_->n_txq = NR_QUEUE;
+ netdev_->n_rxq = NR_QUEUE;
+ netdev_->requested_n_rxq = NR_QUEUE;
+ netdev->real_n_txq = NR_QUEUE;
+
+ if (type == DPDK_DEV_ETH) {
+ netdev_dpdk_alloc_txq(netdev, NR_QUEUE);
+ err = dpdk_eth_dev_init(netdev);
+ if (err) {
+ goto unlock;
+ }
+ } else {
+ netdev_dpdk_alloc_txq(netdev, OVS_VHOST_MAX_QUEUE_NUM);
}
- port_no = strtol(cport, 0, 0); /* string must be null terminated */
+ list_push_back(&dpdk_list, &netdev->list_node);
- for (i = 0; i < NR_QUEUE; i++) {
- rte_spinlock_init(&netdev->tx_q[i].tx_lock);
+unlock:
+ if (err) {
+ rte_free(netdev->tx_q);
}
+ ovs_mutex_unlock(&netdev->mutex);
+ return err;
+}
- ovs_mutex_init(&netdev->mutex);
+/* dev_name must be the prefix followed by a positive decimal number.
+ * (no leading + or - signs are allowed) */
+static int
+dpdk_dev_parse_name(const char dev_name[], const char prefix[],
+ unsigned int *port_no)
+{
+ const char *cport;
- ovs_mutex_lock(&netdev->mutex);
- netdev->flags = 0;
+ if (strncmp(dev_name, prefix, strlen(prefix))) {
+ return ENODEV;
+ }
- netdev->mtu = ETHER_MTU;
- netdev->max_packet_len = MTU_TO_MAX_LEN(netdev->mtu);
+ cport = dev_name + strlen(prefix);
- /* TODO: need to discover device node at run time. */
- netdev->socket_id = SOCKET0;
- netdev->port_id = port_no;
+ if (str_to_uint(cport, 10, port_no)) {
+ return 0;
+ } else {
+ return ENODEV;
+ }
+}
- netdev->dpdk_mp = dpdk_mp_get(netdev->socket_id, netdev->mtu);
- if (!netdev->dpdk_mp) {
- err = ENOMEM;
- goto unlock_dev;
+static int
+vhost_construct_helper(struct netdev *netdev_) OVS_REQUIRES(dpdk_mutex)
+{
+ if (rte_eal_init_ret) {
+ return rte_eal_init_ret;
}
- err = dpdk_eth_dev_init(netdev);
+ return netdev_dpdk_init(netdev_, -1, DPDK_DEV_VHOST);
+}
+
+static int
+netdev_dpdk_vhost_cuse_construct(struct netdev *netdev_)
+{
+ struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
+ int err;
+
+ ovs_mutex_lock(&dpdk_mutex);
+ strncpy(netdev->vhost_id, netdev->up.name, sizeof(netdev->vhost_id));
+ err = vhost_construct_helper(netdev_);
+ ovs_mutex_unlock(&dpdk_mutex);
+ return err;
+}
+
+static int
+netdev_dpdk_vhost_user_construct(struct netdev *netdev_)
+{
+ struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
+ const char *name = netdev_->name;
+ int err;
+
+ /* 'name' is appended to 'vhost_sock_dir' and used to create a socket in
+ * the file system. '/' or '\' would traverse directories, so they're not
+ * acceptable in 'name'. */
+ if (strchr(name, '/') || strchr(name, '\\')) {
+ VLOG_ERR("\"%s\" is not a valid name for a vhost-user port. "
+ "A valid name must not include '/' or '\\'",
+ name);
+ return EINVAL;
+ }
+
+ ovs_mutex_lock(&dpdk_mutex);
+ /* Take the name of the vhost-user port and append it to the location where
+ * the socket is to be created, then register the socket.
+ */
+ snprintf(netdev->vhost_id, sizeof(netdev->vhost_id), "%s/%s",
+ vhost_sock_dir, name);
+
+ err = rte_vhost_driver_register(netdev->vhost_id);
if (err) {
- goto unlock_dev;
+ VLOG_ERR("vhost-user socket device setup failure for socket %s\n",
+ netdev->vhost_id);
+ } else {
+ fatal_signal_add_file_to_unlink(netdev->vhost_id);
+ VLOG_INFO("Socket %s created for vhost-user port %s\n",
+ netdev->vhost_id, name);
+ err = vhost_construct_helper(netdev_);
}
- netdev_->n_rxq = NR_QUEUE;
- list_push_back(&dpdk_list, &netdev->list_node);
+ ovs_mutex_unlock(&dpdk_mutex);
+ return err;
+}
-unlock_dev:
- ovs_mutex_unlock(&netdev->mutex);
-unlock_dpdk:
+static int
+netdev_dpdk_construct(struct netdev *netdev)
+{
+ unsigned int port_no;
+ int err;
+
+ if (rte_eal_init_ret) {
+ return rte_eal_init_ret;
+ }
+
+ /* Names always start with "dpdk" */
+ err = dpdk_dev_parse_name(netdev->name, "dpdk", &port_no);
+ if (err) {
+ return err;
+ }
+
+ ovs_mutex_lock(&dpdk_mutex);
+ err = netdev_dpdk_init(netdev, port_no, DPDK_DEV_ETH);
ovs_mutex_unlock(&dpdk_mutex);
return err;
}
ovs_mutex_unlock(&dev->mutex);
ovs_mutex_lock(&dpdk_mutex);
+ rte_free(dev->tx_q);
list_remove(&dev->list_node);
dpdk_mp_put(dev->dpdk_mp);
ovs_mutex_unlock(&dpdk_mutex);
+}
+
+static void
+netdev_dpdk_vhost_destruct(struct netdev *netdev_)
+{
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev_);
- ovs_mutex_destroy(&dev->mutex);
+ /* Can't remove a port while a guest is attached to it. */
+ if (netdev_dpdk_get_virtio(dev) != NULL) {
+ VLOG_ERR("Can not remove port, vhost device still attached");
+ return;
+ }
+
+ if (rte_vhost_driver_unregister(dev->vhost_id)) {
+ VLOG_ERR("Unable to remove vhost-user socket %s", dev->vhost_id);
+ } else {
+ fatal_signal_remove_file_to_unlink(dev->vhost_id);
+ }
+
+ ovs_mutex_lock(&dpdk_mutex);
+ list_remove(&dev->list_node);
+ dpdk_mp_put(dev->dpdk_mp);
+ ovs_mutex_unlock(&dpdk_mutex);
}
static void
}
static int
-netdev_dpdk_get_config(const struct netdev *netdev_, struct smap *args)
+netdev_dpdk_get_config(const struct netdev *netdev, struct smap *args)
{
- struct netdev_dpdk *dev = netdev_dpdk_cast(netdev_);
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
ovs_mutex_lock(&dev->mutex);
- /* TODO: Allow to configure number of queues. */
- smap_add_format(args, "configured_rx_queues", "%u", netdev_->n_rxq);
- smap_add_format(args, "configured_tx_queues", "%u", netdev_->n_rxq);
+ smap_add_format(args, "requested_rx_queues", "%d", netdev->requested_n_rxq);
+ smap_add_format(args, "configured_rx_queues", "%d", netdev->n_rxq);
+ smap_add_format(args, "requested_tx_queues", "%d", netdev->n_txq);
+ smap_add_format(args, "configured_tx_queues", "%d", dev->real_n_txq);
+ ovs_mutex_unlock(&dev->mutex);
+
+ return 0;
+}
+
+static int
+netdev_dpdk_set_config(struct netdev *netdev, const struct smap *args)
+{
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
+
+ ovs_mutex_lock(&dev->mutex);
+ netdev->requested_n_rxq = MAX(smap_get_int(args, "n_rxq",
+ netdev->requested_n_rxq), 1);
+ netdev_change_seq_changed(netdev);
ovs_mutex_unlock(&dev->mutex);
return 0;
}
+static int
+netdev_dpdk_get_numa_id(const struct netdev *netdev_)
+{
+ struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
+
+ return netdev->socket_id;
+}
+
+/* Sets the number of tx queues and rx queues for the dpdk interface.
+ * If the configuration fails, do not try restoring its old configuration
+ * and just returns the error. */
+static int
+netdev_dpdk_set_multiq(struct netdev *netdev_, unsigned int n_txq,
+ unsigned int n_rxq)
+{
+ struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
+ int err = 0;
+ int old_rxq, old_txq;
+
+ if (netdev->up.n_txq == n_txq && netdev->up.n_rxq == n_rxq) {
+ return err;
+ }
+
+ ovs_mutex_lock(&dpdk_mutex);
+ ovs_mutex_lock(&netdev->mutex);
+
+ rte_eth_dev_stop(netdev->port_id);
+
+ old_txq = netdev->up.n_txq;
+ old_rxq = netdev->up.n_rxq;
+ netdev->up.n_txq = n_txq;
+ netdev->up.n_rxq = n_rxq;
+
+ rte_free(netdev->tx_q);
+ err = dpdk_eth_dev_init(netdev);
+ netdev_dpdk_alloc_txq(netdev, netdev->real_n_txq);
+ if (err) {
+ /* If there has been an error, it means that the requested queues
+ * have not been created. Restore the old numbers. */
+ netdev->up.n_txq = old_txq;
+ netdev->up.n_rxq = old_rxq;
+ }
+
+ netdev->txq_needs_locking = netdev->real_n_txq != netdev->up.n_txq;
+
+ ovs_mutex_unlock(&netdev->mutex);
+ ovs_mutex_unlock(&dpdk_mutex);
+
+ return err;
+}
+
+static int
+netdev_dpdk_vhost_cuse_set_multiq(struct netdev *netdev_, unsigned int n_txq,
+ unsigned int n_rxq)
+{
+ struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
+ int err = 0;
+
+ if (netdev->up.n_txq == n_txq && netdev->up.n_rxq == n_rxq) {
+ return err;
+ }
+
+ ovs_mutex_lock(&dpdk_mutex);
+ ovs_mutex_lock(&netdev->mutex);
+
+ netdev->up.n_txq = n_txq;
+ netdev->real_n_txq = 1;
+ netdev->up.n_rxq = 1;
+ netdev->txq_needs_locking = netdev->real_n_txq != netdev->up.n_txq;
+
+ ovs_mutex_unlock(&netdev->mutex);
+ ovs_mutex_unlock(&dpdk_mutex);
+
+ return err;
+}
+
+static int
+netdev_dpdk_vhost_set_multiq(struct netdev *netdev_, unsigned int n_txq,
+ unsigned int n_rxq)
+{
+ struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
+ int err = 0;
+
+ if (netdev->up.n_txq == n_txq && netdev->up.n_rxq == n_rxq) {
+ return err;
+ }
+
+ ovs_mutex_lock(&dpdk_mutex);
+ ovs_mutex_lock(&netdev->mutex);
+
+ netdev->up.n_txq = n_txq;
+ netdev->up.n_rxq = n_rxq;
+
+ ovs_mutex_unlock(&netdev->mutex);
+ ovs_mutex_unlock(&dpdk_mutex);
+
+ return err;
+}
+
static struct netdev_rxq *
netdev_dpdk_rxq_alloc(void)
{
dpdk_queue_flush__(struct netdev_dpdk *dev, int qid)
{
struct dpdk_tx_queue *txq = &dev->tx_q[qid];
- uint32_t nb_tx;
+ uint32_t nb_tx = 0;
+
+ while (nb_tx != txq->count) {
+ uint32_t ret;
+
+ ret = rte_eth_tx_burst(dev->port_id, qid, txq->burst_pkts + nb_tx,
+ txq->count - nb_tx);
+ if (!ret) {
+ break;
+ }
+
+ nb_tx += ret;
+ }
- nb_tx = rte_eth_tx_burst(dev->port_id, qid, txq->burst_pkts, txq->count);
if (OVS_UNLIKELY(nb_tx != txq->count)) {
- /* free buffers if we couldn't transmit packets */
- rte_mempool_put_bulk(dev->dpdk_mp->mp,
- (void **) &txq->burst_pkts[nb_tx],
- (txq->count - nb_tx));
+ /* free buffers, which we couldn't transmit, one at a time (each
+ * packet could come from a different mempool) */
+ int i;
+
+ for (i = nb_tx; i < txq->count; i++) {
+ rte_pktmbuf_free_seg(txq->burst_pkts[i]);
+ }
+ rte_spinlock_lock(&dev->stats_lock);
+ dev->stats.tx_dropped += txq->count-nb_tx;
+ rte_spinlock_unlock(&dev->stats_lock);
}
+
txq->count = 0;
txq->tsc = rte_get_timer_cycles();
}
if (txq->count == 0) {
return;
}
- rte_spinlock_lock(&txq->tx_lock);
dpdk_queue_flush__(dev, qid);
- rte_spinlock_unlock(&txq->tx_lock);
+}
+
+static bool
+is_vhost_running(struct virtio_net *dev)
+{
+ return (dev != NULL && (dev->flags & VIRTIO_DEV_RUNNING));
+}
+
+static inline void
+netdev_dpdk_vhost_update_rx_counters(struct netdev_stats *stats,
+ struct dp_packet **packets, int count)
+{
+ int i;
+ struct dp_packet *packet;
+
+ stats->rx_packets += count;
+ for (i = 0; i < count; i++) {
+ packet = packets[i];
+
+ if (OVS_UNLIKELY(dp_packet_size(packet) < ETH_HEADER_LEN)) {
+ /* This only protects the following multicast counting from
+ * too short packets, but it does not stop the packet from
+ * further processing. */
+ stats->rx_errors++;
+ stats->rx_length_errors++;
+ continue;
+ }
+
+ struct eth_header *eh = (struct eth_header *) dp_packet_data(packet);
+ if (OVS_UNLIKELY(eth_addr_is_multicast(eh->eth_dst))) {
+ stats->multicast++;
+ }
+
+ stats->rx_bytes += dp_packet_size(packet);
+ }
+}
+
+/*
+ * The receive path for the vhost port is the TX path out from guest.
+ */
+static int
+netdev_dpdk_vhost_rxq_recv(struct netdev_rxq *rxq_,
+ struct dp_packet **packets, int *c)
+{
+ struct netdev_rxq_dpdk *rx = netdev_rxq_dpdk_cast(rxq_);
+ struct netdev *netdev = rx->up.netdev;
+ struct netdev_dpdk *vhost_dev = netdev_dpdk_cast(netdev);
+ struct virtio_net *virtio_dev = netdev_dpdk_get_virtio(vhost_dev);
+ int qid = rxq_->queue_id;
+ uint16_t nb_rx = 0;
+
+ if (OVS_UNLIKELY(!is_vhost_running(virtio_dev))) {
+ return EAGAIN;
+ }
+
+ if (rxq_->queue_id >= vhost_dev->real_n_rxq) {
+ return EOPNOTSUPP;
+ }
+
+ nb_rx = rte_vhost_dequeue_burst(virtio_dev, qid * VIRTIO_QNUM + VIRTIO_TXQ,
+ vhost_dev->dpdk_mp->mp,
+ (struct rte_mbuf **)packets,
+ NETDEV_MAX_BURST);
+ if (!nb_rx) {
+ return EAGAIN;
+ }
+
+ rte_spinlock_lock(&vhost_dev->stats_lock);
+ netdev_dpdk_vhost_update_rx_counters(&vhost_dev->stats, packets, nb_rx);
+ rte_spinlock_unlock(&vhost_dev->stats_lock);
+
+ *c = (int) nb_rx;
+ return 0;
}
static int
-netdev_dpdk_rxq_recv(struct netdev_rxq *rxq_, struct dpif_packet **packets,
+netdev_dpdk_rxq_recv(struct netdev_rxq *rxq_, struct dp_packet **packets,
int *c)
{
struct netdev_rxq_dpdk *rx = netdev_rxq_dpdk_cast(rxq_);
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
int nb_rx;
- dpdk_queue_flush(dev, rxq_->queue_id);
+ /* There is only one tx queue for this core. Do not flush other
+ * queues.
+ * Do not flush tx queue which is shared among CPUs
+ * since it is always flushed */
+ if (rxq_->queue_id == rte_lcore_id() &&
+ OVS_LIKELY(!dev->txq_needs_locking)) {
+ dpdk_queue_flush(dev, rxq_->queue_id);
+ }
nb_rx = rte_eth_rx_burst(rx->port_id, rxq_->queue_id,
(struct rte_mbuf **) packets,
- MIN((int)NETDEV_MAX_RX_BATCH,
- (int)MAX_RX_QUEUE_LEN));
+ NETDEV_MAX_BURST);
if (!nb_rx) {
return EAGAIN;
}
return 0;
}
+static inline void
+netdev_dpdk_vhost_update_tx_counters(struct netdev_stats *stats,
+ struct dp_packet **packets,
+ int attempted,
+ int dropped)
+{
+ int i;
+ int sent = attempted - dropped;
+
+ stats->tx_packets += sent;
+ stats->tx_dropped += dropped;
+
+ for (i = 0; i < sent; i++) {
+ stats->tx_bytes += dp_packet_size(packets[i]);
+ }
+}
+
+static void
+__netdev_dpdk_vhost_send(struct netdev *netdev, int qid,
+ struct dp_packet **pkts, int cnt,
+ bool may_steal)
+{
+ struct netdev_dpdk *vhost_dev = netdev_dpdk_cast(netdev);
+ struct virtio_net *virtio_dev = netdev_dpdk_get_virtio(vhost_dev);
+ struct rte_mbuf **cur_pkts = (struct rte_mbuf **) pkts;
+ unsigned int total_pkts = cnt;
+ uint64_t start = 0;
+
+ qid = vhost_dev->tx_q[qid % vhost_dev->real_n_txq].map;
+
+ if (OVS_UNLIKELY(!is_vhost_running(virtio_dev) || qid == -1)) {
+ rte_spinlock_lock(&vhost_dev->stats_lock);
+ vhost_dev->stats.tx_dropped+= cnt;
+ rte_spinlock_unlock(&vhost_dev->stats_lock);
+ goto out;
+ }
+
+ rte_spinlock_lock(&vhost_dev->tx_q[qid].tx_lock);
+
+ do {
+ int vhost_qid = qid * VIRTIO_QNUM + VIRTIO_RXQ;
+ unsigned int tx_pkts;
+
+ tx_pkts = rte_vhost_enqueue_burst(virtio_dev, vhost_qid,
+ cur_pkts, cnt);
+ if (OVS_LIKELY(tx_pkts)) {
+ /* Packets have been sent.*/
+ cnt -= tx_pkts;
+ /* Prepare for possible next iteration.*/
+ cur_pkts = &cur_pkts[tx_pkts];
+ } else {
+ uint64_t timeout = VHOST_ENQ_RETRY_USECS * rte_get_timer_hz() / 1E6;
+ unsigned int expired = 0;
+
+ if (!start) {
+ start = rte_get_timer_cycles();
+ }
+
+ /*
+ * Unable to enqueue packets to vhost interface.
+ * Check available entries before retrying.
+ */
+ while (!rte_vring_available_entries(virtio_dev, vhost_qid)) {
+ if (OVS_UNLIKELY((rte_get_timer_cycles() - start) > timeout)) {
+ expired = 1;
+ break;
+ }
+ }
+ if (expired) {
+ /* break out of main loop. */
+ break;
+ }
+ }
+ } while (cnt);
+
+ rte_spinlock_unlock(&vhost_dev->tx_q[qid].tx_lock);
+
+ rte_spinlock_lock(&vhost_dev->stats_lock);
+ netdev_dpdk_vhost_update_tx_counters(&vhost_dev->stats, pkts, total_pkts,
+ cnt);
+ rte_spinlock_unlock(&vhost_dev->stats_lock);
+
+out:
+ if (may_steal) {
+ int i;
+
+ for (i = 0; i < total_pkts; i++) {
+ dp_packet_delete(pkts[i]);
+ }
+ }
+}
+
inline static void
dpdk_queue_pkts(struct netdev_dpdk *dev, int qid,
struct rte_mbuf **pkts, int cnt)
int i = 0;
- rte_spinlock_lock(&txq->tx_lock);
while (i < cnt) {
int freeslots = MAX_TX_QUEUE_LEN - txq->count;
int tocopy = MIN(freeslots, cnt-i);
txq->count += tocopy;
i += tocopy;
- if (txq->count == MAX_TX_QUEUE_LEN) {
+ if (txq->count == MAX_TX_QUEUE_LEN || txq->flush_tx) {
dpdk_queue_flush__(dev, qid);
}
diff_tsc = rte_get_timer_cycles() - txq->tsc;
dpdk_queue_flush__(dev, qid);
}
}
- rte_spinlock_unlock(&txq->tx_lock);
}
/* Tx function. Transmit packets indefinitely */
static void
-dpdk_do_tx_copy(struct netdev *netdev, struct dpif_packet ** pkts, int cnt)
+dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet **pkts,
+ int cnt)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
{
+#if !defined(__CHECKER__) && !defined(_WIN32)
+ const size_t PKT_ARRAY_SIZE = cnt;
+#else
+ /* Sparse or MSVC doesn't like variable length array. */
+ enum { PKT_ARRAY_SIZE = NETDEV_MAX_BURST };
+#endif
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
- struct rte_mbuf *mbufs[cnt];
- int i, newcnt = 0;
+ struct rte_mbuf *mbufs[PKT_ARRAY_SIZE];
+ int dropped = 0;
+ int newcnt = 0;
+ int i;
+
+ /* If we are on a non pmd thread we have to use the mempool mutex, because
+ * every non pmd thread shares the same mempool cache */
+
+ if (!dpdk_thread_is_pmd()) {
+ ovs_mutex_lock(&nonpmd_mempool_mutex);
+ }
for (i = 0; i < cnt; i++) {
- int size = ofpbuf_size(&pkts[i]->ofpbuf);
- if (size > dev->max_packet_len) {
+ int size = dp_packet_size(pkts[i]);
+
+ if (OVS_UNLIKELY(size > dev->max_packet_len)) {
VLOG_WARN_RL(&rl, "Too big size %d max_packet_len %d",
(int)size , dev->max_packet_len);
- ovs_mutex_lock(&dev->mutex);
- dev->stats.tx_dropped++;
- ovs_mutex_unlock(&dev->mutex);
-
+ dropped++;
continue;
}
mbufs[newcnt] = rte_pktmbuf_alloc(dev->dpdk_mp->mp);
if (!mbufs[newcnt]) {
- ovs_mutex_lock(&dev->mutex);
- dev->stats.tx_dropped++;
- ovs_mutex_unlock(&dev->mutex);
- return;
+ dropped += cnt - i;
+ break;
}
/* We have to do a copy for now */
- memcpy(mbufs[newcnt]->pkt.data, ofpbuf_data(&pkts[i]->ofpbuf), size);
+ memcpy(rte_pktmbuf_mtod(mbufs[newcnt], void *), dp_packet_data(pkts[i]), size);
rte_pktmbuf_data_len(mbufs[newcnt]) = size;
rte_pktmbuf_pkt_len(mbufs[newcnt]) = size;
newcnt++;
}
- dpdk_queue_pkts(dev, NON_PMD_THREAD_TX_QUEUE, mbufs, newcnt);
- dpdk_queue_flush(dev, NON_PMD_THREAD_TX_QUEUE);
+ if (OVS_UNLIKELY(dropped)) {
+ rte_spinlock_lock(&dev->stats_lock);
+ dev->stats.tx_dropped += dropped;
+ rte_spinlock_unlock(&dev->stats_lock);
+ }
+
+ if (dev->type == DPDK_DEV_VHOST) {
+ __netdev_dpdk_vhost_send(netdev, qid, (struct dp_packet **) mbufs, newcnt, true);
+ } else {
+ dpdk_queue_pkts(dev, qid, mbufs, newcnt);
+ dpdk_queue_flush(dev, qid);
+ }
+
+ if (!dpdk_thread_is_pmd()) {
+ ovs_mutex_unlock(&nonpmd_mempool_mutex);
+ }
}
static int
-netdev_dpdk_send(struct netdev *netdev, struct dpif_packet **pkts, int cnt,
- bool may_steal)
+netdev_dpdk_vhost_send(struct netdev *netdev, int qid, struct dp_packet **pkts,
+ int cnt, bool may_steal)
+{
+ if (OVS_UNLIKELY(pkts[0]->source != DPBUF_DPDK)) {
+ int i;
+
+ dpdk_do_tx_copy(netdev, qid, pkts, cnt);
+ if (may_steal) {
+ for (i = 0; i < cnt; i++) {
+ dp_packet_delete(pkts[i]);
+ }
+ }
+ } else {
+ __netdev_dpdk_vhost_send(netdev, qid, pkts, cnt, may_steal);
+ }
+ return 0;
+}
+
+static inline void
+netdev_dpdk_send__(struct netdev_dpdk *dev, int qid,
+ struct dp_packet **pkts, int cnt, bool may_steal)
{
- struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
- int ret;
int i;
- if (!may_steal || pkts[0]->ofpbuf.source != OFPBUF_DPDK) {
- dpdk_do_tx_copy(netdev, pkts, cnt);
+ if (OVS_UNLIKELY(dev->txq_needs_locking)) {
+ qid = qid % dev->real_n_txq;
+ rte_spinlock_lock(&dev->tx_q[qid].tx_lock);
+ }
+
+ if (OVS_UNLIKELY(!may_steal ||
+ pkts[0]->source != DPBUF_DPDK)) {
+ struct netdev *netdev = &dev->up;
+
+ dpdk_do_tx_copy(netdev, qid, pkts, cnt);
if (may_steal) {
for (i = 0; i < cnt; i++) {
- dpif_packet_delete(pkts[i]);
+ dp_packet_delete(pkts[i]);
}
}
} else {
- int qid;
int next_tx_idx = 0;
int dropped = 0;
- qid = rte_lcore_id() % NR_QUEUE;
-
for (i = 0; i < cnt; i++) {
- int size = ofpbuf_size(&pkts[i]->ofpbuf);
+ int size = dp_packet_size(pkts[i]);
+
if (OVS_UNLIKELY(size > dev->max_packet_len)) {
if (next_tx_idx != i) {
dpdk_queue_pkts(dev, qid,
VLOG_WARN_RL(&rl, "Too big size %d max_packet_len %d",
(int)size , dev->max_packet_len);
- dpif_packet_delete(pkts[i]);
+ dp_packet_delete(pkts[i]);
dropped++;
next_tx_idx = i + 1;
}
}
if (OVS_UNLIKELY(dropped)) {
- ovs_mutex_lock(&dev->mutex);
+ rte_spinlock_lock(&dev->stats_lock);
dev->stats.tx_dropped += dropped;
- ovs_mutex_unlock(&dev->mutex);
+ rte_spinlock_unlock(&dev->stats_lock);
}
}
- ret = 0;
- return ret;
+ if (OVS_UNLIKELY(dev->txq_needs_locking)) {
+ rte_spinlock_unlock(&dev->tx_q[qid].tx_lock);
+ }
+}
+
+static int
+netdev_dpdk_eth_send(struct netdev *netdev, int qid,
+ struct dp_packet **pkts, int cnt, bool may_steal)
+{
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
+
+ netdev_dpdk_send__(dev, qid, pkts, cnt, may_steal);
+ return 0;
}
static int
-netdev_dpdk_set_etheraddr(struct netdev *netdev,
- const uint8_t mac[ETH_ADDR_LEN])
+netdev_dpdk_set_etheraddr(struct netdev *netdev, const struct eth_addr mac)
{
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
ovs_mutex_lock(&dev->mutex);
if (!eth_addr_equals(dev->hwaddr, mac)) {
- memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
+ dev->hwaddr = mac;
netdev_change_seq_changed(netdev);
}
ovs_mutex_unlock(&dev->mutex);
}
static int
-netdev_dpdk_get_etheraddr(const struct netdev *netdev,
- uint8_t mac[ETH_ADDR_LEN])
+netdev_dpdk_get_etheraddr(const struct netdev *netdev, struct eth_addr *mac)
{
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
ovs_mutex_lock(&dev->mutex);
- memcpy(mac, dev->hwaddr, ETH_ADDR_LEN);
+ *mac = dev->hwaddr;
ovs_mutex_unlock(&dev->mutex);
return 0;
netdev_dpdk_set_mtu(const struct netdev *netdev, int mtu)
{
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
- int old_mtu, err;
+ int old_mtu, err, dpdk_mtu;
struct dpdk_mp *old_mp;
struct dpdk_mp *mp;
+ uint32_t buf_size;
ovs_mutex_lock(&dpdk_mutex);
ovs_mutex_lock(&dev->mutex);
goto out;
}
- mp = dpdk_mp_get(dev->socket_id, dev->mtu);
+ buf_size = dpdk_buf_size(mtu);
+ dpdk_mtu = FRAME_LEN_TO_MTU(buf_size);
+
+ mp = dpdk_mp_get(dev->socket_id, dpdk_mtu);
if (!mp) {
err = ENOMEM;
goto out;
old_mp = dev->dpdk_mp;
dev->dpdk_mp = mp;
dev->mtu = mtu;
- dev->max_packet_len = MTU_TO_MAX_LEN(dev->mtu);
+ dev->max_packet_len = MTU_TO_FRAME_LEN(dev->mtu);
err = dpdk_eth_dev_init(dev);
if (err) {
dpdk_mp_put(mp);
dev->mtu = old_mtu;
dev->dpdk_mp = old_mp;
- dev->max_packet_len = MTU_TO_MAX_LEN(dev->mtu);
+ dev->max_packet_len = MTU_TO_FRAME_LEN(dev->mtu);
dpdk_eth_dev_init(dev);
goto out;
}
netdev_dpdk_get_carrier(const struct netdev *netdev_, bool *carrier);
static int
-netdev_dpdk_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
+netdev_dpdk_vhost_get_stats(const struct netdev *netdev,
+ struct netdev_stats *stats)
{
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
- struct rte_eth_stats rte_stats;
- bool gg;
- netdev_dpdk_get_carrier(netdev, &gg);
ovs_mutex_lock(&dev->mutex);
- rte_eth_stats_get(dev->port_id, &rte_stats);
-
- *stats = dev->stats_offset;
-
- stats->rx_packets += rte_stats.ipackets;
- stats->tx_packets += rte_stats.opackets;
- stats->rx_bytes += rte_stats.ibytes;
- stats->tx_bytes += rte_stats.obytes;
- stats->rx_errors += rte_stats.ierrors;
- stats->tx_errors += rte_stats.oerrors;
- stats->multicast += rte_stats.imcasts;
-
+ memset(stats, 0, sizeof(*stats));
+ /* Unsupported Stats */
+ stats->collisions = UINT64_MAX;
+ stats->rx_crc_errors = UINT64_MAX;
+ stats->rx_fifo_errors = UINT64_MAX;
+ stats->rx_frame_errors = UINT64_MAX;
+ stats->rx_missed_errors = UINT64_MAX;
+ stats->rx_over_errors = UINT64_MAX;
+ stats->tx_aborted_errors = UINT64_MAX;
+ stats->tx_carrier_errors = UINT64_MAX;
+ stats->tx_errors = UINT64_MAX;
+ stats->tx_fifo_errors = UINT64_MAX;
+ stats->tx_heartbeat_errors = UINT64_MAX;
+ stats->tx_window_errors = UINT64_MAX;
+ stats->rx_dropped += UINT64_MAX;
+
+ rte_spinlock_lock(&dev->stats_lock);
+ /* Supported Stats */
+ stats->rx_packets += dev->stats.rx_packets;
+ stats->tx_packets += dev->stats.tx_packets;
stats->tx_dropped += dev->stats.tx_dropped;
+ stats->multicast = dev->stats.multicast;
+ stats->rx_bytes = dev->stats.rx_bytes;
+ stats->tx_bytes = dev->stats.tx_bytes;
+ stats->rx_errors = dev->stats.rx_errors;
+ stats->rx_length_errors = dev->stats.rx_length_errors;
+ rte_spinlock_unlock(&dev->stats_lock);
+
ovs_mutex_unlock(&dev->mutex);
return 0;
}
static int
-netdev_dpdk_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
+netdev_dpdk_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
{
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
+ struct rte_eth_stats rte_stats;
+ bool gg;
+ netdev_dpdk_get_carrier(netdev, &gg);
ovs_mutex_lock(&dev->mutex);
- dev->stats_offset = *stats;
+ rte_eth_stats_get(dev->port_id, &rte_stats);
+
+ memset(stats, 0, sizeof(*stats));
+
+ stats->rx_packets = rte_stats.ipackets;
+ stats->tx_packets = rte_stats.opackets;
+ stats->rx_bytes = rte_stats.ibytes;
+ stats->tx_bytes = rte_stats.obytes;
+ /* DPDK counts imissed as errors, but count them here as dropped instead */
+ stats->rx_errors = rte_stats.ierrors - rte_stats.imissed;
+ stats->tx_errors = rte_stats.oerrors;
+ stats->multicast = rte_stats.imcasts;
+
+ rte_spinlock_lock(&dev->stats_lock);
+ stats->tx_dropped = dev->stats.tx_dropped;
+ rte_spinlock_unlock(&dev->stats_lock);
+
+ /* These are the available DPDK counters for packets not received due to
+ * local resource constraints in DPDK and NIC respectively. */
+ stats->rx_dropped = rte_stats.rx_nombuf + rte_stats.imissed;
+ stats->collisions = UINT64_MAX;
+
+ stats->rx_length_errors = UINT64_MAX;
+ stats->rx_over_errors = UINT64_MAX;
+ stats->rx_crc_errors = UINT64_MAX;
+ stats->rx_frame_errors = UINT64_MAX;
+ stats->rx_fifo_errors = UINT64_MAX;
+ stats->rx_missed_errors = rte_stats.imissed;
+
+ stats->tx_aborted_errors = UINT64_MAX;
+ stats->tx_carrier_errors = UINT64_MAX;
+ stats->tx_fifo_errors = UINT64_MAX;
+ stats->tx_heartbeat_errors = UINT64_MAX;
+ stats->tx_window_errors = UINT64_MAX;
+
ovs_mutex_unlock(&dev->mutex);
return 0;
ovs_mutex_lock(&dev->mutex);
check_link_status(dev);
*carrier = dev->link.link_status;
+
+ ovs_mutex_unlock(&dev->mutex);
+
+ return 0;
+}
+
+static int
+netdev_dpdk_vhost_get_carrier(const struct netdev *netdev_, bool *carrier)
+{
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev_);
+ struct virtio_net *virtio_dev = netdev_dpdk_get_virtio(dev);
+
+ ovs_mutex_lock(&dev->mutex);
+
+ if (is_vhost_running(virtio_dev)) {
+ *carrier = 1;
+ } else {
+ *carrier = 0;
+ }
+
ovs_mutex_unlock(&dev->mutex);
return 0;
netdev_dpdk_set_miimon(struct netdev *netdev_ OVS_UNUSED,
long long int interval OVS_UNUSED)
{
- return 0;
+ return EOPNOTSUPP;
}
static int
netdev_dpdk_update_flags__(struct netdev_dpdk *dev,
enum netdev_flags off, enum netdev_flags on,
- enum netdev_flags *old_flagsp)
- OVS_REQUIRES(dev->mutex)
+ enum netdev_flags *old_flagsp) OVS_REQUIRES(dev->mutex)
{
int err;
return 0;
}
- if (dev->flags & NETDEV_UP) {
- err = rte_eth_dev_start(dev->port_id);
- if (err)
- return err;
- }
+ if (dev->type == DPDK_DEV_ETH) {
+ if (dev->flags & NETDEV_UP) {
+ err = rte_eth_dev_start(dev->port_id);
+ if (err)
+ return -err;
+ }
- if (dev->flags & NETDEV_PROMISC) {
- rte_eth_promiscuous_enable(dev->port_id);
- }
+ if (dev->flags & NETDEV_PROMISC) {
+ rte_eth_promiscuous_enable(dev->port_id);
+ }
- if (!(dev->flags & NETDEV_UP)) {
- rte_eth_dev_stop(dev->port_id);
+ if (!(dev->flags & NETDEV_UP)) {
+ rte_eth_dev_stop(dev->port_id);
+ }
}
return 0;
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev_);
struct rte_eth_dev_info dev_info;
- if (dev->port_id <= 0)
+ if (dev->port_id < 0)
return ENODEV;
ovs_mutex_lock(&dev->mutex);
smap_add_format(args, "driver_name", "%s", dev_info.driver_name);
+ smap_add_format(args, "port_no", "%d", dev->port_id);
smap_add_format(args, "numa_id", "%d", rte_eth_dev_socket_id(dev->port_id));
smap_add_format(args, "driver_name", "%s", dev_info.driver_name);
smap_add_format(args, "min_rx_bufsize", "%u", dev_info.min_rx_bufsize);
- smap_add_format(args, "max_rx_pktlen", "%u", dev_info.max_rx_pktlen);
+ smap_add_format(args, "max_rx_pktlen", "%u", dev->max_packet_len);
smap_add_format(args, "max_rx_queues", "%u", dev_info.max_rx_queues);
smap_add_format(args, "max_tx_queues", "%u", dev_info.max_tx_queues);
smap_add_format(args, "max_mac_addrs", "%u", dev_info.max_mac_addrs);
smap_add_format(args, "max_vfs", "%u", dev_info.max_vfs);
smap_add_format(args, "max_vmdq_pools", "%u", dev_info.max_vmdq_pools);
- smap_add_format(args, "pci-vendor_id", "0x%u", dev_info.pci_dev->id.vendor_id);
- smap_add_format(args, "pci-device_id", "0x%x", dev_info.pci_dev->id.device_id);
+ if (dev_info.pci_dev) {
+ smap_add_format(args, "pci-vendor_id", "0x%u",
+ dev_info.pci_dev->id.vendor_id);
+ smap_add_format(args, "pci-device_id", "0x%x",
+ dev_info.pci_dev->id.device_id);
+ }
return 0;
}
unixctl_command_reply(conn, "OK");
}
+/*
+ * Set virtqueue flags so that we do not receive interrupts.
+ */
+static void
+set_irq_status(struct virtio_net *dev)
+{
+ uint32_t i;
+ uint64_t idx;
+
+ for (i = 0; i < dev->virt_qp_nb; i++) {
+ idx = i * VIRTIO_QNUM;
+ rte_vhost_enable_guest_notification(dev, idx + VIRTIO_RXQ, 0);
+ rte_vhost_enable_guest_notification(dev, idx + VIRTIO_TXQ, 0);
+ }
+}
+
+/*
+ * Fixes mapping for vhost-user tx queues. Must be called after each
+ * enabling/disabling of queues and real_n_txq modifications.
+ */
+static void
+netdev_dpdk_remap_txqs(struct netdev_dpdk *netdev)
+ OVS_REQUIRES(netdev->mutex)
+{
+ int *enabled_queues, n_enabled = 0;
+ int i, k, total_txqs = netdev->real_n_txq;
+
+ enabled_queues = dpdk_rte_mzalloc(total_txqs * sizeof *enabled_queues);
+
+ for (i = 0; i < total_txqs; i++) {
+ /* Enabled queues always mapped to themselves. */
+ if (netdev->tx_q[i].map == i) {
+ enabled_queues[n_enabled++] = i;
+ }
+ }
+
+ if (n_enabled == 0 && total_txqs != 0) {
+ enabled_queues[0] = -1;
+ n_enabled = 1;
+ }
+
+ k = 0;
+ for (i = 0; i < total_txqs; i++) {
+ if (netdev->tx_q[i].map != i) {
+ netdev->tx_q[i].map = enabled_queues[k];
+ k = (k + 1) % n_enabled;
+ }
+ }
+
+ VLOG_DBG("TX queue mapping for %s\n", netdev->vhost_id);
+ for (i = 0; i < total_txqs; i++) {
+ VLOG_DBG("%2d --> %2d", i, netdev->tx_q[i].map);
+ }
+
+ rte_free(enabled_queues);
+}
+
static int
-dpdk_class_init(void)
+netdev_dpdk_vhost_set_queues(struct netdev_dpdk *netdev, struct virtio_net *dev)
+ OVS_REQUIRES(netdev->mutex)
{
- int result;
+ uint32_t qp_num;
+
+ qp_num = dev->virt_qp_nb;
+ if (qp_num > netdev->up.n_rxq) {
+ VLOG_ERR("vHost Device '%s' %"PRIu64" can't be added - "
+ "too many queues %d > %d", dev->ifname, dev->device_fh,
+ qp_num, netdev->up.n_rxq);
+ return -1;
+ }
- if (rte_eal_init_ret) {
+ netdev->real_n_rxq = qp_num;
+ netdev->real_n_txq = qp_num;
+ netdev->txq_needs_locking = true;
+
+ netdev_dpdk_remap_txqs(netdev);
+
+ return 0;
+}
+
+/*
+ * A new virtio-net device is added to a vhost port.
+ */
+static int
+new_device(struct virtio_net *dev)
+{
+ struct netdev_dpdk *netdev;
+ bool exists = false;
+
+ ovs_mutex_lock(&dpdk_mutex);
+ /* Add device to the vhost port with the same name as that passed down. */
+ LIST_FOR_EACH(netdev, list_node, &dpdk_list) {
+ if (strncmp(dev->ifname, netdev->vhost_id, IF_NAME_SZ) == 0) {
+ ovs_mutex_lock(&netdev->mutex);
+ if (netdev_dpdk_vhost_set_queues(netdev, dev)) {
+ ovs_mutex_unlock(&netdev->mutex);
+ ovs_mutex_unlock(&dpdk_mutex);
+ return -1;
+ }
+ ovsrcu_set(&netdev->virtio_dev, dev);
+ exists = true;
+ dev->flags |= VIRTIO_DEV_RUNNING;
+ /* Disable notifications. */
+ set_irq_status(dev);
+ ovs_mutex_unlock(&netdev->mutex);
+ break;
+ }
+ }
+ ovs_mutex_unlock(&dpdk_mutex);
+
+ if (!exists) {
+ VLOG_INFO("vHost Device '%s' %"PRIu64" can't be added - name not "
+ "found", dev->ifname, dev->device_fh);
+
+ return -1;
+ }
+
+ VLOG_INFO("vHost Device '%s' %"PRIu64" has been added", dev->ifname,
+ dev->device_fh);
+ return 0;
+}
+
+/*
+ * Remove a virtio-net device from the specific vhost port. Use dev->remove
+ * flag to stop any more packets from being sent or received to/from a VM and
+ * ensure all currently queued packets have been sent/received before removing
+ * the device.
+ */
+static void
+destroy_device(volatile struct virtio_net *dev)
+{
+ struct netdev_dpdk *vhost_dev;
+ bool exists = false;
+
+ ovs_mutex_lock(&dpdk_mutex);
+ LIST_FOR_EACH (vhost_dev, list_node, &dpdk_list) {
+ if (netdev_dpdk_get_virtio(vhost_dev) == dev) {
+
+ ovs_mutex_lock(&vhost_dev->mutex);
+ dev->flags &= ~VIRTIO_DEV_RUNNING;
+ ovsrcu_set(&vhost_dev->virtio_dev, NULL);
+ exists = true;
+ ovs_mutex_unlock(&vhost_dev->mutex);
+ break;
+ }
+ }
+
+ ovs_mutex_unlock(&dpdk_mutex);
+
+ if (exists == true) {
+ /*
+ * Wait for other threads to quiesce after setting the 'virtio_dev'
+ * to NULL, before returning.
+ */
+ ovsrcu_synchronize();
+ /*
+ * As call to ovsrcu_synchronize() will end the quiescent state,
+ * put thread back into quiescent state before returning.
+ */
+ ovsrcu_quiesce_start();
+ VLOG_INFO("vHost Device '%s' %"PRIu64" has been removed", dev->ifname,
+ dev->device_fh);
+ } else {
+ VLOG_INFO("vHost Device '%s' %"PRIu64" not found", dev->ifname,
+ dev->device_fh);
+ }
+
+}
+
+static int
+vring_state_changed(struct virtio_net *dev, uint16_t queue_id, int enable)
+{
+ struct netdev_dpdk *vhost_dev;
+ bool exists = false;
+ int qid = queue_id / VIRTIO_QNUM;
+
+ if (queue_id % VIRTIO_QNUM == VIRTIO_TXQ) {
return 0;
}
- result = rte_pmd_init_all();
- if (result) {
- VLOG_ERR("Cannot init PMD");
- return result;
+ ovs_mutex_lock(&dpdk_mutex);
+ LIST_FOR_EACH (vhost_dev, list_node, &dpdk_list) {
+ if (strncmp(dev->ifname, vhost_dev->vhost_id, IF_NAME_SZ) == 0) {
+ ovs_mutex_lock(&vhost_dev->mutex);
+ if (enable) {
+ vhost_dev->tx_q[qid].map = qid;
+ } else {
+ vhost_dev->tx_q[qid].map = -1;
+ }
+ netdev_dpdk_remap_txqs(vhost_dev);
+ exists = true;
+ ovs_mutex_unlock(&vhost_dev->mutex);
+ break;
+ }
}
+ ovs_mutex_unlock(&dpdk_mutex);
- result = rte_eal_pci_probe();
- if (result) {
- VLOG_ERR("Cannot probe PCI");
- return result;
+ if (exists) {
+ VLOG_INFO("State of queue %d ( tx_qid %d ) of vhost device '%s' %"
+ PRIu64" changed to \'%s\'", queue_id, qid, dev->ifname,
+ dev->device_fh, (enable == 1) ? "enabled" : "disabled");
+ } else {
+ VLOG_INFO("vHost Device '%s' %"PRIu64" not found", dev->ifname,
+ dev->device_fh);
+ return -1;
}
- if (rte_eth_dev_count() < 1) {
- VLOG_ERR("No Ethernet devices found. Try assigning ports to UIO.");
+ return 0;
+}
+
+struct virtio_net *
+netdev_dpdk_get_virtio(const struct netdev_dpdk *dev)
+{
+ return ovsrcu_get(struct virtio_net *, &dev->virtio_dev);
+}
+
+/*
+ * These callbacks allow virtio-net devices to be added to vhost ports when
+ * configuration has been fully complete.
+ */
+static const struct virtio_net_device_ops virtio_net_device_ops =
+{
+ .new_device = new_device,
+ .destroy_device = destroy_device,
+ .vring_state_changed = vring_state_changed
+};
+
+static void *
+start_vhost_loop(void *dummy OVS_UNUSED)
+{
+ pthread_detach(pthread_self());
+ /* Put the cuse thread into quiescent state. */
+ ovsrcu_quiesce_start();
+ rte_vhost_driver_session_start();
+ return NULL;
+}
+
+static int
+dpdk_vhost_class_init(void)
+{
+ rte_vhost_driver_callback_register(&virtio_net_device_ops);
+ ovs_thread_create("vhost_thread", start_vhost_loop, NULL);
+ return 0;
+}
+
+static int
+dpdk_vhost_cuse_class_init(void)
+{
+ int err = -1;
+
+
+ /* Register CUSE device to handle IOCTLs.
+ * Unless otherwise specified on the vswitchd command line, cuse_dev_name
+ * is set to vhost-net.
+ */
+ err = rte_vhost_driver_register(cuse_dev_name);
+
+ if (err != 0) {
+ VLOG_ERR("CUSE device setup failure.");
+ return -1;
}
- VLOG_INFO("Ethernet Device Count: %d", (int)rte_eth_dev_count());
+ dpdk_vhost_class_init();
+ return 0;
+}
- list_init(&dpdk_list);
- list_init(&dpdk_mp_list);
+static int
+dpdk_vhost_user_class_init(void)
+{
+ dpdk_vhost_class_init();
+ return 0;
+}
+static void
+dpdk_common_init(void)
+{
unixctl_command_register("netdev-dpdk/set-admin-state",
"[netdev] up|down", 1, 2,
netdev_dpdk_set_admin_state, NULL);
ovs_thread_create("dpdk_watchdog", dpdk_watchdog, NULL);
+}
+
+/* Client Rings */
+
+static int
+dpdk_ring_create(const char dev_name[], unsigned int port_no,
+ unsigned int *eth_port_id)
+{
+ struct dpdk_ring *ivshmem;
+ char ring_name[RTE_RING_NAMESIZE];
+ int err;
+
+ ivshmem = dpdk_rte_mzalloc(sizeof *ivshmem);
+ if (ivshmem == NULL) {
+ return ENOMEM;
+ }
+
+ /* XXX: Add support for multiquque ring. */
+ err = snprintf(ring_name, sizeof(ring_name), "%s_tx", dev_name);
+ if (err < 0) {
+ return -err;
+ }
+
+ /* Create single producer tx ring, netdev does explicit locking. */
+ ivshmem->cring_tx = rte_ring_create(ring_name, DPDK_RING_SIZE, SOCKET0,
+ RING_F_SP_ENQ);
+ if (ivshmem->cring_tx == NULL) {
+ rte_free(ivshmem);
+ return ENOMEM;
+ }
+
+ err = snprintf(ring_name, sizeof(ring_name), "%s_rx", dev_name);
+ if (err < 0) {
+ return -err;
+ }
+
+ /* Create single consumer rx ring, netdev does explicit locking. */
+ ivshmem->cring_rx = rte_ring_create(ring_name, DPDK_RING_SIZE, SOCKET0,
+ RING_F_SC_DEQ);
+ if (ivshmem->cring_rx == NULL) {
+ rte_free(ivshmem);
+ return ENOMEM;
+ }
+
+ err = rte_eth_from_rings(dev_name, &ivshmem->cring_rx, 1,
+ &ivshmem->cring_tx, 1, SOCKET0);
+
+ if (err < 0) {
+ rte_free(ivshmem);
+ return ENODEV;
+ }
+
+ ivshmem->user_port_id = port_no;
+ ivshmem->eth_port_id = rte_eth_dev_count() - 1;
+ list_push_back(&dpdk_ring_list, &ivshmem->list_node);
+
+ *eth_port_id = ivshmem->eth_port_id;
return 0;
}
-static struct netdev_class netdev_dpdk_class = {
- "dpdk",
- dpdk_class_init, /* init */
- NULL, /* netdev_dpdk_run */
- NULL, /* netdev_dpdk_wait */
-
- netdev_dpdk_alloc,
- netdev_dpdk_construct,
- netdev_dpdk_destruct,
- netdev_dpdk_dealloc,
- netdev_dpdk_get_config,
- NULL, /* netdev_dpdk_set_config */
- NULL, /* get_tunnel_config */
-
- netdev_dpdk_send, /* send */
- NULL, /* send_wait */
-
- netdev_dpdk_set_etheraddr,
- netdev_dpdk_get_etheraddr,
- netdev_dpdk_get_mtu,
- netdev_dpdk_set_mtu,
- netdev_dpdk_get_ifindex,
- netdev_dpdk_get_carrier,
- netdev_dpdk_get_carrier_resets,
- netdev_dpdk_set_miimon,
- netdev_dpdk_get_stats,
- netdev_dpdk_set_stats,
- netdev_dpdk_get_features,
- NULL, /* set_advertisements */
-
- NULL, /* set_policing */
- NULL, /* get_qos_types */
- NULL, /* get_qos_capabilities */
- NULL, /* get_qos */
- NULL, /* set_qos */
- NULL, /* get_queue */
- NULL, /* set_queue */
- NULL, /* delete_queue */
- NULL, /* get_queue_stats */
- NULL, /* queue_dump_start */
- NULL, /* queue_dump_next */
- NULL, /* queue_dump_done */
- NULL, /* dump_queue_stats */
-
- NULL, /* get_in4 */
- NULL, /* set_in4 */
- NULL, /* get_in6 */
- NULL, /* add_router */
- NULL, /* get_next_hop */
- netdev_dpdk_get_status,
- NULL, /* arp_lookup */
-
- netdev_dpdk_update_flags,
-
- netdev_dpdk_rxq_alloc,
- netdev_dpdk_rxq_construct,
- netdev_dpdk_rxq_destruct,
- netdev_dpdk_rxq_dealloc,
- netdev_dpdk_rxq_recv,
- NULL, /* rxq_wait */
- NULL, /* rxq_drain */
-};
+static int
+dpdk_ring_open(const char dev_name[], unsigned int *eth_port_id) OVS_REQUIRES(dpdk_mutex)
+{
+ struct dpdk_ring *ivshmem;
+ unsigned int port_no;
+ int err = 0;
+
+ /* Names always start with "dpdkr" */
+ err = dpdk_dev_parse_name(dev_name, "dpdkr", &port_no);
+ if (err) {
+ return err;
+ }
+
+ /* look through our list to find the device */
+ LIST_FOR_EACH (ivshmem, list_node, &dpdk_ring_list) {
+ if (ivshmem->user_port_id == port_no) {
+ VLOG_INFO("Found dpdk ring device %s:", dev_name);
+ *eth_port_id = ivshmem->eth_port_id; /* really all that is needed */
+ return 0;
+ }
+ }
+ /* Need to create the device rings */
+ return dpdk_ring_create(dev_name, port_no, eth_port_id);
+}
+
+static int
+netdev_dpdk_ring_send(struct netdev *netdev_, int qid,
+ struct dp_packet **pkts, int cnt, bool may_steal)
+{
+ struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
+ unsigned i;
+
+ /* When using 'dpdkr' and sending to a DPDK ring, we want to ensure that the
+ * rss hash field is clear. This is because the same mbuf may be modified by
+ * the consumer of the ring and return into the datapath without recalculating
+ * the RSS hash. */
+ for (i = 0; i < cnt; i++) {
+ dp_packet_rss_invalidate(pkts[i]);
+ }
+
+ netdev_dpdk_send__(netdev, qid, pkts, cnt, may_steal);
+ return 0;
+}
+
+static int
+netdev_dpdk_ring_construct(struct netdev *netdev)
+{
+ unsigned int port_no = 0;
+ int err = 0;
+
+ if (rte_eal_init_ret) {
+ return rte_eal_init_ret;
+ }
+
+ ovs_mutex_lock(&dpdk_mutex);
+
+ err = dpdk_ring_open(netdev->name, &port_no);
+ if (err) {
+ goto unlock_dpdk;
+ }
+
+ err = netdev_dpdk_init(netdev, port_no, DPDK_DEV_ETH);
+
+unlock_dpdk:
+ ovs_mutex_unlock(&dpdk_mutex);
+ return err;
+}
+
+#define NETDEV_DPDK_CLASS(NAME, INIT, CONSTRUCT, DESTRUCT, MULTIQ, SEND, \
+ GET_CARRIER, GET_STATS, GET_FEATURES, GET_STATUS, RXQ_RECV) \
+{ \
+ NAME, \
+ INIT, /* init */ \
+ NULL, /* netdev_dpdk_run */ \
+ NULL, /* netdev_dpdk_wait */ \
+ \
+ netdev_dpdk_alloc, \
+ CONSTRUCT, \
+ DESTRUCT, \
+ netdev_dpdk_dealloc, \
+ netdev_dpdk_get_config, \
+ netdev_dpdk_set_config, \
+ NULL, /* get_tunnel_config */ \
+ NULL, /* build header */ \
+ NULL, /* push header */ \
+ NULL, /* pop header */ \
+ netdev_dpdk_get_numa_id, /* get_numa_id */ \
+ MULTIQ, /* set_multiq */ \
+ \
+ SEND, /* send */ \
+ NULL, /* send_wait */ \
+ \
+ netdev_dpdk_set_etheraddr, \
+ netdev_dpdk_get_etheraddr, \
+ netdev_dpdk_get_mtu, \
+ netdev_dpdk_set_mtu, \
+ netdev_dpdk_get_ifindex, \
+ GET_CARRIER, \
+ netdev_dpdk_get_carrier_resets, \
+ netdev_dpdk_set_miimon, \
+ GET_STATS, \
+ GET_FEATURES, \
+ NULL, /* set_advertisements */ \
+ \
+ NULL, /* set_policing */ \
+ NULL, /* get_qos_types */ \
+ NULL, /* get_qos_capabilities */ \
+ NULL, /* get_qos */ \
+ NULL, /* set_qos */ \
+ NULL, /* get_queue */ \
+ NULL, /* set_queue */ \
+ NULL, /* delete_queue */ \
+ NULL, /* get_queue_stats */ \
+ NULL, /* queue_dump_start */ \
+ NULL, /* queue_dump_next */ \
+ NULL, /* queue_dump_done */ \
+ NULL, /* dump_queue_stats */ \
+ \
+ NULL, /* get_in4 */ \
+ NULL, /* set_in4 */ \
+ NULL, /* get_in6 */ \
+ NULL, /* add_router */ \
+ NULL, /* get_next_hop */ \
+ GET_STATUS, \
+ NULL, /* arp_lookup */ \
+ \
+ netdev_dpdk_update_flags, \
+ \
+ netdev_dpdk_rxq_alloc, \
+ netdev_dpdk_rxq_construct, \
+ netdev_dpdk_rxq_destruct, \
+ netdev_dpdk_rxq_dealloc, \
+ RXQ_RECV, \
+ NULL, /* rx_wait */ \
+ NULL, /* rxq_drain */ \
+}
+
+static int
+process_vhost_flags(char *flag, char *default_val, int size,
+ char **argv, char **new_val)
+{
+ int changed = 0;
+
+ /* Depending on which version of vhost is in use, process the vhost-specific
+ * flag if it is provided on the vswitchd command line, otherwise resort to
+ * a default value.
+ *
+ * For vhost-user: Process "-vhost_sock_dir" to set the custom location of
+ * the vhost-user socket(s).
+ * For vhost-cuse: Process "-cuse_dev_name" to set the custom name of the
+ * vhost-cuse character device.
+ */
+ if (!strcmp(argv[1], flag) && (strlen(argv[2]) <= size)) {
+ changed = 1;
+ *new_val = xstrdup(argv[2]);
+ VLOG_INFO("User-provided %s in use: %s", flag, *new_val);
+ } else {
+ VLOG_INFO("No %s provided - defaulting to %s", flag, default_val);
+ *new_val = default_val;
+ }
+
+ return changed;
+}
int
dpdk_init(int argc, char **argv)
{
int result;
+ int base = 0;
+ char *pragram_name = argv[0];
if (argc < 2 || strcmp(argv[1], "--dpdk"))
return 0;
- /* Make sure program name passed to rte_eal_init() is vswitchd. */
- argv[1] = argv[0];
-
+ /* Remove the --dpdk argument from arg list.*/
argc--;
argv++;
+ /* Reject --user option */
+ int i;
+ for (i = 0; i < argc; i++) {
+ if (!strcmp(argv[i], "--user")) {
+ VLOG_ERR("Can not mix --dpdk and --user options, aborting.");
+ }
+ }
+
+#ifdef VHOST_CUSE
+ if (process_vhost_flags("-cuse_dev_name", xstrdup("vhost-net"),
+ PATH_MAX, argv, &cuse_dev_name)) {
+#else
+ if (process_vhost_flags("-vhost_sock_dir", xstrdup(ovs_rundir()),
+ NAME_MAX, argv, &vhost_sock_dir)) {
+ struct stat s;
+ int err;
+
+ err = stat(vhost_sock_dir, &s);
+ if (err) {
+ VLOG_ERR("vHostUser socket DIR '%s' does not exist.",
+ vhost_sock_dir);
+ return err;
+ }
+#endif
+ /* Remove the vhost flag configuration parameters from the argument
+ * list, so that the correct elements are passed to the DPDK
+ * initialization function
+ */
+ argc -= 2;
+ argv += 2; /* Increment by two to bypass the vhost flag arguments */
+ base = 2;
+ }
+
+ /* Keep the program name argument as this is needed for call to
+ * rte_eal_init()
+ */
+ argv[0] = pragram_name;
+
/* Make sure things are initialized ... */
result = rte_eal_init(argc, argv);
if (result < 0) {
- ovs_abort(result, "Cannot init EAL\n");
+ ovs_abort(result, "Cannot init EAL");
}
- rte_memzone_dump();
+ rte_memzone_dump(stdout);
rte_eal_init_ret = 0;
if (argc > result) {
argv[result] = argv[0];
}
- return result + 1;
+ /* We are called from the main thread here */
+ RTE_PER_LCORE(_lcore_id) = NON_PMD_CORE_ID;
+
+ return result + 1 + base;
}
+static const struct netdev_class dpdk_class =
+ NETDEV_DPDK_CLASS(
+ "dpdk",
+ NULL,
+ netdev_dpdk_construct,
+ netdev_dpdk_destruct,
+ netdev_dpdk_set_multiq,
+ netdev_dpdk_eth_send,
+ netdev_dpdk_get_carrier,
+ netdev_dpdk_get_stats,
+ netdev_dpdk_get_features,
+ netdev_dpdk_get_status,
+ netdev_dpdk_rxq_recv);
+
+static const struct netdev_class dpdk_ring_class =
+ NETDEV_DPDK_CLASS(
+ "dpdkr",
+ NULL,
+ netdev_dpdk_ring_construct,
+ netdev_dpdk_destruct,
+ netdev_dpdk_set_multiq,
+ netdev_dpdk_ring_send,
+ netdev_dpdk_get_carrier,
+ netdev_dpdk_get_stats,
+ netdev_dpdk_get_features,
+ netdev_dpdk_get_status,
+ netdev_dpdk_rxq_recv);
+
+static const struct netdev_class OVS_UNUSED dpdk_vhost_cuse_class =
+ NETDEV_DPDK_CLASS(
+ "dpdkvhostcuse",
+ dpdk_vhost_cuse_class_init,
+ netdev_dpdk_vhost_cuse_construct,
+ netdev_dpdk_vhost_destruct,
+ netdev_dpdk_vhost_cuse_set_multiq,
+ netdev_dpdk_vhost_send,
+ netdev_dpdk_vhost_get_carrier,
+ netdev_dpdk_vhost_get_stats,
+ NULL,
+ NULL,
+ netdev_dpdk_vhost_rxq_recv);
+
+static const struct netdev_class OVS_UNUSED dpdk_vhost_user_class =
+ NETDEV_DPDK_CLASS(
+ "dpdkvhostuser",
+ dpdk_vhost_user_class_init,
+ netdev_dpdk_vhost_user_construct,
+ netdev_dpdk_vhost_destruct,
+ netdev_dpdk_vhost_set_multiq,
+ netdev_dpdk_vhost_send,
+ netdev_dpdk_vhost_get_carrier,
+ netdev_dpdk_vhost_get_stats,
+ NULL,
+ NULL,
+ netdev_dpdk_vhost_rxq_recv);
+
void
netdev_dpdk_register(void)
{
- netdev_register_provider(&netdev_dpdk_class);
+ static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER;
+
+ if (rte_eal_init_ret) {
+ return;
+ }
+
+ if (ovsthread_once_start(&once)) {
+ dpdk_common_init();
+ netdev_register_provider(&dpdk_class);
+ netdev_register_provider(&dpdk_ring_class);
+#ifdef VHOST_CUSE
+ netdev_register_provider(&dpdk_vhost_cuse_class);
+#else
+ netdev_register_provider(&dpdk_vhost_user_class);
+#endif
+ ovsthread_once_done(&once);
+ }
}
int
-pmd_thread_setaffinity_cpu(int cpu)
+pmd_thread_setaffinity_cpu(unsigned cpu)
{
cpu_set_t cpuset;
int err;
VLOG_ERR("Thread affinity error %d",err);
return err;
}
+ /* NON_PMD_CORE_ID is reserved for use by non pmd threads. */
+ ovs_assert(cpu != NON_PMD_CORE_ID);
RTE_PER_LCORE(_lcore_id) = cpu;
return 0;
}
+
+static bool
+dpdk_thread_is_pmd(void)
+{
+ return rte_lcore_id() != NON_PMD_CORE_ID;
+}
projects / cascardo / ovs.git / blobdiff