#undef _
};
-STATIC_ASSERT (VNET_DEVICE_INPUT_NEXT_IP4_INPUT - 1 ==
- VNET_DEVICE_INPUT_NEXT_IP4_NCS_INPUT,
- "IP4_INPUT must follow IP4_NCS_INPUT");
-
-enum
-{
- DPDK_RX_F_CKSUM_GOOD = 7,
- DPDK_RX_F_CKSUM_BAD = 4,
- DPDK_RX_F_FDIR = 2,
-};
-
-/* currently we are just copying bit positions from DPDK, but that
- might change in future, in case we start to be interested in something
- stored in upper bytes. Currently we store only lower byte for perf reasons */
-STATIC_ASSERT (1 << DPDK_RX_F_CKSUM_GOOD == PKT_RX_IP_CKSUM_GOOD, "");
-STATIC_ASSERT (1 << DPDK_RX_F_CKSUM_BAD == PKT_RX_IP_CKSUM_BAD, "");
-STATIC_ASSERT (1 << DPDK_RX_F_FDIR == PKT_RX_FDIR, "");
-STATIC_ASSERT ((PKT_RX_IP_CKSUM_GOOD | PKT_RX_IP_CKSUM_BAD | PKT_RX_FDIR) <
+/* make sure all flags we need are stored in lower 8 bits */
+STATIC_ASSERT ((PKT_RX_IP_CKSUM_BAD | PKT_RX_FDIR) <
256, "dpdk flags not un lower byte, fix needed");
-always_inline u32
-dpdk_rx_next (vlib_node_runtime_t * node, u16 etype, u8 flags)
-{
- if (PREDICT_TRUE (etype == clib_host_to_net_u16 (ETHERNET_TYPE_IP4)))
- {
- /* keep it branchless */
- u32 is_good = (flags >> DPDK_RX_F_CKSUM_GOOD) & 1;
- return VNET_DEVICE_INPUT_NEXT_IP4_INPUT - is_good;
- }
- else if (PREDICT_TRUE (etype == clib_host_to_net_u16 (ETHERNET_TYPE_IP6)))
- return VNET_DEVICE_INPUT_NEXT_IP6_INPUT;
- else if (PREDICT_TRUE (etype == clib_host_to_net_u16 (ETHERNET_TYPE_MPLS)))
- return VNET_DEVICE_INPUT_NEXT_MPLS_INPUT;
- else
- return VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
-}
-
static_always_inline uword
dpdk_process_subseq_segs (vlib_main_t * vm, vlib_buffer_t * b,
- struct rte_mbuf * mb, vlib_buffer_free_list_t * fl)
+ struct rte_mbuf *mb, vlib_buffer_free_list_t * fl)
{
u8 nb_seg = 1;
struct rte_mbuf *mb_seg = 0;
CLIB_PREFETCH (b, CLIB_CACHE_LINE_BYTES, LOAD);
}
-static_always_inline void
-dpdk_prefetch_buffer_data_x4 (struct rte_mbuf *mb[])
-{
- vlib_buffer_t *b;
- b = vlib_buffer_from_rte_mbuf (mb[0]);
- CLIB_PREFETCH (b->data, CLIB_CACHE_LINE_BYTES, LOAD);
- b = vlib_buffer_from_rte_mbuf (mb[1]);
- CLIB_PREFETCH (b->data, CLIB_CACHE_LINE_BYTES, LOAD);
- b = vlib_buffer_from_rte_mbuf (mb[2]);
- CLIB_PREFETCH (b->data, CLIB_CACHE_LINE_BYTES, LOAD);
- b = vlib_buffer_from_rte_mbuf (mb[3]);
- CLIB_PREFETCH (b->data, CLIB_CACHE_LINE_BYTES, LOAD);
-}
-
/** \brief Main DPDK input node
@node dpdk-input
vlib_buffer_free_list_t *fl;
struct rte_mbuf **mb = ptd->mbufs;
uword n_bytes = 0;
- i16 off;
u8 *flags, or_flags = 0;
- u16 *next;
- fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
+ if (maybe_multiseg)
+ fl = vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX);
mb = ptd->mbufs;
flags = ptd->flags;
- next = ptd->next;
while (n_left >= 8)
{
- CLIB_PREFETCH (mb + 8, CLIB_CACHE_LINE_BYTES, LOAD);
-
dpdk_prefetch_buffer_x4 (mb + 4);
b[0] = vlib_buffer_from_rte_mbuf (mb[0]);
or_flags |= dpdk_ol_flags_extract (mb, flags, 4);
flags += 4;
- /* we temporary store relative offset of ethertype into next[x]
- so we can prefetch and get it faster later */
-
- off = mb[0]->data_off;
- next[0] = off + STRUCT_OFFSET_OF (ethernet_header_t, type);
- off -= RTE_PKTMBUF_HEADROOM;
- vnet_buffer (b[0])->l2_hdr_offset = off;
- b[0]->current_data = off;
-
- off = mb[1]->data_off;
- next[1] = off + STRUCT_OFFSET_OF (ethernet_header_t, type);
- off -= RTE_PKTMBUF_HEADROOM;
- vnet_buffer (b[1])->l2_hdr_offset = off;
- b[1]->current_data = off;
-
- off = mb[2]->data_off;
- next[2] = off + STRUCT_OFFSET_OF (ethernet_header_t, type);
- off -= RTE_PKTMBUF_HEADROOM;
- vnet_buffer (b[2])->l2_hdr_offset = off;
- b[2]->current_data = off;
-
- off = mb[3]->data_off;
- next[3] = off + STRUCT_OFFSET_OF (ethernet_header_t, type);
- off -= RTE_PKTMBUF_HEADROOM;
- vnet_buffer (b[3])->l2_hdr_offset = off;
- b[3]->current_data = off;
-
- b[0]->current_length = mb[0]->data_len;
- b[1]->current_length = mb[1]->data_len;
- b[2]->current_length = mb[2]->data_len;
- b[3]->current_length = mb[3]->data_len;
-
- n_bytes += mb[0]->data_len;
- n_bytes += mb[1]->data_len;
- n_bytes += mb[2]->data_len;
- n_bytes += mb[3]->data_len;
+ b[0]->current_data = mb[0]->data_off - RTE_PKTMBUF_HEADROOM;
+ n_bytes += b[0]->current_length = mb[0]->data_len;
+
+ b[1]->current_data = mb[1]->data_off - RTE_PKTMBUF_HEADROOM;
+ n_bytes += b[1]->current_length = mb[1]->data_len;
+
+ b[2]->current_data = mb[2]->data_off - RTE_PKTMBUF_HEADROOM;
+ n_bytes += b[2]->current_length = mb[2]->data_len;
+
+ b[3]->current_data = mb[3]->data_off - RTE_PKTMBUF_HEADROOM;
+ n_bytes += b[3]->current_length = mb[3]->data_len;
if (maybe_multiseg)
{
/* next */
mb += 4;
n_left -= 4;
- next += 4;
}
while (n_left)
or_flags |= dpdk_ol_flags_extract (mb, flags, 1);
flags += 1;
- off = mb[0]->data_off;
- next[0] = off + STRUCT_OFFSET_OF (ethernet_header_t, type);
- off -= RTE_PKTMBUF_HEADROOM;
- vnet_buffer (b[0])->l2_hdr_offset = off;
- b[0]->current_data = off;
- b[0]->current_length = mb[0]->data_len;
- n_bytes += mb[0]->data_len;
+ b[0]->current_data = mb[0]->data_off - RTE_PKTMBUF_HEADROOM;
+ n_bytes += b[0]->current_length = mb[0]->data_len;
+
if (maybe_multiseg)
n_bytes += dpdk_process_subseq_segs (vm, b[0], mb[0], fl);
VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]);
/* next */
mb += 1;
n_left -= 1;
- next += 1;
}
*or_flagsp = or_flags;
return n_bytes;
}
-static_always_inline void
-dpdk_set_next_from_etype (vlib_main_t * vm, vlib_node_runtime_t * node,
- dpdk_per_thread_data_t * ptd, uword n_rx_packets)
-{
- vlib_buffer_t *b[4];
- i16 adv[4];
- u16 etype[4];
- struct rte_mbuf **mb = ptd->mbufs;
- u8 *flags = ptd->flags;
- u16 *next = ptd->next;
- u32 n_left = n_rx_packets;
-
- while (n_left >= 12)
- {
- dpdk_prefetch_buffer_data_x4 (mb + 8);
- dpdk_prefetch_buffer_x4 (mb + 8);
-
- b[0] = vlib_buffer_from_rte_mbuf (mb[0]);
- b[1] = vlib_buffer_from_rte_mbuf (mb[1]);
- b[2] = vlib_buffer_from_rte_mbuf (mb[2]);
- b[3] = vlib_buffer_from_rte_mbuf (mb[3]);
- etype[0] = *(u16 *) ((u8 *) mb[0] + next[0] + sizeof (vlib_buffer_t));
- etype[1] = *(u16 *) ((u8 *) mb[1] + next[1] + sizeof (vlib_buffer_t));
- etype[2] = *(u16 *) ((u8 *) mb[2] + next[2] + sizeof (vlib_buffer_t));
- etype[3] = *(u16 *) ((u8 *) mb[3] + next[3] + sizeof (vlib_buffer_t));
- next[0] = dpdk_rx_next (node, etype[0], flags[0]);
- next[1] = dpdk_rx_next (node, etype[1], flags[1]);
- next[2] = dpdk_rx_next (node, etype[2], flags[2]);
- next[3] = dpdk_rx_next (node, etype[3], flags[3]);
- adv[0] = device_input_next_node_advance[next[0]];
- adv[1] = device_input_next_node_advance[next[1]];
- adv[2] = device_input_next_node_advance[next[2]];
- adv[3] = device_input_next_node_advance[next[3]];
- b[0]->current_data += adv[0];
- b[1]->current_data += adv[1];
- b[2]->current_data += adv[2];
- b[3]->current_data += adv[3];
- b[0]->current_length -= adv[0];
- b[1]->current_length -= adv[1];
- b[2]->current_length -= adv[2];
- b[3]->current_length -= adv[3];
-
- /* next */
- next += 4;
- mb += 4;
- n_left -= 4;
- flags += 4;
- }
-
- while (n_left)
- {
- b[0] = vlib_buffer_from_rte_mbuf (mb[0]);
- next[0] = *(u16 *) ((u8 *) mb[0] + next[0] + sizeof (vlib_buffer_t));
- next[0] = dpdk_rx_next (node, next[0], flags[0]);
- adv[0] = device_input_next_node_advance[next[0]];
- b[0]->current_data += adv[0];
- b[0]->current_length -= adv[0];
-
- /* next */
- next += 1;
- mb += 1;
- n_left -= 1;
- flags += 1;
- }
-}
-
static_always_inline void
dpdk_process_flow_offload (dpdk_device_t * xd, dpdk_per_thread_data_t * ptd,
uword n_rx_packets)
/* TODO prefetch and quad-loop */
for (n = 0; n < n_rx_packets; n++)
{
- if ((ptd->flags[n] & (1 << DPDK_RX_F_FDIR)) == 0)
+ if ((ptd->flags[n] & (1 << PKT_RX_FDIR)) == 0)
continue;
fle = pool_elt_at_index (xd->flow_lookup_entries,
u32 next_index = VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT;
struct rte_mbuf **mb;
vlib_buffer_t *b0;
- int known_next = 0;
u16 *next;
u8 or_flags;
u32 n;
+ int single_next = 0;
dpdk_per_thread_data_t *ptd = vec_elt_at_index (dm->per_thread_data,
thread_index);
/* as DPDK is allocating empty buffers from mempool provided before interface
start for each queue, it is safe to store this in the template */
bt->buffer_pool_index = xd->buffer_pool_for_queue[queue_id];
+ vnet_buffer (bt)->feature_arc_index = 0;
+ bt->current_config_index = 0;
/* receive burst of packets from DPDK PMD */
if (PREDICT_FALSE (xd->per_interface_next_index != ~0))
- {
- known_next = 1;
- next_index = xd->per_interface_next_index;
- }
+ next_index = xd->per_interface_next_index;
/* as all packets belong to the same interface feature arc lookup
can be don once and result stored in the buffer template */
if (PREDICT_FALSE (vnet_device_input_have_features (xd->sw_if_index)))
- {
- vnet_feature_start_device_input_x1 (xd->sw_if_index, &next_index, bt);
- known_next = 1;
- }
+ vnet_feature_start_device_input_x1 (xd->sw_if_index, &next_index, bt);
if (xd->flags & DPDK_DEVICE_FLAG_MAYBE_MULTISEG)
n_rx_bytes = dpdk_process_rx_burst (vm, ptd, n_rx_packets, 1, &or_flags);
else
n_rx_bytes = dpdk_process_rx_burst (vm, ptd, n_rx_packets, 0, &or_flags);
- if (PREDICT_FALSE (known_next))
+ if (PREDICT_FALSE (or_flags & (1 << PKT_RX_FDIR)))
{
+ /* some packets will need to go to different next nodes */
for (n = 0; n < n_rx_packets; n++)
ptd->next[n] = next_index;
- vnet_buffer (bt)->feature_arc_index = 0;
- bt->current_config_index = 0;
+ /* flow offload - process if rx flow offload enabled and at least one
+ packet is marked */
+ if (PREDICT_FALSE ((xd->flags & DPDK_DEVICE_FLAG_RX_FLOW_OFFLOAD) &&
+ (or_flags & (1 << PKT_RX_FDIR))))
+ dpdk_process_flow_offload (xd, ptd, n_rx_packets);
+
+ /* enqueue buffers to the next node */
+ vlib_get_buffer_indices_with_offset (vm, (void **) ptd->mbufs,
+ ptd->buffers, n_rx_packets,
+ sizeof (struct rte_mbuf));
+
+ vlib_buffer_enqueue_to_next (vm, node, ptd->buffers, ptd->next,
+ n_rx_packets);
}
else
- dpdk_set_next_from_etype (vm, node, ptd, n_rx_packets);
-
- /* flow offload - process if rx flow offload enabled and at least one packet
- is marked */
- if (PREDICT_FALSE ((xd->flags & DPDK_DEVICE_FLAG_RX_FLOW_OFFLOAD) &&
- (or_flags & (1 << DPDK_RX_F_FDIR))))
- dpdk_process_flow_offload (xd, ptd, n_rx_packets);
-
- /* is at least one packet marked as ip4 checksum bad? */
- if (PREDICT_FALSE (or_flags & (1 << DPDK_RX_F_CKSUM_BAD)))
- for (n = 0; n < n_rx_packets; n++)
- {
- if ((ptd->flags[n] & (1 << DPDK_RX_F_CKSUM_BAD)) == 0)
- continue;
- if (ptd->next[n] != VNET_DEVICE_INPUT_NEXT_IP4_INPUT)
- continue;
-
- b0 = vlib_buffer_from_rte_mbuf (ptd->mbufs[n]);
- b0->error = node->errors[DPDK_ERROR_IP_CHECKSUM_ERROR];
- ptd->next[n] = VNET_DEVICE_INPUT_NEXT_DROP;
- }
-
- /* enqueue buffers to the next node */
- vlib_get_buffer_indices_with_offset (vm, (void **) ptd->mbufs, ptd->buffers,
- n_rx_packets,
- sizeof (struct rte_mbuf));
-
- vlib_buffer_enqueue_to_next (vm, node, ptd->buffers, ptd->next,
- n_rx_packets);
+ {
+ u32 *to_next, n_left_to_next;
+
+ vlib_get_new_next_frame (vm, node, next_index, to_next, n_left_to_next);
+ vlib_get_buffer_indices_with_offset (vm, (void **) ptd->mbufs, to_next,
+ n_rx_packets,
+ sizeof (struct rte_mbuf));
+
+ if (PREDICT_TRUE (next_index == VNET_DEVICE_INPUT_NEXT_ETHERNET_INPUT))
+ {
+ vlib_next_frame_t *nf;
+ vlib_frame_t *f;
+ ethernet_input_frame_t *ef;
+ nf = vlib_node_runtime_get_next_frame (vm, node, next_index);
+ f = vlib_get_frame (vm, nf->frame_index);
+ f->flags = ETH_INPUT_FRAME_F_SINGLE_SW_IF_IDX;
+
+ ef = vlib_frame_scalar_args (f);
+ ef->sw_if_index = xd->sw_if_index;
+ ef->hw_if_index = xd->hw_if_index;
+
+ /* if PMD supports ip4 checksum check and there are no packets
+ marked as ip4 checksum bad we can notify ethernet input so it
+ can send pacets to ip4-input-no-checksum node */
+ if (xd->flags & DPDK_DEVICE_FLAG_RX_IP4_CKSUM &&
+ (or_flags & (1 << PKT_RX_IP_CKSUM_BAD)) == 0)
+ f->flags |= ETH_INPUT_FRAME_F_IP4_CKSUM_OK;
+ }
+ n_left_to_next -= n_rx_packets;
+ vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+ single_next = 1;
+ }
/* packet trace if enabled */
if (PREDICT_FALSE ((n_trace = vlib_get_trace_count (vm, node))))
{
+ if (single_next)
+ vlib_get_buffer_indices_with_offset (vm, (void **) ptd->mbufs,
+ ptd->buffers, n_rx_packets,
+ sizeof (struct rte_mbuf));
+
n_left = n_rx_packets;
buffers = ptd->buffers;
mb = ptd->mbufs;
next = ptd->next;
+
while (n_trace && n_left)
{
b0 = vlib_get_buffer (vm, buffers[0]);
- vlib_trace_buffer (vm, node, next[0], b0, /* follow_chain */ 0);
+ if (single_next == 0)
+ next_index = next[0];
+ vlib_trace_buffer (vm, node, next_index, b0, /* follow_chain */ 0);
dpdk_rx_trace_t *t0 = vlib_add_trace (vm, node, b0, sizeof t0[0]);
t0->queue_index = queue_id;
Code Review / vpp.git / blobdiff