#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"
#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. */
+/* XXX: 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. */
+/* XXX: 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 TX_WTHRESH 0 /* Default values of TX write-back threshold reg. */
static const struct rte_eth_conf port_conf = {
- .rxmode = {
- .mq_mode = ETH_MQ_RX_RSS,
- .split_hdr_size = 0,
- .header_split = 0, /* Header Split disabled */
- .hw_ip_checksum = 0, /* IP checksum offload disabled */
- .hw_vlan_filter = 0, /* VLAN filtering disabled */
- .jumbo_frame = 0, /* Jumbo Frame Support disabled */
- .hw_strip_crc = 0,
- },
- .rx_adv_conf = {
- .rss_conf = {
- .rss_key = NULL,
- .rss_hf = ETH_RSS_IPV4_TCP | ETH_RSS_IPV4 | ETH_RSS_IPV6,
- },
- },
- .txmode = {
- .mq_mode = ETH_MQ_TX_NONE,
+ .rxmode = {
+ .mq_mode = ETH_MQ_RX_RSS,
+ .split_hdr_size = 0,
+ .header_split = 0, /* Header Split disabled */
+ .hw_ip_checksum = 0, /* IP checksum offload disabled */
+ .hw_vlan_filter = 0, /* VLAN filtering disabled */
+ .jumbo_frame = 0, /* Jumbo Frame Support disabled */
+ .hw_strip_crc = 0,
+ },
+ .rx_adv_conf = {
+ .rss_conf = {
+ .rss_key = NULL,
+ .rss_hf = ETH_RSS_IPV4_TCP | ETH_RSS_IPV4 | ETH_RSS_IPV6
+ | ETH_RSS_IPV4_UDP | ETH_RSS_IPV6_TCP | ETH_RSS_IPV6_UDP,
},
+ },
+ .txmode = {
+ .mq_mode = ETH_MQ_TX_NONE,
+ },
};
static const struct rte_eth_rxconf rx_conf = {
- .rx_thresh = {
- .pthresh = RX_PTHRESH,
- .hthresh = RX_HTHRESH,
- .wthresh = RX_WTHRESH,
- },
+ .rx_thresh = {
+ .pthresh = RX_PTHRESH,
+ .hthresh = RX_HTHRESH,
+ .wthresh = RX_WTHRESH,
+ },
};
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,
+ .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 { MAX_RX_QUEUE_LEN = 64 };
-enum { MAX_TX_QUEUE_LEN = 64 };
+enum { MAX_RX_QUEUE_LEN = 192 };
+enum { MAX_TX_QUEUE_LEN = 384 };
+enum { DPDK_RING_SIZE = 256 };
+BUILD_ASSERT_DECL(IS_POW2(DPDK_RING_SIZE));
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)
+static struct ovs_list dpdk_list OVS_GUARDED_BY(dpdk_mutex)
= LIST_INITIALIZER(&dpdk_list);
-static struct list dpdk_mp_list OVS_GUARDED_BY(dpdk_mutex)
+static struct ovs_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 */
+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;
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)
+ = LIST_INITIALIZER(&dpdk_ring_list);
+
+struct dpdk_ring {
+ /* For the client rings */
+ struct rte_ring *cring_tx;
+ struct rte_ring *cring_rx;
+ 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;
- 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;
uint8_t hwaddr[ETH_ADDR_LEN];
int link_reset_cnt;
/* In dpdk_list. */
- struct list list_node OVS_GUARDED_BY(dpdk_mutex);
+ struct ovs_list list_node OVS_GUARDED_BY(dpdk_mutex);
+ rte_spinlock_t dpdkr_tx_lock;
};
struct netdev_rxq_dpdk {
int port_id;
};
+static bool thread_is_pmd(void);
+
static int netdev_dpdk_construct(struct netdev *);
static bool
return class->construct == netdev_dpdk_construct;
}
-/* TODO: use dpdk malloc for entire OVS. infact huge page shld be used
+/* XXX: use dpdk malloc for entire OVS. infact huge page shld be used
* for all other sengments data, bss and text. */
static void *
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 ofpbuf *b)
+free_dpdk_buf(struct dpif_packet *p)
{
- struct rte_mbuf *pkt = (struct rte_mbuf *) b->dpdk_buf;
+ struct rte_mbuf *pkt = (struct rte_mbuf *) p;
- rte_mempool_put(pkt->pool, pkt);
+ rte_pktmbuf_free_seg(pkt);
}
static void
unsigned i OVS_UNUSED)
{
struct rte_mbuf *m = _m;
- uint32_t buf_len = mp->elt_size - sizeof(struct ofpbuf);
+ uint32_t buf_len = mp->elt_size - sizeof(struct dpif_packet);
- RTE_MBUF_ASSERT(mp->elt_size >= sizeof(struct ofpbuf));
+ 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 ofpbuf);
+ m->buf_addr = (char *)m + sizeof(struct dpif_packet);
m->buf_physaddr = rte_mempool_virt2phy(mp, m) +
- sizeof(struct ofpbuf);
+ sizeof(struct dpif_packet);
m->buf_len = (uint16_t)buf_len;
/* keep some headroom between start of buffer and data */
dmp->mtu = mtu;
dmp->refcount = 1;
- snprintf(mp_name, RTE_MEMPOOL_NAMESIZE, "ovs_mp_%d", dmp->mtu);
+ if (snprintf(mp_name, RTE_MEMPOOL_NAMESIZE, "ovs_mp_%d_%d", dmp->mtu,
+ dmp->socket_id) < 0) {
+ return NULL;
+ }
+
dmp->mp = rte_mempool_create(mp_name, NB_MBUF, MBUF_SIZE(mtu),
MP_CACHE_SZ,
sizeof(struct rte_pktmbuf_pool_private),
int i;
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);
+ diag = rte_eth_dev_configure(dev->port_id, dev->up.n_rxq, dev->up.n_txq,
+ &port_conf);
if (diag) {
VLOG_ERR("eth dev config error %d",diag);
- return diag;
+ return -diag;
}
- for (i = 0; i < NR_QUEUE; i++) {
- diag = rte_eth_tx_queue_setup(dev->port_id, i, MAX_TX_QUEUE_LEN,
+ for (i = 0; i < dev->up.n_txq; 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;
+ return -diag;
}
}
- for (i = 0; i < NR_QUEUE; i++) {
- diag = rte_eth_rx_queue_setup(dev->port_id, i, MAX_RX_QUEUE_LEN,
+ for (i = 0; i < dev->up.n_rxq; 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;
+ return -diag;
}
}
diag = rte_eth_dev_start(dev->port_id);
if (diag) {
VLOG_ERR("eth dev start error %d",diag);
- return diag;
+ return -diag;
}
rte_eth_promiscuous_enable(dev->port_id);
return &netdev->up;
}
-static int
-netdev_dpdk_construct(struct netdev *netdev_)
+static void
+netdev_dpdk_alloc_txq(struct netdev_dpdk *netdev, unsigned int n_txqs)
{
- struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
- unsigned int port_no;
- char *cport;
- int err;
int i;
- if (rte_eal_init_ret) {
- return rte_eal_init_ret;
- }
+ netdev->tx_q = dpdk_rte_mzalloc(n_txqs * sizeof *netdev->tx_q);
+ /* Each index is considered as a cpu core id, since there should
+ * be one tx queue for each cpu core. */
+ for (i = 0; i < n_txqs; i++) {
+ int numa_id = ovs_numa_get_numa_id(i);
- ovs_mutex_lock(&dpdk_mutex);
- cport = netdev_->name + 4; /* Names always start with "dpdk" */
-
- if (strncmp(netdev_->name, "dpdk", 4)) {
- err = ENODEV;
- goto unlock_dpdk;
+ /* 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;
}
+}
- port_no = strtol(cport, 0, 0); /* string must be null terminated */
-
- for (i = 0; i < NR_QUEUE; i++) {
- rte_spinlock_init(&netdev->tx_q[i].tx_lock);
- }
+static int
+netdev_dpdk_init(struct netdev *netdev_, unsigned int port_no)
+ OVS_REQUIRES(dpdk_mutex)
+{
+ struct netdev_dpdk *netdev = netdev_dpdk_cast(netdev_);
+ int sid;
+ int err = 0;
ovs_mutex_init(&netdev->mutex);
ovs_mutex_lock(&netdev->mutex);
- netdev->flags = 0;
+ /* If the 'sid' is negative, it means that the kernel fails
+ * to obtain the pci numa info. In that situation, always
+ * use 'SOCKET0'. */
+ sid = rte_eth_dev_socket_id(port_no);
+ netdev->socket_id = sid < 0 ? SOCKET0 : sid;
+ netdev_dpdk_alloc_txq(netdev, NR_QUEUE);
+ netdev->port_id = port_no;
+ netdev->flags = 0;
netdev->mtu = ETHER_MTU;
netdev->max_packet_len = MTU_TO_MAX_LEN(netdev->mtu);
-
- /* TODO: need to discover device node at run time. */
- netdev->socket_id = SOCKET0;
- netdev->port_id = port_no;
+ rte_spinlock_init(&netdev->dpdkr_tx_lock);
netdev->dpdk_mp = dpdk_mp_get(netdev->socket_id, netdev->mtu);
if (!netdev->dpdk_mp) {
err = ENOMEM;
- goto unlock_dev;
+ goto unlock;
}
+ netdev_->n_txq = NR_QUEUE;
+ netdev_->n_rxq = NR_QUEUE;
err = dpdk_eth_dev_init(netdev);
if (err) {
- goto unlock_dev;
+ goto unlock;
}
- netdev_->n_rxq = NR_QUEUE;
list_push_back(&dpdk_list, &netdev->list_node);
-unlock_dev:
+unlock:
+ if (err) {
+ rte_free(netdev->tx_q);
+ }
ovs_mutex_unlock(&netdev->mutex);
-unlock_dpdk:
+ return err;
+}
+
+static int
+dpdk_dev_parse_name(const char dev_name[], const char prefix[],
+ unsigned int *port_no)
+{
+ const char *cport;
+
+ if (strncmp(dev_name, prefix, strlen(prefix))) {
+ return ENODEV;
+ }
+
+ cport = dev_name + strlen(prefix);
+ *port_no = strtol(cport, 0, 0); /* string must be null terminated */
+ return 0;
+}
+
+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);
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);
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, "configured_rx_queues", "%d", netdev_->n_rxq);
+ smap_add_format(args, "configured_tx_queues", "%d", netdev_->n_txq);
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;
+
+ 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);
+
+ netdev->up.n_txq = n_txq;
+ netdev->up.n_rxq = n_rxq;
+ rte_free(netdev->tx_q);
+ netdev_dpdk_alloc_txq(netdev, n_txq);
+ err = dpdk_eth_dev_init(netdev);
+
+ ovs_mutex_unlock(&netdev->mutex);
+ ovs_mutex_unlock(&dpdk_mutex);
+
+ return err;
+}
+
static struct netdev_rxq *
netdev_dpdk_rxq_alloc(void)
{
rte_free(rx);
}
-inline static void
+static inline void
+dpdk_queue_flush__(struct netdev_dpdk *dev, int qid)
+{
+ struct dpdk_tx_queue *txq = &dev->tx_q[qid];
+ 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;
+ }
+
+ if (OVS_UNLIKELY(nb_tx != txq->count)) {
+ /* 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]);
+ }
+ ovs_mutex_lock(&dev->mutex);
+ dev->stats.tx_dropped += txq->count-nb_tx;
+ ovs_mutex_unlock(&dev->mutex);
+ }
+
+ txq->count = 0;
+ txq->tsc = rte_get_timer_cycles();
+}
+
+static inline void
dpdk_queue_flush(struct netdev_dpdk *dev, int qid)
{
struct dpdk_tx_queue *txq = &dev->tx_q[qid];
- uint32_t nb_tx;
if (txq->count == 0) {
return;
}
- rte_spinlock_lock(&txq->tx_lock);
- nb_tx = rte_eth_tx_burst(dev->port_id, qid, txq->burst_pkts, txq->count);
- if (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));
- }
- txq->count = 0;
- rte_spinlock_unlock(&txq->tx_lock);
+ dpdk_queue_flush__(dev, qid);
}
static int
-netdev_dpdk_rxq_recv(struct netdev_rxq *rxq_, struct ofpbuf **packets, int *c)
+netdev_dpdk_rxq_recv(struct netdev_rxq *rxq_, struct dpif_packet **packets,
+ int *c)
{
struct netdev_rxq_dpdk *rx = netdev_rxq_dpdk_cast(rxq_);
struct netdev *netdev = rx->up.netdev;
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
+ * queueus. */
+ if (rxq_->queue_id == rte_lcore_id()) {
+ dpdk_queue_flush(dev, rxq_->queue_id);
+ }
nb_rx = rte_eth_rx_burst(rx->port_id, rxq_->queue_id,
(struct rte_mbuf **) packets,
}
inline static void
-dpdk_queue_pkt(struct netdev_dpdk *dev, int qid,
- struct rte_mbuf *pkt)
+dpdk_queue_pkts(struct netdev_dpdk *dev, int qid,
+ struct rte_mbuf **pkts, int cnt)
{
struct dpdk_tx_queue *txq = &dev->tx_q[qid];
uint64_t diff_tsc;
- uint64_t cur_tsc;
- uint32_t nb_tx;
- rte_spinlock_lock(&txq->tx_lock);
- txq->burst_pkts[txq->count++] = pkt;
- if (txq->count == MAX_TX_QUEUE_LEN) {
- goto flush;
- }
- cur_tsc = rte_get_timer_cycles();
- if (txq->count == 1) {
- txq->tsc = cur_tsc;
- }
- diff_tsc = cur_tsc - txq->tsc;
- if (diff_tsc >= DRAIN_TSC) {
- goto flush;
- }
- rte_spinlock_unlock(&txq->tx_lock);
- return;
-
-flush:
- nb_tx = rte_eth_tx_burst(dev->port_id, qid, txq->burst_pkts, txq->count);
- if (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));
+ int i = 0;
+
+ while (i < cnt) {
+ int freeslots = MAX_TX_QUEUE_LEN - txq->count;
+ int tocopy = MIN(freeslots, cnt-i);
+
+ memcpy(&txq->burst_pkts[txq->count], &pkts[i],
+ tocopy * sizeof (struct rte_mbuf *));
+
+ txq->count += tocopy;
+ i += tocopy;
+
+ if (txq->count == MAX_TX_QUEUE_LEN || txq->flush_tx) {
+ dpdk_queue_flush__(dev, qid);
+ }
+ diff_tsc = rte_get_timer_cycles() - txq->tsc;
+ if (diff_tsc >= DRAIN_TSC) {
+ dpdk_queue_flush__(dev, qid);
+ }
}
- txq->count = 0;
- rte_spinlock_unlock(&txq->tx_lock);
}
/* Tx function. Transmit packets indefinitely */
static void
-dpdk_do_tx_copy(struct netdev *netdev, char *buf, int size)
+dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dpif_packet ** pkts,
+ int cnt)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
{
struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
- struct rte_mbuf *pkt;
+ struct rte_mbuf *mbufs[cnt];
+ int dropped = 0;
+ int newcnt = 0;
+ int i;
- pkt = rte_pktmbuf_alloc(dev->dpdk_mp->mp);
- if (!pkt) {
- ovs_mutex_lock(&dev->mutex);
- dev->stats.tx_dropped++;
- ovs_mutex_unlock(&dev->mutex);
- return;
+ /* 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 (!thread_is_pmd()) {
+ ovs_mutex_lock(&nonpmd_mempool_mutex);
}
- /* We have to do a copy for now */
- memcpy(pkt->pkt.data, buf, size);
+ for (i = 0; i < cnt; i++) {
+ int size = ofpbuf_size(&pkts[i]->ofpbuf);
- rte_pktmbuf_data_len(pkt) = size;
- rte_pktmbuf_pkt_len(pkt) = size;
+ 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);
- dpdk_queue_pkt(dev, NON_PMD_THREAD_TX_QUEUE, pkt);
- dpdk_queue_flush(dev, NON_PMD_THREAD_TX_QUEUE);
-}
+ dropped++;
+ continue;
+ }
-static int
-netdev_dpdk_send(struct netdev *netdev,
- struct ofpbuf *ofpbuf, bool may_steal)
-{
- struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
- int ret;
+ mbufs[newcnt] = rte_pktmbuf_alloc(dev->dpdk_mp->mp);
+
+ if (!mbufs[newcnt]) {
+ dropped += cnt - i;
+ break;
+ }
- if (ofpbuf_size(ofpbuf) > dev->max_packet_len) {
- VLOG_WARN_RL(&rl, "Too big size %d max_packet_len %d",
- (int)ofpbuf_size(ofpbuf) , dev->max_packet_len);
+ /* We have to do a copy for now */
+ memcpy(mbufs[newcnt]->pkt.data, ofpbuf_data(&pkts[i]->ofpbuf), size);
+ rte_pktmbuf_data_len(mbufs[newcnt]) = size;
+ rte_pktmbuf_pkt_len(mbufs[newcnt]) = size;
+
+ newcnt++;
+ }
+
+ if (OVS_UNLIKELY(dropped)) {
ovs_mutex_lock(&dev->mutex);
- dev->stats.tx_dropped++;
+ dev->stats.tx_dropped += dropped;
ovs_mutex_unlock(&dev->mutex);
+ }
- ret = E2BIG;
- goto out;
+ dpdk_queue_pkts(dev, qid, mbufs, newcnt);
+ dpdk_queue_flush(dev, qid);
+
+ if (!thread_is_pmd()) {
+ ovs_mutex_unlock(&nonpmd_mempool_mutex);
}
+}
- if (!may_steal || ofpbuf->source != OFPBUF_DPDK) {
- dpdk_do_tx_copy(netdev, (char *) ofpbuf_data(ofpbuf), ofpbuf_size(ofpbuf));
+static inline void
+netdev_dpdk_send__(struct netdev_dpdk *dev, int qid,
+ struct dpif_packet **pkts, int cnt, bool may_steal)
+{
+ int i;
+
+ if (OVS_UNLIKELY(!may_steal ||
+ pkts[0]->ofpbuf.source != OFPBUF_DPDK)) {
+ struct netdev *netdev = &dev->up;
+
+ dpdk_do_tx_copy(netdev, qid, pkts, cnt);
if (may_steal) {
- ofpbuf_delete(ofpbuf);
+ for (i = 0; i < cnt; i++) {
+ dpif_packet_delete(pkts[i]);
+ }
}
} else {
- int qid;
-
- qid = rte_lcore_id() % NR_QUEUE;
-
- dpdk_queue_pkt(dev, qid, (struct rte_mbuf *)ofpbuf);
+ int next_tx_idx = 0;
+ int dropped = 0;
+
+ for (i = 0; i < cnt; i++) {
+ int size = ofpbuf_size(&pkts[i]->ofpbuf);
+ if (OVS_UNLIKELY(size > dev->max_packet_len)) {
+ if (next_tx_idx != i) {
+ dpdk_queue_pkts(dev, qid,
+ (struct rte_mbuf **)&pkts[next_tx_idx],
+ i-next_tx_idx);
+ }
+
+ VLOG_WARN_RL(&rl, "Too big size %d max_packet_len %d",
+ (int)size , dev->max_packet_len);
+
+ dpif_packet_delete(pkts[i]);
+ dropped++;
+ next_tx_idx = i + 1;
+ }
+ }
+ if (next_tx_idx != cnt) {
+ dpdk_queue_pkts(dev, qid,
+ (struct rte_mbuf **)&pkts[next_tx_idx],
+ cnt-next_tx_idx);
+ }
+ if (OVS_UNLIKELY(dropped)) {
+ ovs_mutex_lock(&dev->mutex);
+ dev->stats.tx_dropped += dropped;
+ ovs_mutex_unlock(&dev->mutex);
+ }
}
- ret = 0;
+}
-out:
- return ret;
+static int
+netdev_dpdk_eth_send(struct netdev *netdev, int qid,
+ struct dpif_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
err = dpdk_eth_dev_init(dev);
if (err) {
-
dpdk_mp_put(mp);
dev->mtu = old_mtu;
dev->dpdk_mp = old_mp;
ovs_mutex_lock(&dev->mutex);
rte_eth_stats_get(dev->port_id, &rte_stats);
- *stats = dev->stats_offset;
+ 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;
- stats->rx_errors += rte_stats.ierrors;
- stats->tx_errors += rte_stats.oerrors;
- stats->multicast += rte_stats.imcasts;
-
- stats->tx_dropped += dev->stats.tx_dropped;
- ovs_mutex_unlock(&dev->mutex);
-
- return 0;
-}
-
-static int
-netdev_dpdk_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
-{
- struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
+ 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;
- ovs_mutex_lock(&dev->mutex);
- dev->stats_offset = *stats;
+ stats->tx_dropped = dev->stats.tx_dropped;
ovs_mutex_unlock(&dev->mutex);
return 0;
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;
if (dev->flags & NETDEV_UP) {
err = rte_eth_dev_start(dev->port_id);
if (err)
- return err;
+ return -err;
}
if (dev->flags & NETDEV_PROMISC) {
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);
unixctl_command_reply(conn, "OK");
}
+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);
+}
+
static int
dpdk_class_init(void)
{
int result;
- if (rte_eal_init_ret) {
- return 0;
+ result = rte_eal_pci_probe();
+ if (result) {
+ VLOG_ERR("Cannot probe PCI");
+ return -result;
}
- result = rte_pmd_init_all();
- if (result) {
- VLOG_ERR("Cannot init PMD");
- return result;
+ VLOG_INFO("Ethernet Device Count: %d", (int)rte_eth_dev_count());
+
+ return 0;
+}
+
+/* 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[10];
+ int err;
+
+ ivshmem = dpdk_rte_mzalloc(sizeof *ivshmem);
+ if (ivshmem == NULL) {
+ return ENOMEM;
}
- result = rte_eal_pci_probe();
- if (result) {
- VLOG_ERR("Cannot probe PCI");
- return result;
+ /* XXX: Add support for multiquque ring. */
+ err = snprintf(ring_name, 10, "%s_tx", dev_name);
+ if (err < 0) {
+ return -err;
}
- if (rte_eth_dev_count() < 1) {
- VLOG_ERR("No Ethernet devices found. Try assigning ports to UIO.");
+ /* Create single consumer/producer rings, netdev does explicit locking. */
+ ivshmem->cring_tx = rte_ring_create(ring_name, DPDK_RING_SIZE, SOCKET0,
+ RING_F_SP_ENQ | RING_F_SC_DEQ);
+ if (ivshmem->cring_tx == NULL) {
+ rte_free(ivshmem);
+ return ENOMEM;
}
- VLOG_INFO("Ethernet Device Count: %d", (int)rte_eth_dev_count());
+ err = snprintf(ring_name, 10, "%s_rx", dev_name);
+ if (err < 0) {
+ return -err;
+ }
- list_init(&dpdk_list);
- list_init(&dpdk_mp_list);
+ /* Create single consumer/producer rings, netdev does explicit locking. */
+ ivshmem->cring_rx = rte_ring_create(ring_name, DPDK_RING_SIZE, SOCKET0,
+ RING_F_SP_ENQ | RING_F_SC_DEQ);
+ if (ivshmem->cring_rx == NULL) {
+ rte_free(ivshmem);
+ return ENOMEM;
+ }
- unixctl_command_register("netdev-dpdk/set-admin-state",
- "[netdev] up|down", 1, 2,
- netdev_dpdk_set_admin_state, NULL);
+ err = rte_eth_from_rings(dev_name, &ivshmem->cring_rx, 1,
+ &ivshmem->cring_tx, 1, SOCKET0);
- ovs_thread_create("dpdk_watchdog", dpdk_watchdog, NULL);
+ 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:\n", 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 OVS_UNUSED,
+ struct dpif_packet **pkts, int cnt, bool may_steal)
+{
+ struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
+
+ /* DPDK Rings have a single TX queue, Therefore needs locking. */
+ rte_spinlock_lock(&dev->dpdkr_tx_lock);
+ netdev_dpdk_send__(dev, 0, pkts, cnt, may_steal);
+ rte_spinlock_unlock(&dev->dpdkr_tx_lock);
+ 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);
+
+unlock_dpdk:
+ ovs_mutex_unlock(&dpdk_mutex);
+ return err;
+}
+
+#define NETDEV_DPDK_CLASS(NAME, INIT, CONSTRUCT, MULTIQ, SEND) \
+{ \
+ NAME, \
+ INIT, /* init */ \
+ NULL, /* netdev_dpdk_run */ \
+ NULL, /* netdev_dpdk_wait */ \
+ \
+ netdev_dpdk_alloc, \
+ CONSTRUCT, \
+ netdev_dpdk_destruct, \
+ netdev_dpdk_dealloc, \
+ netdev_dpdk_get_config, \
+ NULL, /* 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, \
+ netdev_dpdk_get_carrier, \
+ netdev_dpdk_get_carrier_resets, \
+ netdev_dpdk_set_miimon, \
+ netdev_dpdk_get_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, /* rx_wait */ \
+ NULL, /* rxq_drain */ \
+}
int
dpdk_init(int argc, char **argv)
{
int result;
- if (strcmp(argv[1], "--dpdk"))
+ if (argc < 2 || strcmp(argv[1], "--dpdk"))
return 0;
+ /* Make sure program name passed to rte_eal_init() is vswitchd. */
+ argv[1] = argv[0];
+
argc--;
argv++;
/* Make sure things are initialized ... */
result = rte_eal_init(argc, argv);
- if (result < 0)
+ if (result < 0) {
ovs_abort(result, "Cannot init EAL\n");
+ }
- rte_memzone_dump();
+ rte_memzone_dump(stdout);
rte_eal_init_ret = 0;
- return result;
+ if (argc > result) {
+ argv[result] = argv[0];
+ }
+
+ /* We are called from the main thread here */
+ thread_set_nonpmd();
+
+ return result + 1;
}
+const struct netdev_class dpdk_class =
+ NETDEV_DPDK_CLASS(
+ "dpdk",
+ dpdk_class_init,
+ netdev_dpdk_construct,
+ netdev_dpdk_set_multiq,
+ netdev_dpdk_eth_send);
+
+const struct netdev_class dpdk_ring_class =
+ NETDEV_DPDK_CLASS(
+ "dpdkr",
+ NULL,
+ netdev_dpdk_ring_construct,
+ NULL,
+ netdev_dpdk_ring_send);
+
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);
+ ovsthread_once_done(&once);
+ }
}
int
VLOG_ERR("Thread affinity error %d",err);
return err;
}
+ /* lcore_id 0 is reseved for use by non pmd threads. */
+ ovs_assert(cpu);
RTE_PER_LCORE(_lcore_id) = cpu;
return 0;
}
+
+void
+thread_set_nonpmd(void)
+{
+ /* We have to use 0 to allow non pmd threads to perform certain DPDK
+ * operations, like rte_eth_dev_configure(). */
+ RTE_PER_LCORE(_lcore_id) = 0;
+}
+
+static bool
+thread_is_pmd(void)
+{
+ return rte_lcore_id() != 0;
+}
projects / cascardo / ovs.git / blobdiff