diff options
Diffstat (limited to 'src/vnet/pg/input.c')
| -rw-r--r-- | src/vnet/pg/input.c | 74 |
1 files changed, 51 insertions, 23 deletions
diff --git a/src/vnet/pg/input.c b/src/vnet/pg/input.c index 321472c4d85..4f89c73a932 100644 --- a/src/vnet/pg/input.c +++ b/src/vnet/pg/input.c @@ -1407,6 +1407,7 @@ typedef struct u32 packet_length; u32 sw_if_index; + u32 next_index; /* Use pre data for packet data. */ vlib_buffer_t buffer; @@ -1422,6 +1423,7 @@ format_pg_input_trace (u8 * s, va_list * va) pg_stream_t *stream; vlib_node_t *n; u32 indent = format_get_indent (s); + const char *next_nodes[] = VNET_DEVICE_INPUT_NEXT_NODES; stream = 0; if (!pool_is_free_index (pg->streams, t->stream_index)) @@ -1434,6 +1436,10 @@ format_pg_input_trace (u8 * s, va_list * va) s = format (s, ", %d bytes", t->packet_length); s = format (s, ", sw_if_index %d", t->sw_if_index); + if (t->next_index < VNET_DEVICE_INPUT_N_NEXT_NODES) + s = format (s, ", next_node %s", next_nodes[t->next_index]); + else + s = format (s, ", next_node %d", t->next_index); s = format (s, "\n%U%U", format_white_space, indent, format_vnet_buffer_no_chain, &t->buffer); @@ -1497,6 +1503,9 @@ pg_input_trace (pg_main_t * pg, t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; t1->sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_RX]; + t0->next_index = next_index; + t1->next_index = next_index; + clib_memcpy_fast (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data)); clib_memcpy_fast (&t1->buffer, b1, @@ -1527,6 +1536,7 @@ pg_input_trace (pg_main_t * pg, t0->stream_index = stream_index; t0->packet_length = vlib_buffer_length_in_chain (vm, b0); t0->sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX]; + t0->next_index = next_index; clib_memcpy_fast (&t0->buffer, b0, sizeof (b0[0]) - sizeof (b0->pre_data)); clib_memcpy_fast (t0->buffer.pre_data, b0->data, @@ -1537,31 +1547,49 @@ pg_input_trace (pg_main_t * pg, } static_always_inline void -fill_buffer_offload_flags (vlib_main_t *vm, u32 *buffers, u32 n_buffers, - u32 buffer_oflags, int gso_enabled, u32 gso_size) +fill_buffer_offload_flags (vlib_main_t *vm, u32 next_index, u32 *buffers, + u32 n_buffers, u32 buffer_oflags, int gso_enabled, + u32 gso_size) { for (int i = 0; i < n_buffers; i++) { vlib_buffer_t *b0 = vlib_get_buffer (vm, buffers[i]); u8 l4_proto = 0; vnet_buffer_oflags_t oflags = 0; + u16 ethertype; + u16 l2hdr_sz; - 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)) + /* pg can typically injects to ethernet-input or ip4/6-input */ + if (VNET_DEVICE_INPUT_NEXT_IP4_INPUT == next_index) + { + ethertype = ETHERNET_TYPE_IP4; + l2hdr_sz = 0; + } + else if (VNET_DEVICE_INPUT_NEXT_IP6_INPUT == next_index) { - ethernet_vlan_header_t *vlan = (ethernet_vlan_header_t *) (eh + 1); + ethertype = ETHERNET_TYPE_IP6; + l2hdr_sz = 0; + } + else + { + /* default to ethernet */ + ethernet_header_t *eh = (ethernet_header_t *) b0->data; + ethertype = clib_net_to_host_u16 (eh->type); + l2hdr_sz = sizeof (ethernet_header_t); - ethertype = clib_net_to_host_u16 (vlan->type); - l2hdr_sz += sizeof (*vlan); - if (ethertype == ETHERNET_TYPE_VLAN) + if (ethernet_frame_is_tagged (ethertype)) { - vlan++; + 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); + } } } @@ -1570,8 +1598,7 @@ fill_buffer_offload_flags (vlib_main_t *vm, u32 *buffers, u32 n_buffers, if (PREDICT_TRUE (ethertype == ETHERNET_TYPE_IP4)) { - ip4_header_t *ip4 = - (ip4_header_t *) (vlib_buffer_get_current (b0) + l2hdr_sz); + ip4_header_t *ip4 = (ip4_header_t *) (b0->data + l2hdr_sz); vnet_buffer (b0)->l4_hdr_offset = l2hdr_sz + ip4_header_bytes (ip4); l4_proto = ip4->protocol; b0->flags |= @@ -1583,8 +1610,7 @@ fill_buffer_offload_flags (vlib_main_t *vm, u32 *buffers, u32 n_buffers, } else if (PREDICT_TRUE (ethertype == ETHERNET_TYPE_IP6)) { - ip6_header_t *ip6 = - (ip6_header_t *) (vlib_buffer_get_current (b0) + l2hdr_sz); + ip6_header_t *ip6 = (ip6_header_t *) (b0->data + l2hdr_sz); vnet_buffer (b0)->l4_hdr_offset = l2hdr_sz + sizeof (ip6_header_t); /* FIXME IPv6 EH traversal */ l4_proto = ip6->protocol; @@ -1604,8 +1630,7 @@ fill_buffer_offload_flags (vlib_main_t *vm, u32 *buffers, u32 n_buffers, { b0->flags |= VNET_BUFFER_F_GSO; tcp_header_t *tcp = - (tcp_header_t *) (vlib_buffer_get_current (b0) + - vnet_buffer (b0)->l4_hdr_offset); + (tcp_header_t *) (b0->data + vnet_buffer (b0)->l4_hdr_offset); vnet_buffer2 (b0)->gso_l4_hdr_sz = tcp_header_bytes (tcp); vnet_buffer2 (b0)->gso_size = gso_size; } @@ -1723,7 +1748,11 @@ pg_generate_packets (vlib_node_runtime_t * node, if (pi->gso_enabled || (s->buffer_flags & VNET_BUFFER_F_OFFLOAD)) { - fill_buffer_offload_flags (vm, to_next, n_this_frame, + /* we use s->next_index and not next_index on purpose here: we want + * the original node set by the user (typically ethernet-input, + * ip4-input or ip6-input) whereas next_index can be overwritten by + * device-input features */ + fill_buffer_offload_flags (vm, s->next_index, to_next, n_this_frame, s->buffer_oflags, pi->gso_enabled, pi->gso_size); } @@ -1731,9 +1760,8 @@ pg_generate_packets (vlib_node_runtime_t * node, n_trace = vlib_get_trace_count (vm, node); if (PREDICT_FALSE (n_trace > 0)) { - n_trace = - pg_input_trace (pg, node, s - pg->streams, next_index, to_next, - n_this_frame, n_trace); + n_trace = pg_input_trace (pg, node, s - pg->streams, next_index, + to_next, n_this_frame, n_trace); vlib_set_trace_count (vm, node, n_trace); } n_packets_to_generate -= n_this_frame; |