From 765e0bd4a467549352dc786fd5dbd93bb8711562 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 3 Jan 2025 08:29:31 +0000 Subject: [PATCH] Revert "bpf: Fix dev's rx stats for bpf_redirect_peer traffic" This reverts commit 8e7b5300a0ee6fa93062182de7b331271d94a2fc which is commit 024ee930cb3c9ae49e4266aee89cfde0ebb407e1 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I4993a92603f7ac82031f4ff23ab906419a613203 Signed-off-by: Greg Kroah-Hartman --- net/core/dev.c | 8 -------- net/core/filter.c | 1 - 2 files changed, 9 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index dde4b4376d58..2ff2af24cadb 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -10011,14 +10011,6 @@ static int netdev_do_alloc_pcpu_stats(struct net_device *dev) { void __percpu *v; - /* Drivers implementing ndo_get_peer_dev must support tstat - * accounting, so that skb_do_redirect() can bump the dev's - * RX stats upon network namespace switch. - */ - if (dev->netdev_ops->ndo_get_peer_dev && - dev->pcpu_stat_type != NETDEV_PCPU_STAT_TSTATS) - return -EOPNOTSUPP; - switch (dev->pcpu_stat_type) { case NETDEV_PCPU_STAT_NONE: return 0; diff --git a/net/core/filter.c b/net/core/filter.c index c9ceb37534d2..4a97c89c9da9 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2491,7 +2491,6 @@ int skb_do_redirect(struct sk_buff *skb) net_eq(net, dev_net(dev)))) goto out_drop; skb->dev = dev; - dev_sw_netstats_rx_add(dev, skb->len); return -EAGAIN; } return flags & BPF_F_NEIGH ?