diff options
| author | Heng Qi <hengqi@linux.alibaba.com> | 2022-11-22 11:50:14 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-11-22 20:42:08 -0800 |
| commit | b535d681adda8e3bf1cb399dd1c448c8e8fd98e6 (patch) | |
| tree | ebfd7f275ac923b2a1ea83b6423255a2e312146a /drivers/net/veth.c | |
| parent | 8263ee81f659ff773e5ee0a6f2adb9c6b5b4b0cc (diff) | |
Revert "bpf: veth driver panics when xdp prog attached before veth_open"
This reverts commit 5e5dc33d5dacb34b0165061bc5a10efd2fd3b66f.
This patch fixes the panic maked by 2e0de6366ac16. Now Paolo
and Toke suggest reverting the patch 2e0de6366ac16 and making
it stronger, so do this first.
Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 2a4592780141..b1ed5a93b6c5 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -1125,7 +1125,7 @@ static int veth_enable_xdp(struct net_device *dev) int err, i; rq = &priv->rq[0]; - napi_already_on = rcu_access_pointer(rq->napi); + napi_already_on = (dev->flags & IFF_UP) && 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); |