Commit c7028aa2 authored by Martin KaFai Lau's avatar Martin KaFai Lau
Browse files

Merge branch 'fix panic bringing up veth with xdp progs'



John Fastabend says:

====================

Not sure if folks want to take this through BPF tree or networking tree.
I took a quick look and didn't see any pending fixes so seems no one
has noticed the panic yet. It reproducible and easy to repro.

I put bpf in the title thinking it woudl be great to run through the
BPF selftests given its XDP triggering the panic.

Sorry maintainers resent with CC'ing actual lists. Had a scripting
issue. Also dropped henqqi has they are bouncing.

Thanks!
====================

Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parents fd74b79d 5e5dc33d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ static int veth_enable_xdp(struct net_device *dev)
	int err, i;

	rq = &priv->rq[0];
	napi_already_on = (dev->flags & IFF_UP) && rcu_access_pointer(rq->napi);
	napi_already_on = rcu_access_pointer(rq->napi);

	if (!xdp_rxq_info_is_reg(&priv->rq[0].xdp_rxq)) {
		err = veth_enable_xdp_range(dev, 0, dev->real_num_rx_queues, napi_already_on);