#include <net/if.h>
#include <linux/if_tun.h>
#include <sys/ioctl.h>
-#include <linux/virtio_net.h>
-#include <linux/vhost.h>
#include <sys/eventfd.h>
#include <vlib/vlib.h>
#include <vnet/feature/feature.h>
#include <vnet/ip/ip4_packet.h>
#include <vnet/ip/ip6_packet.h>
+#include <vnet/udp/udp_packet.h>
#include <vnet/devices/virtio/virtio.h>
typedef enum
{
-#define _(f,s) TAP_INPUT_ERROR_##f,
+#define _(f,s) VIRTIO_INPUT_ERROR_##f,
foreach_virtio_input_error
#undef _
- TAP_INPUT_N_ERROR,
+ VIRTIO_INPUT_N_ERROR,
} virtio_input_error_t;
static char *virtio_input_error_strings[] = {
}
static_always_inline void
-virtio_refill_vring (vlib_main_t * vm, virtio_vring_t * vring)
+virtio_refill_vring (vlib_main_t * vm, virtio_if_t * vif,
+ virtio_vring_t * vring, const int hdr_sz)
{
- const int hdr_sz = sizeof (struct virtio_net_hdr_v1);
u16 used, next, avail, n_slots;
u16 sz = vring->size;
u16 mask = sz - 1;
+more:
used = vring->desc_in_use;
if (sz - used < sz / 8)
return;
- n_slots = sz - used;
+ /* deliver free buffers in chunks of 64 */
+ n_slots = clib_min (sz - used, 64);
+
next = vring->desc_next;
avail = vring->avail->idx;
- n_slots = vlib_buffer_alloc_to_ring (vm, vring->buffers, next, vring->size,
- n_slots);
+ n_slots =
+ vlib_buffer_alloc_to_ring_from_pool (vm, vring->buffers, next,
+ vring->size, n_slots,
+ vring->buffer_pool_index);
+
+ if (n_slots == 0)
+ return;
while (n_slots)
{
struct vring_desc *d = &vring->desc[next];;
vlib_buffer_t *b = vlib_get_buffer (vm, vring->buffers[next]);
- d->addr = pointer_to_uword (vlib_buffer_get_current (b)) - hdr_sz;
- d->len = VLIB_BUFFER_DATA_SIZE + hdr_sz;
+ /*
+ * current_data may not be initialized with 0 and may contain
+ * previous offset. Here we want to make sure, it should be 0
+ * initialized.
+ */
+ b->current_data = 0;
+ b->current_data -= hdr_sz;
+ memset (vlib_buffer_get_current (b), 0, hdr_sz);
+ d->addr =
+ ((vif->type == VIRTIO_IF_TYPE_PCI) ? vlib_buffer_get_current_pa (vm,
+ b) :
+ pointer_to_uword (vlib_buffer_get_current (b)));
+ d->len = vlib_buffer_get_default_data_size (vm) + hdr_sz;
d->flags = VRING_DESC_F_WRITE;
vring->avail->ring[avail & mask] = next;
avail++;
if ((vring->used->flags & VIRTIO_RING_FLAG_MASK_INT) == 0)
{
- u64 b = 1;
- CLIB_UNUSED (int r) = write (vring->kick_fd, &b, sizeof (b));
+ virtio_kick (vm, vring, vif);
+ }
+ goto more;
+}
+
+static_always_inline void
+virtio_needs_csum (vlib_buffer_t * b0, struct virtio_net_hdr_v1 *hdr,
+ u8 * l4_proto, u8 * l4_hdr_sz)
+{
+ if (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM)
+
+ {
+ ethernet_header_t *eh =
+ (ethernet_header_t *) vlib_buffer_get_current (b0);
+ u16 ethertype = clib_net_to_host_u16 (eh->type);
+ u16 l2hdr_sz = sizeof (ethernet_header_t);
+
+ if (ethernet_frame_is_tagged (ethertype))
+ {
+ ethernet_vlan_header_t *vlan = (ethernet_vlan_header_t *) (eh + 1);
+
+ ethertype = clib_net_to_host_u16 (vlan->type);
+ l2hdr_sz += sizeof (*vlan);
+ if (ethertype == ETHERNET_TYPE_VLAN)
+ {
+ vlan++;
+ ethertype = clib_net_to_host_u16 (vlan->type);
+ l2hdr_sz += sizeof (*vlan);
+ }
+ }
+
+ vnet_buffer (b0)->l2_hdr_offset = 0;
+ vnet_buffer (b0)->l3_hdr_offset = l2hdr_sz;
+ if (PREDICT_TRUE (ethertype == ETHERNET_TYPE_IP4))
+ {
+ ip4_header_t *ip4 =
+ (ip4_header_t *) (vlib_buffer_get_current (b0) + l2hdr_sz);
+ vnet_buffer (b0)->l4_hdr_offset = l2hdr_sz + ip4_header_bytes (ip4);
+ *l4_proto = ip4->protocol;
+ b0->flags |=
+ (VNET_BUFFER_F_IS_IP4 | VNET_BUFFER_F_OFFLOAD_IP_CKSUM);
+ b0->flags |=
+ (VNET_BUFFER_F_L2_HDR_OFFSET_VALID
+ | VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
+ VNET_BUFFER_F_L4_HDR_OFFSET_VALID);
+ }
+ else if (PREDICT_TRUE (ethertype == ETHERNET_TYPE_IP6))
+ {
+ ip6_header_t *ip6 =
+ (ip6_header_t *) (vlib_buffer_get_current (b0) + l2hdr_sz);
+ vnet_buffer (b0)->l4_hdr_offset = l2hdr_sz + sizeof (ip6_header_t);
+ /* FIXME IPv6 EH traversal */
+ *l4_proto = ip6->protocol;
+ b0->flags |= (VNET_BUFFER_F_IS_IP6 |
+ VNET_BUFFER_F_L2_HDR_OFFSET_VALID
+ | VNET_BUFFER_F_L3_HDR_OFFSET_VALID |
+ VNET_BUFFER_F_L4_HDR_OFFSET_VALID);
+ }
+ if (*l4_proto == IP_PROTOCOL_TCP)
+ {
+ b0->flags |= VNET_BUFFER_F_OFFLOAD_TCP_CKSUM;
+ tcp_header_t *tcp = (tcp_header_t *) (vlib_buffer_get_current (b0) +
+ vnet_buffer
+ (b0)->l4_hdr_offset);
+ *l4_hdr_sz = tcp_header_bytes (tcp);
+ }
+ else if (*l4_proto == IP_PROTOCOL_UDP)
+ {
+ b0->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
+ udp_header_t *udp = (udp_header_t *) (vlib_buffer_get_current (b0) +
+ vnet_buffer
+ (b0)->l4_hdr_offset);
+ *l4_hdr_sz = sizeof (*udp);
+ }
+ }
+
+}
+
+static_always_inline void
+fill_gso_buffer_flags (vlib_buffer_t * b0, struct virtio_net_hdr_v1 *hdr,
+ u8 l4_proto, u8 l4_hdr_sz)
+{
+ if (hdr->gso_type == VIRTIO_NET_HDR_GSO_TCPV4)
+ {
+ ASSERT (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM);
+ vnet_buffer2 (b0)->gso_size = hdr->gso_size;
+ vnet_buffer2 (b0)->gso_l4_hdr_sz = l4_hdr_sz;
+ b0->flags |= VNET_BUFFER_F_GSO | VNET_BUFFER_F_IS_IP4;
+ }
+ if (hdr->gso_type == VIRTIO_NET_HDR_GSO_TCPV6)
+ {
+ ASSERT (hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM);
+ vnet_buffer2 (b0)->gso_size = hdr->gso_size;
+ vnet_buffer2 (b0)->gso_l4_hdr_sz = l4_hdr_sz;
+ b0->flags |= VNET_BUFFER_F_GSO | VNET_BUFFER_F_IS_IP6;
}
}
static_always_inline uword
virtio_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
- vlib_frame_t * frame, virtio_if_t * vif, u16 qid)
+ vlib_frame_t * frame, virtio_if_t * vif, u16 qid,
+ int gso_enabled, int checksum_offload_enabled)
{
vnet_main_t *vnm = vnet_get_main ();
u32 thread_index = vm->thread_index;
uword n_trace = vlib_get_trace_count (vm, node);
- virtio_vring_t *vring = vec_elt_at_index (vif->vrings, 0);
+ virtio_vring_t *vring = vec_elt_at_index (vif->rxq_vrings, qid);
u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
- const int hdr_sz = sizeof (struct virtio_net_hdr_v1);
+ const int hdr_sz = vif->virtio_net_hdr_sz;
u32 *to_next = 0;
u32 n_rx_packets = 0;
u32 n_rx_bytes = 0;
u16 last = vring->last_used_idx;
u16 n_left = vring->used->idx - last;
+ if ((vring->used->flags & VIRTIO_RING_FLAG_MASK_INT) == 0 &&
+ vring->last_kick_avail_idx != vring->avail->idx)
+ virtio_kick (vm, vring, vif);
+
if (n_left == 0)
goto refill;
while (n_left && n_left_to_next)
{
- u16 num_buffers;
+ u8 l4_proto = 0, l4_hdr_sz = 0;
+ u16 num_buffers = 1;
struct vring_used_elem *e = &vring->used->ring[last & mask];
struct virtio_net_hdr_v1 *hdr;
u16 slot = e->id;
u16 len = e->len - hdr_sz;
u32 bi0 = vring->buffers[slot];
vlib_buffer_t *b0 = vlib_get_buffer (vm, bi0);
- hdr = vlib_buffer_get_current (b0) - hdr_sz;
- num_buffers = hdr->num_buffers;
+ hdr = vlib_buffer_get_current (b0);
+ if (hdr_sz == sizeof (struct virtio_net_hdr_v1))
+ num_buffers = hdr->num_buffers;
- b0->current_data = 0;
+ b0->current_data += hdr_sz;
b0->current_length = len;
b0->total_length_not_including_first_buffer = 0;
b0->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID;
+
+ if (checksum_offload_enabled)
+ virtio_needs_csum (b0, hdr, &l4_proto, &l4_hdr_sz);
+
+ if (gso_enabled)
+ fill_gso_buffer_flags (b0, hdr, l4_proto, l4_hdr_sz);
+
vnet_buffer (b0)->sw_if_index[VLIB_RX] = vif->sw_if_index;
vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
cb = vlib_get_buffer (vm, cbi);
/* current buffer */
- cb->current_data = -hdr_sz;
cb->current_length = e->len;
/* previous buffer */
if (PREDICT_FALSE (vif->per_interface_next_index != ~0))
next0 = vif->per_interface_next_index;
- else
- /* redirect if feature path enabled */
- vnet_feature_start_device_input_x1 (vif->sw_if_index, &next0, b0);
+
+ /* redirect if feature path enabled */
+ vnet_feature_start_device_input_x1 (vif->sw_if_index, &next0, b0);
+
/* trace */
VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
{
virtio_input_trace_t *tr;
vlib_trace_buffer (vm, node, next0, b0,
- /* follow_chain */ 0);
+ /* follow_chain */ 1);
vlib_set_trace_count (vm, node, --n_trace);
tr = vlib_add_trace (vm, node, b0, sizeof (*tr));
tr->next_index = next0;
tr->hw_if_index = vif->hw_if_index;
- tr->len = len;
- clib_memcpy (&tr->hdr, hdr, hdr_sz);
+ tr->len = len + b0->total_length_not_including_first_buffer;
+ clib_memcpy_fast (&tr->hdr, hdr, hdr_sz);
}
/* enqueue buffer */
/* next packet */
n_rx_packets++;
- n_rx_bytes += len;
+ n_rx_bytes += (len + b0->total_length_not_including_first_buffer);
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
vlib_increment_combined_counter (vnm->interface_main.combined_sw_if_counters
+ VNET_INTERFACE_COUNTER_RX, thread_index,
- vif->hw_if_index, n_rx_packets,
+ vif->sw_if_index, n_rx_packets,
n_rx_bytes);
refill:
- virtio_refill_vring (vm, vring);
+ virtio_refill_vring (vm, vif, vring, hdr_sz);
return n_rx_packets;
}
-static uword
-virtio_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
- vlib_frame_t * frame)
+VLIB_NODE_FN (virtio_input_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
u32 n_rx = 0;
virtio_main_t *nm = &virtio_main;
foreach_device_and_queue (dq, rt->devices_and_queues)
{
- virtio_if_t *mif;
- mif = vec_elt_at_index (nm->interfaces, dq->dev_instance);
- if (mif->flags & VIRTIO_IF_FLAG_ADMIN_UP)
+ virtio_if_t *vif;
+ vif = vec_elt_at_index (nm->interfaces, dq->dev_instance);
+ if (vif->flags & VIRTIO_IF_FLAG_ADMIN_UP)
{
- n_rx += virtio_device_input_inline (vm, node, frame, mif,
- dq->queue_id);
+ if (vif->gso_enabled)
+ n_rx += virtio_device_input_inline (vm, node, frame, vif,
+ dq->queue_id, 1, 1);
+ else if (vif->csum_offload_enabled)
+ n_rx += virtio_device_input_inline (vm, node, frame, vif,
+ dq->queue_id, 0, 1);
+ else
+ n_rx += virtio_device_input_inline (vm, node, frame, vif,
+ dq->queue_id, 0, 0);
}
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (virtio_input_node) = {
- .function = virtio_input_fn,
.name = "virtio-input",
.sibling_of = "device-input",
.format_trace = format_virtio_input_trace,
+ .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED,
.type = VLIB_NODE_TYPE_INPUT,
.state = VLIB_NODE_STATE_INTERRUPT,
- .n_errors = TAP_INPUT_N_ERROR,
+ .n_errors = VIRTIO_INPUT_N_ERROR,
.error_strings = virtio_input_error_strings,
};
-
-VLIB_NODE_FUNCTION_MULTIARCH (virtio_input_node, virtio_input_fn)
/* *INDENT-ON* */
/*
Code Review / vpp.git / blobdiff