!xsk_ring_prod__needs_wakeup (&rxq->fq))
return;
- vlib_error_count (vm, node->node_index, AF_XDP_INPUT_ERROR_SYSCALL_REQUIRED,
- 1);
+ if (node)
+ vlib_error_count (vm, node->node_index,
+ AF_XDP_INPUT_ERROR_SYSCALL_REQUIRED, 1);
if (clib_spinlock_trylock_if_init (&rxq->syscall_lock))
{
if (PREDICT_FALSE (ret < 0))
{
/* something bad is happening */
- vlib_error_count (vm, node->node_index,
- AF_XDP_INPUT_ERROR_SYSCALL_FAILURES, 1);
+ if (node)
+ vlib_error_count (vm, node->node_index,
+ AF_XDP_INPUT_ERROR_SYSCALL_FAILURES, 1);
af_xdp_device_error (ad, "rx poll() failed");
}
}
}
static_always_inline void
-af_xdp_device_input_refill (vlib_main_t * vm,
- const vlib_node_runtime_t * node,
- af_xdp_device_t * ad, af_xdp_rxq_t * rxq,
- const int copy)
+af_xdp_device_input_refill_inline (vlib_main_t *vm,
+ const vlib_node_runtime_t *node,
+ af_xdp_device_t *ad, af_xdp_rxq_t *rxq)
{
__u64 *fill;
const u32 size = rxq->fq.size;
n = clib_min (n_alloc, size - (idx & mask));
n_wrap = n_alloc - n;
- /*
- * Note about headroom: for some reasons, there seem to be a discrepency
- * between 0-copy and copy mode. See
- * src/plugins/af_xdp/device.c:af_xdp_create_queue()
- */
-#define bi2addr(bi) \
- (((bi) << CLIB_LOG2_CACHE_LINE_BYTES) + (copy ? XDP_PACKET_HEADROOM : 0))
+#define bi2addr(bi) ((bi) << CLIB_LOG2_CACHE_LINE_BYTES)
wrap_around:
}
static_always_inline u32
-af_xdp_device_input_bufs (vlib_main_t * vm, const af_xdp_device_t * ad,
- af_xdp_rxq_t * rxq, u32 * bis, const u32 n_rx,
- vlib_buffer_t * bt, u32 idx, const int copy)
+af_xdp_device_input_bufs (vlib_main_t *vm, const af_xdp_device_t *ad,
+ af_xdp_rxq_t *rxq, u32 *bis, const u32 n_rx,
+ vlib_buffer_t *bt, u32 idx)
{
vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs;
+ u16 offs[VLIB_FRAME_SIZE], *off = offs;
u16 lens[VLIB_FRAME_SIZE], *len = lens;
const u32 mask = rxq->rx.mask;
u32 n = n_rx, *bi = bis, bytes = 0;
-#define addr2bi(addr) \
- (((addr) - (copy ? XDP_PACKET_HEADROOM : 0)) >> CLIB_LOG2_CACHE_LINE_BYTES)
+#define addr2bi(addr) ((addr) >> CLIB_LOG2_CACHE_LINE_BYTES)
while (n >= 1)
{
const struct xdp_desc *desc = xsk_ring_cons__rx_desc (&rxq->rx, idx);
- bi[0] = addr2bi (xsk_umem__extract_addr (desc->addr));
+ const u64 addr = desc->addr;
+ bi[0] = addr2bi (xsk_umem__extract_addr (addr));
ASSERT (vlib_buffer_is_known (vm, bi[0]) ==
VLIB_BUFFER_KNOWN_ALLOCATED);
+ off[0] = xsk_umem__extract_offset (addr) - sizeof (vlib_buffer_t);
len[0] = desc->len;
idx = (idx + 1) & mask;
bi += 1;
+ off += 1;
len += 1;
n -= 1;
}
vlib_get_buffers (vm, bis, bufs, n_rx);
n = n_rx;
+ off = offs;
len = lens;
while (n >= 8)
{
vlib_prefetch_buffer_header (b[4], LOAD);
vlib_buffer_copy_template (b[0], bt);
+ b[0]->current_data = off[0];
bytes += b[0]->current_length = len[0];
vlib_prefetch_buffer_header (b[5], LOAD);
vlib_buffer_copy_template (b[1], bt);
+ b[1]->current_data = off[1];
bytes += b[1]->current_length = len[1];
vlib_prefetch_buffer_header (b[6], LOAD);
vlib_buffer_copy_template (b[2], bt);
+ b[2]->current_data = off[2];
bytes += b[2]->current_length = len[2];
vlib_prefetch_buffer_header (b[7], LOAD);
vlib_buffer_copy_template (b[3], bt);
+ b[3]->current_data = off[3];
bytes += b[3]->current_length = len[3];
b += 4;
+ off += 4;
len += 4;
n -= 4;
}
while (n >= 1)
{
vlib_buffer_copy_template (b[0], bt);
+ b[0]->current_data = off[0];
bytes += b[0]->current_length = len[0];
b += 1;
+ off += 1;
len += 1;
n -= 1;
}
}
static_always_inline uword
-af_xdp_device_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
- vlib_frame_t * frame, af_xdp_device_t * ad,
- u16 qid, const int copy)
+af_xdp_device_input_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
+ vlib_frame_t *frame, af_xdp_device_t *ad, u16 qid)
{
vnet_main_t *vnm = vnet_get_main ();
af_xdp_rxq_t *rxq = vec_elt_at_index (ad->rxqs, qid);
vlib_get_new_next_frame (vm, node, next_index, to_next, n_left_to_next);
n_rx_bytes =
- af_xdp_device_input_bufs (vm, ad, rxq, to_next, n_rx_packets, &bt, idx,
- copy);
+ af_xdp_device_input_bufs (vm, ad, rxq, to_next, n_rx_packets, &bt, idx);
af_xdp_device_input_ethernet (vm, node, next_index, ad->sw_if_index,
ad->hw_if_index);
ad->hw_if_index, n_rx_packets, n_rx_bytes);
refill:
- af_xdp_device_input_refill (vm, node, ad, rxq, copy);
+ af_xdp_device_input_refill_inline (vm, node, ad, rxq);
return n_rx_packets;
}
af_xdp_device_t *ad = vec_elt_at_index (am->devices, p->dev_instance);
if ((ad->flags & AF_XDP_DEVICE_F_ADMIN_UP) == 0)
continue;
- if (PREDICT_TRUE (ad->flags & AF_XDP_DEVICE_F_ZEROCOPY))
- n_rx += af_xdp_device_input_inline (vm, node, frame, ad, p->queue_id,
- /* copy */ 0);
- else
- n_rx += af_xdp_device_input_inline (vm, node, frame, ad, p->queue_id,
- /* copy */ 1);
+ n_rx += af_xdp_device_input_inline (vm, node, frame, ad, p->queue_id);
}
return n_rx;
}
+#ifndef CLIB_MARCH_VARIANT
+void
+af_xdp_device_input_refill (af_xdp_device_t *ad)
+{
+ vlib_main_t *vm = vlib_get_main ();
+ af_xdp_rxq_t *rxq;
+ vec_foreach (rxq, ad->rxqs)
+ af_xdp_device_input_refill_inline (vm, 0, ad, rxq);
+}
+#endif /* CLIB_MARCH_VARIANT */
+
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (af_xdp_input_node) = {
.name = "af_xdp-input",
Code Review / vpp.git / blobdiff