mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-30 08:24:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

ip_tunnel: adapt iptunnel_xmit_stats() to NETDEV_PCPU_STAT_DSTATS

Browse Source 
Blamed commits forgot that vxlan/geneve use udp_tunnel[6]_xmit_skb() which
call iptunnel_xmit_stats().

iptunnel_xmit_stats() was assuming tunnels were only using
NETDEV_PCPU_STAT_TSTATS.

@syncp offset in pcpu_sw_netstats and pcpu_dstats is different.

32bit kernels would either have corruptions or freezes if the syncp
sequence was overwritten.

This patch also moves pcpu_stat_type closer to dev->{t,d}stats to avoid
a potential cache line miss since iptunnel_xmit_stats() needs to read it.

Fixes: 6fa6de3022 ("geneve: Handle stats using NETDEV_PCPU_STAT_DSTATS.")
Fixes: be226352e8 ("vxlan: Handle stats using NETDEV_PCPU_STAT_DSTATS.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Link: https://patch.msgid.link/20260311123110.1471930-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Eric Dumazet
2026-03-11 12:31:10 +00:00
committed by Jakub Kicinski
parent e1f0a18c95
commit 8431c602f5
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/netdevice.h
View File

@@ -2155,6 +2155,7 @@ struct net_device {
unsigned long state;
unsigned int flags;
unsigned short hard_header_len;
enum netdev_stat_type pcpu_stat_type:8;
netdev_features_t features;
struct inet6_dev __rcu *ip6_ptr;
__cacheline_group_end(net_device_read_txrx);
@@ -2404,8 +2405,6 @@ struct net_device {
void *ml_priv;
enum netdev_ml_priv_type ml_priv_type;
enum netdev_stat_type pcpu_stat_type:8;
#if IS_ENABLED(CONFIG_GARP)
struct garp_port __rcu *garp_port;
#endif

28
include/net/ip_tunnels.h
View File

@@ -665,13 +665,29 @@ static inline int iptunnel_pull_offloads(struct sk_buff *skb)
static inline void iptunnel_xmit_stats(struct net_device *dev, int pkt_len)
{
if (pkt_len > 0) {
struct pcpu_sw_netstats *tstats = get_cpu_ptr(dev->tstats);
if (dev->pcpu_stat_type == NETDEV_PCPU_STAT_DSTATS) {
struct pcpu_dstats *dstats = get_cpu_ptr(dev->dstats);
u64_stats_update_begin(&tstats->syncp);
u64_stats_add(&tstats->tx_bytes, pkt_len);
u64_stats_inc(&tstats->tx_packets);
u64_stats_update_end(&tstats->syncp);
put_cpu_ptr(tstats);
u64_stats_update_begin(&dstats->syncp);
u64_stats_add(&dstats->tx_bytes, pkt_len);
u64_stats_inc(&dstats->tx_packets);
u64_stats_update_end(&dstats->syncp);
put_cpu_ptr(dstats);
return;
}
if (dev->pcpu_stat_type == NETDEV_PCPU_STAT_TSTATS) {
struct pcpu_sw_netstats *tstats = get_cpu_ptr(dev->tstats);
u64_stats_update_begin(&tstats->syncp);
u64_stats_add(&tstats->tx_bytes, pkt_len);
u64_stats_inc(&tstats->tx_packets);
u64_stats_update_end(&tstats->syncp);
put_cpu_ptr(tstats);
return;
}
pr_err_once("iptunnel_xmit_stats pcpu_stat_type=%d\n",
dev->pcpu_stat_type);
WARN_ON_ONCE(1);
return;
}