X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fdevices%2Fdpdk%2Fnode.c;h=a58c8d51917150fbd56d8f75ad7dee0beed08fa9;hb=f530a5526a1f501462ff4247a5bb38e80c13678d;hp=d1db5e2316578f825c2a09d34235daa34fc42b50;hpb=6398397125e1d37a9f9463351e537eb4012baba7;p=vpp.git diff --git a/vnet/vnet/devices/dpdk/node.c b/vnet/vnet/devices/dpdk/node.c index d1db5e23165..a58c8d51917 100644 --- a/vnet/vnet/devices/dpdk/node.c +++ b/vnet/vnet/devices/dpdk/node.c @@ -303,70 +303,6 @@ dpdk_rx_burst (dpdk_main_t * dm, dpdk_device_t * xd, u16 queue_id) break; } } -#if DPDK_VHOST_USER - else if (xd->flags & DPDK_DEVICE_FLAG_VHOST_USER) - { - vlib_main_t *vm = vlib_get_main (); - vlib_buffer_main_t *bm = vm->buffer_main; - unsigned socket_id = rte_socket_id (); - u32 offset = 0; - - offset = queue_id * VIRTIO_QNUM; - - struct vhost_virtqueue *vq = - xd->vu_vhost_dev.virtqueue[offset + VIRTIO_TXQ]; - - if (PREDICT_FALSE (!vq->enabled)) - return 0; - - struct rte_mbuf **pkts = xd->rx_vectors[queue_id]; - while (n_left) - { - n_this_chunk = rte_vhost_dequeue_burst (&xd->vu_vhost_dev, - offset + VIRTIO_TXQ, - bm->pktmbuf_pools - [socket_id], - pkts + n_buffers, n_left); - n_buffers += n_this_chunk; - n_left -= n_this_chunk; - if (n_this_chunk == 0) - break; - } - - int i; - u32 bytes = 0; - for (i = 0; i < n_buffers; i++) - { - struct rte_mbuf *buff = pkts[i]; - bytes += rte_pktmbuf_data_len (buff); - } - - f64 now = vlib_time_now (vm); - - dpdk_vu_vring *vring = NULL; - /* send pending interrupts if needed */ - if (dpdk_vhost_user_want_interrupt (xd, offset + VIRTIO_TXQ)) - { - vring = &(xd->vu_intf->vrings[offset + VIRTIO_TXQ]); - vring->n_since_last_int += n_buffers; - - if ((vring->n_since_last_int && (vring->int_deadline < now)) - || (vring->n_since_last_int > dm->conf->vhost_coalesce_frames)) - dpdk_vhost_user_send_interrupt (vm, xd, offset + VIRTIO_TXQ); - } - - vring = &(xd->vu_intf->vrings[offset + VIRTIO_RXQ]); - vring->packets += n_buffers; - vring->bytes += bytes; - - if (dpdk_vhost_user_want_interrupt (xd, offset + VIRTIO_RXQ)) - { - if (vring->n_since_last_int && (vring->int_deadline < now)) - dpdk_vhost_user_send_interrupt (vm, xd, offset + VIRTIO_RXQ); - } - - } -#endif else { ASSERT (0);