X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fpg%2Finput.c;h=bbcd34e763af592fbab29ee9d49b0de08ada7bfd;hb=e5d34919b;hp=6ef813f58076f0940ade6a558fb56b36e2f0a160;hpb=5de3fec531691a81b3f77ed965488dc8dbf1e9a1;p=vpp.git diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c index 6ef813f5807..bbcd34e763a 100644 --- a/src/vnet/pg/input.c +++ b/src/vnet/pg/input.c @@ -50,6 +50,9 @@ #include #include #include +#include +#include +#include #include static int @@ -1108,7 +1111,7 @@ init_buffers_inline (vlib_main_t * vm, vnet_buffer (b1)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX]; vnet_buffer (b0)->sw_if_index[VLIB_TX] = - vnet_buffer (b1)->sw_if_index[VLIB_TX] = (u32) ~ 0; + vnet_buffer (b1)->sw_if_index[VLIB_TX] = s->sw_if_index[VLIB_TX]; if (set_data) { @@ -1133,8 +1136,7 @@ init_buffers_inline (vlib_main_t * vm, b0 = vlib_get_buffer (vm, bi0); vnet_buffer (b0)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX]; - /* s->sw_if_index[VLIB_TX]; */ - vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0; + vnet_buffer (b0)->sw_if_index[VLIB_TX] = s->sw_if_index[VLIB_TX]; if (set_data) clib_memcpy_fast (b0->data, data, n_data); @@ -1199,7 +1201,7 @@ pg_stream_fill_replay (pg_main_t * pg, pg_stream_t * s, u32 n_alloc) u32 *buffers; vlib_main_t *vm = vlib_get_main (); vnet_main_t *vnm = vnet_get_main (); - u32 buf_sz = vlib_bufer_get_default_size (vm); + u32 buf_sz = vlib_buffer_get_default_data_size (vm); vnet_interface_main_t *im = &vnm->interface_main; vnet_sw_interface_t *si; @@ -1266,7 +1268,7 @@ pg_stream_fill_replay (pg_main_t * pg, pg_stream_t * s, u32 n_alloc) b = vlib_get_buffer (vm, buffers[current_buffer_index]); clib_memcpy_fast (b->data, d0 + data_offset, bytes_this_chunk); vnet_buffer (b)->sw_if_index[VLIB_RX] = s->sw_if_index[VLIB_RX]; - vnet_buffer (b)->sw_if_index[VLIB_TX] = (u32) ~ 0; + vnet_buffer (b)->sw_if_index[VLIB_TX] = s->sw_if_index[VLIB_TX]; b->flags = 0; b->next_buffer = 0; b->current_data = 0; @@ -1427,7 +1429,7 @@ format_pg_input_trace (u8 * s, va_list * va) s = format (s, "stream %d", t->stream_index); s = format (s, ", %d bytes", t->packet_length); - s = format (s, ", %d sw_if_index", t->sw_if_index); + s = format (s, ", sw_if_index %d", t->sw_if_index); s = format (s, "\n%U%U", format_white_space, indent, format_vnet_buffer, &t->buffer); @@ -1450,16 +1452,14 @@ format_pg_input_trace (u8 * s, va_list * va) static void pg_input_trace (pg_main_t * pg, - vlib_node_runtime_t * node, - pg_stream_t * s, u32 * buffers, u32 n_buffers) + vlib_node_runtime_t * node, u32 stream_index, u32 next_index, + u32 * buffers, u32 n_buffers) { vlib_main_t *vm = vlib_get_main (); - u32 *b, n_left, stream_index, next_index; + u32 *b, n_left; n_left = n_buffers; b = buffers; - stream_index = s - pg->streams; - next_index = s->next_index; while (n_left >= 2) { @@ -1526,6 +1526,86 @@ pg_input_trace (pg_main_t * pg, } } +static_always_inline void +fill_gso_buffer_flags (vlib_main_t * vm, u32 * buffers, u32 n_buffers, + u32 packet_data_size) +{ + + for (int i = 0; i < n_buffers; i++) + { + vlib_buffer_t *b0 = vlib_get_buffer (vm, buffers[i]); + u8 l4_proto = 0; + u8 l4_hdr_sz = 0; + + 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 | VNET_BUFFER_F_GSO); + 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); + tcp->checksum = 0; + vnet_buffer2 (b0)->gso_l4_hdr_sz = l4_hdr_sz; + vnet_buffer2 (b0)->gso_size = packet_data_size; + } + 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); + vnet_buffer2 (b0)->gso_l4_hdr_sz = sizeof (*udp); + udp->checksum = 0; + } + } +} + static uword pg_generate_packets (vlib_node_runtime_t * node, pg_main_t * pg, @@ -1541,6 +1621,7 @@ pg_generate_packets (vlib_node_runtime_t * node, u8 feature_arc_index = fm->device_input_feature_arc_index; cm = &fm->feature_config_mains[feature_arc_index]; u32 current_config_index = ~(u32) 0; + pg_interface_t *pi = pool_elt_at_index (pg->interfaces, s->pg_if_index); int i; bi0 = s->buffer_indices; @@ -1567,16 +1648,15 @@ pg_generate_packets (vlib_node_runtime_t * node, vlib_next_frame_t *nf; vlib_frame_t *f; ethernet_input_frame_t *ef; - pg_interface_t *pi; vlib_get_new_next_frame (vm, node, next_index, to_next, n_left); nf = vlib_node_runtime_get_next_frame (vm, node, next_index); - f = vlib_get_frame (vm, nf->frame_index); + f = vlib_get_frame (vm, nf->frame); f->flags = ETH_INPUT_FRAME_F_SINGLE_SW_IF_IDX; ef = vlib_frame_scalar_args (f); - pi = pool_elt_at_index (pg->interfaces, s->pg_if_index); ef->sw_if_index = pi->sw_if_index; ef->hw_if_index = pi->hw_if_index; + vlib_frame_no_append (f); } else vlib_get_next_frame (vm, node, next_index, to_next, n_left); @@ -1617,11 +1697,14 @@ pg_generate_packets (vlib_node_runtime_t * node, vnet_buffer (b)->feature_arc_index = feature_arc_index; } + if (pi->gso_enabled) + fill_gso_buffer_flags (vm, to_next, n_this_frame, pi->gso_size); + n_trace = vlib_get_trace_count (vm, node); if (n_trace > 0) { u32 n = clib_min (n_trace, n_this_frame); - pg_input_trace (pg, node, s, to_next, n); + pg_input_trace (pg, node, s - pg->streams, next_index, to_next, n); vlib_set_trace_count (vm, node, n_trace - n); } n_packets_to_generate -= n_this_frame; @@ -1632,7 +1715,7 @@ pg_generate_packets (vlib_node_runtime_t * node, int i; vlib_buffer_t *b; - for (i = 0; i < VLIB_FRAME_SIZE - n_left; i++) + for (i = 0; i < n_this_frame; i++) { b = vlib_get_buffer (vm, to_next[i]); ASSERT ((b->flags & VLIB_BUFFER_NEXT_PRESENT) == 0 || @@ -1682,8 +1765,8 @@ pg_input_stream (vlib_node_runtime_t * node, pg_main_t * pg, pg_stream_t * s) n_packets = s->n_packets_limit - s->n_packets_generated; /* Generate up to one frame's worth of packets. */ - if (n_packets > VLIB_FRAME_SIZE) - n_packets = VLIB_FRAME_SIZE; + if (n_packets > s->n_max_frame) + n_packets = s->n_max_frame; if (n_packets > 0) n_packets = pg_generate_packets (node, pg, s, n_packets); @@ -1717,6 +1800,7 @@ pg_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) /* *INDENT-OFF* */ VLIB_REGISTER_NODE (pg_input_node) = { .function = pg_input, + .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, .name = "pg-input", .sibling_of = "device-input", .type = VLIB_NODE_TYPE_INPUT,