Skip to content

Commit f7f6aa8

Browse files
mfijalkoAlexei Starovoitov
authored andcommitted
xsk: make xsk_buff_pool responsible for clearing xdp_buff::flags
XDP multi-buffer support introduced XDP_FLAGS_HAS_FRAGS flag that is used by drivers to notify data path whether xdp_buff contains fragments or not. Data path looks up mentioned flag on first buffer that occupies the linear part of xdp_buff, so drivers only modify it there. This is sufficient for SKB and XDP_DRV modes as usually xdp_buff is allocated on stack or it resides within struct representing driver's queue and fragments are carried via skb_frag_t structs. IOW, we are dealing with only one xdp_buff. ZC mode though relies on list of xdp_buff structs that is carried via xsk_buff_pool::xskb_list, so ZC data path has to make sure that fragments do *not* have XDP_FLAGS_HAS_FRAGS set. Otherwise, xsk_buff_free() could misbehave if it would be executed against xdp_buff that carries a frag with XDP_FLAGS_HAS_FRAGS flag set. Such scenario can take place when within supplied XDP program bpf_xdp_adjust_tail() is used with negative offset that would in turn release the tail fragment from multi-buffer frame. Calling xsk_buff_free() on tail fragment with XDP_FLAGS_HAS_FRAGS would result in releasing all the nodes from xskb_list that were produced by driver before XDP program execution, which is not what is intended - only tail fragment should be deleted from xskb_list and then it should be put onto xsk_buff_pool::free_list. Such multi-buffer frame will never make it up to user space, so from AF_XDP application POV there would be no traffic running, however due to free_list getting constantly new nodes, driver will be able to feed HW Rx queue with recycled buffers. Bottom line is that instead of traffic being redirected to user space, it would be continuously dropped. To fix this, let us clear the mentioned flag on xsk_buff_pool side during xdp_buff initialization, which is what should have been done right from the start of XSK multi-buffer support. Fixes: 1bbc04d ("ice: xsk: add RX multi-buffer support") Fixes: 1c9ba9c ("i40e: xsk: add RX multi-buffer support") Fixes: 24ea501 ("xsk: support mbuf on ZC RX") Signed-off-by: Maciej Fijalkowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 2690098 commit f7f6aa8

File tree

4 files changed

+2
-2
lines changed

4 files changed

+2
-2
lines changed

drivers/net/ethernet/intel/i40e/i40e_xsk.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,6 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)
498498
xdp_res = i40e_run_xdp_zc(rx_ring, first, xdp_prog);
499499
i40e_handle_xdp_result_zc(rx_ring, first, rx_desc, &rx_packets,
500500
&rx_bytes, xdp_res, &failure);
501-
first->flags = 0;
502501
next_to_clean = next_to_process;
503502
if (failure)
504503
break;

drivers/net/ethernet/intel/ice/ice_xsk.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,6 @@ int ice_clean_rx_irq_zc(struct ice_rx_ring *rx_ring, int budget)
895895

896896
if (!first) {
897897
first = xdp;
898-
xdp_buff_clear_frags_flag(first);
899898
} else if (ice_add_xsk_frag(rx_ring, first, xdp, size)) {
900899
break;
901900
}

include/net/xdp_sock_drv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ static inline void xsk_buff_set_size(struct xdp_buff *xdp, u32 size)
164164
xdp->data = xdp->data_hard_start + XDP_PACKET_HEADROOM;
165165
xdp->data_meta = xdp->data;
166166
xdp->data_end = xdp->data + size;
167+
xdp->flags = 0;
167168
}
168169

169170
static inline dma_addr_t xsk_buff_raw_get_dma(struct xsk_buff_pool *pool,

net/xdp/xsk_buff_pool.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ struct xdp_buff *xp_alloc(struct xsk_buff_pool *pool)
555555

556556
xskb->xdp.data = xskb->xdp.data_hard_start + XDP_PACKET_HEADROOM;
557557
xskb->xdp.data_meta = xskb->xdp.data;
558+
xskb->xdp.flags = 0;
558559

559560
if (pool->dma_need_sync) {
560561
dma_sync_single_range_for_device(pool->dev, xskb->dma, 0,

0 commit comments

Comments
 (0)