Commit edbea922 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Daniel Borkmann
Browse files

veth: Store queue_mapping independently of XDP prog presence 



Currently, veth_xmit() would call the skb_record_rx_queue() only when
there is XDP program loaded on peer interface in native mode.

If peer has XDP prog in generic mode, then netif_receive_generic_xdp()
has a call to netif_get_rxqueue(skb), so for multi-queue veth it will
not be possible to grab a correct rxq.

To fix that, store queue_mapping independently of XDP prog presence on
peer interface.

Fixes: 638264dc ("veth: Support per queue XDP ring")
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarToshiaki Makita <toshiaki.makita1@gmail.com>
Link: https://lore.kernel.org/bpf/20210303152903.11172-1-maciej.fijalkowski@intel.com
parent d8861bab

drivers/net/veth.c

+1 −2
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (rxq < rcv->real_num_rx_queues) {

		rq = &rcv_priv->rq[rxq];

		rcv_xdp = rcu_access_pointer(rq->xdp_prog);

		if (rcv_xdp)

		skb_record_rx_queue(skb, rxq);

	}