ixgbe, xsk: Decorate IXGBE_XDP_REDIR with likely()

ixgbe_run_xdp_zc() suggests to compiler that XDP_REDIRECT is the most
probable action returned from BPF program that AF_XDP has in its
pipeline. Let's also bring this suggestion up to the callsite of
ixgbe_run_xdp_zc() so that compiler will be able to generate more
optimized code which in turn will make branch predictor happy.

Suggested-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220413153015.453864-5-maciej.fijalkowski@intel.com
This commit is contained in:
Maciej Fijalkowski 2022-04-13 17:30:05 +02:00 committed by Daniel Borkmann
parent 0bd5ab511e
commit d090c88586

View File

@ -303,21 +303,22 @@ int ixgbe_clean_rx_irq_zc(struct ixgbe_q_vector *q_vector,
xsk_buff_dma_sync_for_cpu(bi->xdp, rx_ring->xsk_pool); xsk_buff_dma_sync_for_cpu(bi->xdp, rx_ring->xsk_pool);
xdp_res = ixgbe_run_xdp_zc(adapter, rx_ring, bi->xdp); xdp_res = ixgbe_run_xdp_zc(adapter, rx_ring, bi->xdp);
if (xdp_res) { if (likely(xdp_res & (IXGBE_XDP_TX | IXGBE_XDP_REDIR)))
if (xdp_res & (IXGBE_XDP_TX | IXGBE_XDP_REDIR)) xdp_xmit |= xdp_res;
xdp_xmit |= xdp_res; else if (xdp_res == IXGBE_XDP_CONSUMED)
else xsk_buff_free(bi->xdp);
xsk_buff_free(bi->xdp); else
goto construct_skb;
bi->xdp = NULL; bi->xdp = NULL;
total_rx_packets++; total_rx_packets++;
total_rx_bytes += size; total_rx_bytes += size;
cleaned_count++; cleaned_count++;
ixgbe_inc_ntc(rx_ring); ixgbe_inc_ntc(rx_ring);
continue; continue;
}
construct_skb:
/* XDP_PASS path */ /* XDP_PASS path */
skb = ixgbe_construct_skb_zc(rx_ring, bi->xdp); skb = ixgbe_construct_skb_zc(rx_ring, bi->xdp);
if (!skb) { if (!skb) {