diff options
| author | Jesper Dangaard Brouer <[email protected]> | 2021-11-15 20:36:25 +0000 |
|---|---|---|
| committer | Tony Nguyen <[email protected]> | 2021-11-30 16:19:25 +0000 |
| commit | 4fa8fcd3440101dbacf4fae91de69877ef751977 (patch) | |
| tree | 01a2c966cf6da7ca0b6da6d16d6b682b2aeefc41 /drivers/net/ethernet/intel/igc/igc_main.c | |
| parent | net: ixp4xx_hss: drop kfree for memory allocated with devm_kzalloc (diff) | |
| download | kernel-4fa8fcd3440101dbacf4fae91de69877ef751977.tar.gz kernel-4fa8fcd3440101dbacf4fae91de69877ef751977.zip | |
igc: AF_XDP zero-copy metadata adjust breaks SKBs on XDP_PASS
Driver already implicitly supports XDP metadata access in AF_XDP
zero-copy mode, as xsk_buff_pool's xp_alloc() naturally set xdp_buff
data_meta equal data.
This works fine for XDP and AF_XDP, but if a BPF-prog adjust via
bpf_xdp_adjust_meta() and choose to call XDP_PASS, then igc function
igc_construct_skb_zc() will construct an invalid SKB packet. The
function correctly include the xdp->data_meta area in the memcpy, but
forgot to pull header to take metasize into account.
Fixes: fc9df2a0b520 ("igc: Enable RX via AF_XDP zero-copy")
Signed-off-by: Jesper Dangaard Brouer <[email protected]>
Tested-by: Nechama Kraus <[email protected]>
Acked-by: Maciej Fijalkowski <[email protected]>
Signed-off-by: Tony Nguyen <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 8e448288ee26..76b0a7311369 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -2448,8 +2448,10 @@ static struct sk_buff *igc_construct_skb_zc(struct igc_ring *ring, skb_reserve(skb, xdp->data_meta - xdp->data_hard_start); memcpy(__skb_put(skb, totalsize), xdp->data_meta, totalsize); - if (metasize) + if (metasize) { skb_metadata_set(skb, metasize); + __skb_pull(skb, metasize); + } return skb; } |