Patch "intel: xsk: initialize skb_frag_t::bv_offset in ZC drivers" has been added to the 6.6-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    intel: xsk: initialize skb_frag_t::bv_offset in ZC drivers

to the 6.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     intel-xsk-initialize-skb_frag_t-bv_offset-in-zc-driv.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 419c1ea790a3ac9d23f0cb06f5d86f0f6e4b2608
Author: Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx>
Date:   Wed Jan 24 20:15:58 2024 +0100

    intel: xsk: initialize skb_frag_t::bv_offset in ZC drivers
    
    [ Upstream commit 290779905d09d5fdf6caa4f58ddefc3f4db0c0a9 ]
    
    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: 1c9ba9c14658 ("i40e: xsk: add RX multi-buffer support")
    Fixes: 1bbc04de607b ("ice: xsk: add RX multi-buffer support")
    Acked-by: Magnus Karlsson <magnus.karlsson@xxxxxxxxx>
    Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20240124191602.566724-8-maciej.fijalkowski@xxxxxxxxx
    Signed-off-by: Alexei Starovoitov <ast@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index b75e6b6d317c..1f8ae6f5d980 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -418,7 +418,8 @@ i40e_add_xsk_frag(struct i40e_ring *rx_ring, struct xdp_buff *first,
 	}
 
 	__skb_fill_page_desc_noacc(sinfo, sinfo->nr_frags++,
-				   virt_to_page(xdp->data_hard_start), 0, size);
+				   virt_to_page(xdp->data_hard_start),
+				   XDP_PACKET_HEADROOM, size);
 	sinfo->xdp_frags_size += size;
 	xsk_buff_add_frag(xdp);
 
diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
index 33f194c870bb..307c609137bd 100644
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@ -826,7 +826,8 @@ ice_add_xsk_frag(struct ice_rx_ring *rx_ring, struct xdp_buff *first,
 	}
 
 	__skb_fill_page_desc_noacc(sinfo, sinfo->nr_frags++,
-				   virt_to_page(xdp->data_hard_start), 0, size);
+				   virt_to_page(xdp->data_hard_start),
+				   XDP_PACKET_HEADROOM, size);
 	sinfo->xdp_frags_size += size;
 	xsk_buff_add_frag(xdp);