Skip to content

Commit 2907799

Browse files
mfijalkoAlexei Starovoitov
authored andcommitted
intel: xsk: initialize skb_frag_t::bv_offset in ZC drivers
Ice and i40e ZC drivers currently set offset of a frag within skb_shared_info to 0, which is incorrect. xdp_buffs that come from xsk_buff_pool always have 256 bytes of a headroom, so they need to be taken into account to retrieve xdp_buff::data via skb_frag_address(). Otherwise, bpf_xdp_frags_increase_tail() would be starting its job from xdp_buff::data_hard_start which would result in overwriting existing payload. Fixes: 1c9ba9c ("i40e: xsk: add RX multi-buffer support") Fixes: 1bbc04d ("ice: xsk: add RX multi-buffer support") Acked-by: Magnus Karlsson <magnus.karlsson@intel.com> Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> Link: https://lore.kernel.org/r/20240124191602.566724-8-maciej.fijalkowski@intel.com Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1 parent 2ee788c commit 2907799

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,8 @@ i40e_add_xsk_frag(struct i40e_ring *rx_ring, struct xdp_buff *first,
414414
}
415415

416416
__skb_fill_page_desc_noacc(sinfo, sinfo->nr_frags++,
417-
virt_to_page(xdp->data_hard_start), 0, size);
417+
virt_to_page(xdp->data_hard_start),
418+
XDP_PACKET_HEADROOM, size);
418419
sinfo->xdp_frags_size += size;
419420
xsk_buff_add_frag(xdp);
420421

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,8 @@ ice_add_xsk_frag(struct ice_rx_ring *rx_ring, struct xdp_buff *first,
825825
}
826826

827827
__skb_fill_page_desc_noacc(sinfo, sinfo->nr_frags++,
828-
virt_to_page(xdp->data_hard_start), 0, size);
828+
virt_to_page(xdp->data_hard_start),
829+
XDP_PACKET_HEADROOM, size);
829830
sinfo->xdp_frags_size += size;
830831
xsk_buff_add_frag(xdp);
831832

0 commit comments

Comments
 (0)