#include <vnet/ethernet/ethernet.h>
#include <vnet/devices/devices.h>
#include <vnet/feature/feature.h>
+#include <vnet/gso/gro_func.h>
#include <vnet/ip/ip4_packet.h>
#include <vnet/ip/ip6_packet.h>
#include <vnet/udp/udp_packet.h>
#define foreach_virtio_input_error \
+ _(BUFFER_ALLOC, "buffer alloc error") \
_(UNKNOWN, "unknown")
typedef enum
static_always_inline void
virtio_refill_vring (vlib_main_t * vm, virtio_if_t * vif,
virtio_if_type_t type, virtio_vring_t * vring,
- const int hdr_sz)
+ const int hdr_sz, u32 node_index)
{
- u16 used, next, avail, n_slots;
+ u16 used, next, avail, n_slots, n_refill;
u16 sz = vring->size;
u16 mask = sz - 1;
return;
/* deliver free buffers in chunks of 64 */
- n_slots = clib_min (sz - used, 64);
+ n_refill = clib_min (sz - used, 64);
next = vring->desc_next;
avail = vring->avail->idx;
n_slots =
vlib_buffer_alloc_to_ring_from_pool (vm, vring->buffers, next,
- vring->size, n_slots,
+ vring->size, n_refill,
vring->buffer_pool_index);
- if (n_slots == 0)
- return;
+ if (PREDICT_FALSE (n_slots != n_refill))
+ {
+ vlib_error_count (vm, node_index,
+ VIRTIO_INPUT_ERROR_BUFFER_ALLOC, n_refill - n_slots);
+ if (n_slots == 0)
+ return;
+ }
while (n_slots)
{
u32 thread_index = vm->thread_index;
uword n_trace = vlib_get_trace_count (vm, node);
virtio_vring_t *vring = vec_elt_at_index (vif->rxq_vrings, qid);
+ u16 txq_id = thread_index % vif->num_txqs;
+ virtio_vring_t *txq_vring = vec_elt_at_index (vif->txq_vrings, txq_id);
u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
const int hdr_sz = vif->virtio_net_hdr_sz;
u32 *to_next = 0;
u16 last = vring->last_used_idx;
u16 n_left = vring->used->idx - last;
+ if (vif->packet_coalesce)
+ {
+ vnet_gro_flow_table_schedule_node_on_dispatcher (vm,
+ txq_vring->flow_table);
+ }
+
if ((vring->used->flags & VIRTIO_RING_FLAG_MASK_INT) == 0 &&
vring->last_kick_avail_idx != vring->avail->idx)
virtio_kick (vm, vring, vif);
n_rx_bytes);
refill:
- virtio_refill_vring (vm, vif, type, vring, hdr_sz);
+ virtio_refill_vring (vm, vif, type, vring, hdr_sz, node->node_index);
return n_rx_packets;
}