net: Remove the obsolte u64_stats_fetch_*_irq() users (net).

Now that the 32bit UP oddity is gone and 32bit uses always a sequence
count, there is no need for the fetch_irq() variants anymore.

Convert to the regular interface.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index e1bb41a443c433bb14a0731fa875e8a931abcdde..296d0145932f47f8bc6d0a8bf94e0fa0678e330d 100644 (file)
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -712,13 +712,13 @@ static void vlan_dev_get_stats64(struct net_device *dev,
 
                p = per_cpu_ptr(vlan_dev_priv(dev)->vlan_pcpu_stats, i);
                do {
-                       start = u64_stats_fetch_begin_irq(&p->syncp);
+                       start = u64_stats_fetch_begin(&p->syncp);
                        rxpackets       = u64_stats_read(&p->rx_packets);
                        rxbytes         = u64_stats_read(&p->rx_bytes);
                        rxmulticast     = u64_stats_read(&p->rx_multicast);
                        txpackets       = u64_stats_read(&p->tx_packets);
                        txbytes         = u64_stats_read(&p->tx_bytes);
-               } while (u64_stats_fetch_retry_irq(&p->syncp, start));
+               } while (u64_stats_fetch_retry(&p->syncp, start));
 
                stats->rx_packets       += rxpackets;
                stats->rx_bytes         += rxbytes;

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 09140bc8c15eb22465de96bf31c0d79e59196601..5e988f0ed2c01575d86684735c3a80b11a6c88d1 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -4899,9 +4899,9 @@ void br_multicast_get_stats(const struct net_bridge *br,
                unsigned int start;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&cpu_stats->syncp);
+                       start = u64_stats_fetch_begin(&cpu_stats->syncp);
                        memcpy(&temp, &cpu_stats->mstats, sizeof(temp));
-               } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&cpu_stats->syncp, start));
 
                mcast_stats_add_dir(tdst.igmp_v1queries, temp.igmp_v1queries);
                mcast_stats_add_dir(tdst.igmp_v2queries, temp.igmp_v2queries);

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 6e53dc991409429f26316d2c407e01c50c47c664..f2fc284abab38d729a2da405ec7c436f7c4dc37f 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -1378,12 +1378,12 @@ void br_vlan_get_stats(const struct net_bridge_vlan *v,
 
                cpu_stats = per_cpu_ptr(v->stats, i);
                do {
-                       start = u64_stats_fetch_begin_irq(&cpu_stats->syncp);
+                       start = u64_stats_fetch_begin(&cpu_stats->syncp);
                        rxpackets = u64_stats_read(&cpu_stats->rx_packets);
                        rxbytes = u64_stats_read(&cpu_stats->rx_bytes);
                        txbytes = u64_stats_read(&cpu_stats->tx_bytes);
                        txpackets = u64_stats_read(&cpu_stats->tx_packets);
-               } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&cpu_stats->syncp, start));
 
                u64_stats_add(&stats->rx_packets, rxpackets);
                u64_stats_add(&stats->rx_bytes, rxbytes);

diff --git a/net/core/dev.c b/net/core/dev.c
index fff62068a53d0e7a86d63ffe9d72d8e56d3fab08..cfb68db040a44b19fcc1b8b5ac2e9957fa124681 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -10477,12 +10477,12 @@ void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s,
 
                stats = per_cpu_ptr(netstats, cpu);
                do {
-                       start = u64_stats_fetch_begin_irq(&stats->syncp);
+                       start = u64_stats_fetch_begin(&stats->syncp);
                        rx_packets = u64_stats_read(&stats->rx_packets);
                        rx_bytes   = u64_stats_read(&stats->rx_bytes);
                        tx_packets = u64_stats_read(&stats->tx_packets);
                        tx_bytes   = u64_stats_read(&stats->tx_bytes);
-               } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+               } while (u64_stats_fetch_retry(&stats->syncp, start));
 
                s->rx_packets += rx_packets;
                s->rx_bytes   += rx_bytes;

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 89baa7c0938b9580b322070da5069086cabd3bc7..0a16ad45520eb31b9f4d62562d11278deaa420b5 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -8304,10 +8304,10 @@ static void devlink_trap_stats_read(struct devlink_stats __percpu *trap_stats,
 
                cpu_stats = per_cpu_ptr(trap_stats, i);
                do {
-                       start = u64_stats_fetch_begin_irq(&cpu_stats->syncp);
+                       start = u64_stats_fetch_begin(&cpu_stats->syncp);
                        rx_packets = u64_stats_read(&cpu_stats->rx_packets);
                        rx_bytes = u64_stats_read(&cpu_stats->rx_bytes);
-               } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&cpu_stats->syncp, start));
 
                u64_stats_add(&stats->rx_packets, rx_packets);
                u64_stats_add(&stats->rx_bytes, rx_bytes);

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index f084a4a6b7ab2c7e5b822be89a34d3c4dd2cc0f6..11aa6e8a309817cb356dc8f39e23c63261c14fe0 100644 (file)
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -1432,9 +1432,9 @@ static void net_dm_stats_read(struct net_dm_stats *stats)
                u64 dropped;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&cpu_stats->syncp);
+                       start = u64_stats_fetch_begin(&cpu_stats->syncp);
                        dropped = u64_stats_read(&cpu_stats->dropped);
-               } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&cpu_stats->syncp, start));
 
                u64_stats_add(&stats->dropped, dropped);
        }
@@ -1476,9 +1476,9 @@ static void net_dm_hw_stats_read(struct net_dm_stats *stats)
                u64 dropped;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&cpu_stats->syncp);
+                       start = u64_stats_fetch_begin(&cpu_stats->syncp);
                        dropped = u64_stats_read(&cpu_stats->dropped);
-               } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&cpu_stats->syncp, start));
 
                u64_stats_add(&stats->dropped, dropped);
        }

diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
index c8d137ef5980eaf6e1c3ea10417e096bf2a33849..b71ccaec0991461333dbe465ee619bca4a06e75b 100644 (file)
--- a/net/core/gen_stats.c
+++ b/net/core/gen_stats.c
@@ -135,10 +135,10 @@ static void gnet_stats_add_basic_cpu(struct gnet_stats_basic_sync *bstats,
                u64 bytes, packets;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&bcpu->syncp);
+                       start = u64_stats_fetch_begin(&bcpu->syncp);
                        bytes = u64_stats_read(&bcpu->bytes);
                        packets = u64_stats_read(&bcpu->packets);
-               } while (u64_stats_fetch_retry_irq(&bcpu->syncp, start));
+               } while (u64_stats_fetch_retry(&bcpu->syncp, start));
 
                t_bytes += bytes;
                t_packets += packets;
@@ -162,10 +162,10 @@ void gnet_stats_add_basic(struct gnet_stats_basic_sync *bstats,
        }
        do {
                if (running)
-                       start = u64_stats_fetch_begin_irq(&b->syncp);
+                       start = u64_stats_fetch_begin(&b->syncp);
                bytes = u64_stats_read(&b->bytes);
                packets = u64_stats_read(&b->packets);
-       } while (running && u64_stats_fetch_retry_irq(&b->syncp, start));
+       } while (running && u64_stats_fetch_retry(&b->syncp, start));
 
        _bstats_update(bstats, bytes, packets);
 }
@@ -187,10 +187,10 @@ static void gnet_stats_read_basic(u64 *ret_bytes, u64 *ret_packets,
                        u64 bytes, packets;
 
                        do {
-                               start = u64_stats_fetch_begin_irq(&bcpu->syncp);
+                               start = u64_stats_fetch_begin(&bcpu->syncp);
                                bytes = u64_stats_read(&bcpu->bytes);
                                packets = u64_stats_read(&bcpu->packets);
-                       } while (u64_stats_fetch_retry_irq(&bcpu->syncp, start));
+                       } while (u64_stats_fetch_retry(&bcpu->syncp, start));
 
                        t_bytes += bytes;
                        t_packets += packets;
@@ -201,10 +201,10 @@ static void gnet_stats_read_basic(u64 *ret_bytes, u64 *ret_packets,
        }
        do {
                if (running)
-                       start = u64_stats_fetch_begin_irq(&b->syncp);
+                       start = u64_stats_fetch_begin(&b->syncp);
                *ret_bytes = u64_stats_read(&b->bytes);
                *ret_packets = u64_stats_read(&b->packets);
-       } while (running && u64_stats_fetch_retry_irq(&b->syncp, start));
+       } while (running && u64_stats_fetch_retry(&b->syncp, start));
 }
 
 static int

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index a9fde48cffd437bc8501512f1fb12521e61d0928..83e419afa89e87ea1a82256f41e2d1466fc76c9a 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -976,12 +976,12 @@ static void dsa_slave_get_ethtool_stats(struct net_device *dev,
 
                s = per_cpu_ptr(dev->tstats, i);
                do {
-                       start = u64_stats_fetch_begin_irq(&s->syncp);
+                       start = u64_stats_fetch_begin(&s->syncp);
                        tx_packets = u64_stats_read(&s->tx_packets);
                        tx_bytes = u64_stats_read(&s->tx_bytes);
                        rx_packets = u64_stats_read(&s->rx_packets);
                        rx_bytes = u64_stats_read(&s->rx_bytes);
-               } while (u64_stats_fetch_retry_irq(&s->syncp, start));
+               } while (u64_stats_fetch_retry(&s->syncp, start));
                data[0] += tx_packets;
                data[1] += tx_bytes;
                data[2] += rx_packets;

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 3dd02396517df599cf4ff3b9ab8463ea959770a1..585f13b6fef68b3b39c8561e1627ab1158a237e9 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1706,9 +1706,9 @@ u64 snmp_get_cpu_field64(void __percpu *mib, int cpu, int offt,
        bhptr = per_cpu_ptr(mib, cpu);
        syncp = (struct u64_stats_sync *)(bhptr + syncp_offset);
        do {
-               start = u64_stats_fetch_begin_irq(syncp);
+               start = u64_stats_fetch_begin(syncp);
                v = *(((u64 *)bhptr) + offt);
-       } while (u64_stats_fetch_retry_irq(syncp, start));
+       } while (u64_stats_fetch_retry(syncp, start));
 
        return v;
 }

diff --git a/net/ipv6/seg6_local.c b/net/ipv6/seg6_local.c
index 8370726ae7bf138a9354651fc144ef4cda187617..487f8e98deaa0b03d27402d800452aa07ce77633 100644 (file)
--- a/net/ipv6/seg6_local.c
+++ b/net/ipv6/seg6_local.c
@@ -1644,13 +1644,13 @@ static int put_nla_counters(struct sk_buff *skb, struct seg6_local_lwt *slwt)
 
                pcounters = per_cpu_ptr(slwt->pcpu_counters, i);
                do {
-                       start = u64_stats_fetch_begin_irq(&pcounters->syncp);
+                       start = u64_stats_fetch_begin(&pcounters->syncp);
 
                        packets = u64_stats_read(&pcounters->packets);
                        bytes = u64_stats_read(&pcounters->bytes);
                        errors = u64_stats_read(&pcounters->errors);
 
-               } while (u64_stats_fetch_retry_irq(&pcounters->syncp, start));
+               } while (u64_stats_fetch_retry(&pcounters->syncp, start));
 
                counters.packets += packets;
                counters.bytes += bytes;

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 6e0fd82855ae797777fd93182f2fa43540ee52ae..04e0f132b1d9c668381a69bd7e6f76c65718233a 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2427,9 +2427,9 @@ static inline u64 sta_get_tidstats_msdu(struct ieee80211_sta_rx_stats *rxstats,
        u64 value;
 
        do {
-               start = u64_stats_fetch_begin_irq(&rxstats->syncp);
+               start = u64_stats_fetch_begin(&rxstats->syncp);
                value = rxstats->msdu[tid];
-       } while (u64_stats_fetch_retry_irq(&rxstats->syncp, start));
+       } while (u64_stats_fetch_retry(&rxstats->syncp, start));
 
        return value;
 }
@@ -2495,9 +2495,9 @@ static inline u64 sta_get_stats_bytes(struct ieee80211_sta_rx_stats *rxstats)
        u64 value;
 
        do {
-               start = u64_stats_fetch_begin_irq(&rxstats->syncp);
+               start = u64_stats_fetch_begin(&rxstats->syncp);
                value = rxstats->bytes;
-       } while (u64_stats_fetch_retry_irq(&rxstats->syncp, start));
+       } while (u64_stats_fetch_retry(&rxstats->syncp, start));
 
        return value;
 }

diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index b52afe316dc41deac29f4bb1f6eae7c3d4ade90e..35b5f806fdda178d9742572845bf6fb0fca73dbe 100644 (file)
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -1079,9 +1079,9 @@ static void mpls_get_stats(struct mpls_dev *mdev,
 
                p = per_cpu_ptr(mdev->stats, i);
                do {
-                       start = u64_stats_fetch_begin_irq(&p->syncp);
+                       start = u64_stats_fetch_begin(&p->syncp);
                        local = p->stats;
-               } while (u64_stats_fetch_retry_irq(&p->syncp, start));
+               } while (u64_stats_fetch_retry(&p->syncp, start));
 
                stats->rx_packets       += local.rx_packets;
                stats->rx_bytes         += local.rx_bytes;

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 988222fff9f025a6635b66e47ad518e67e34c182..4d62059a60215cdf74297678d235992dee7f3ea4 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2296,13 +2296,13 @@ static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v)
                u64 conns, inpkts, outpkts, inbytes, outbytes;
 
                do {
-                       start = u64_stats_fetch_begin_irq(&u->syncp);
+                       start = u64_stats_fetch_begin(&u->syncp);
                        conns = u->cnt.conns;
                        inpkts = u->cnt.inpkts;
                        outpkts = u->cnt.outpkts;
                        inbytes = u->cnt.inbytes;
                        outbytes = u->cnt.outbytes;
-               } while (u64_stats_fetch_retry_irq(&u->syncp, start));
+               } while (u64_stats_fetch_retry(&u->syncp, start));
 
                seq_printf(seq, "%3X %8LX %8LX %8LX %16LX %16LX\n",
                           i, (u64)conns, (u64)inpkts,

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 6b79f5e18f0847970753be017fa73c6df9628327..62da204eed41e665e6e7849083b561de671734c5 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1534,10 +1534,10 @@ static int nft_dump_stats(struct sk_buff *skb, struct nft_stats __percpu *stats)
        for_each_possible_cpu(cpu) {
                cpu_stats = per_cpu_ptr(stats, cpu);
                do {
-                       seq = u64_stats_fetch_begin_irq(&cpu_stats->syncp);
+                       seq = u64_stats_fetch_begin(&cpu_stats->syncp);
                        pkts = cpu_stats->pkts;
                        bytes = cpu_stats->bytes;
-               } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, seq));
+               } while (u64_stats_fetch_retry(&cpu_stats->syncp, seq));
                total.pkts += pkts;
                total.bytes += bytes;
        }

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 155263e735124960cad3285264c84d03a1d4a4ad..f95b716ea96ddb576803e6fae80bfb7bd1f59713 100644 (file)
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -716,9 +716,9 @@ static void get_dp_stats(const struct datapath *dp, struct ovs_dp_stats *stats,
                percpu_stats = per_cpu_ptr(dp->stats_percpu, i);
 
                do {
-                       start = u64_stats_fetch_begin_irq(&percpu_stats->syncp);
+                       start = u64_stats_fetch_begin(&percpu_stats->syncp);
                        local_stats = *percpu_stats;
-               } while (u64_stats_fetch_retry_irq(&percpu_stats->syncp, start));
+               } while (u64_stats_fetch_retry(&percpu_stats->syncp, start));
 
                stats->n_hit += local_stats.n_hit;
                stats->n_missed += local_stats.n_missed;

diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index d4a2db0b229989864fa821f38e7787b13f5c583c..0a0e4c283f02eb3308405950fea7fc185e3f7886 100644 (file)
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -205,9 +205,9 @@ static void tbl_mask_array_reset_counters(struct mask_array *ma)
 
                        stats = per_cpu_ptr(ma->masks_usage_stats, cpu);
                        do {
-                               start = u64_stats_fetch_begin_irq(&stats->syncp);
+                               start = u64_stats_fetch_begin(&stats->syncp);
                                counter = stats->usage_cntrs[i];
-                       } while (u64_stats_fetch_retry_irq(&stats->syncp, start));
+                       } while (u64_stats_fetch_retry(&stats->syncp, start));
 
                        ma->masks_usage_zero_cntr[i] += counter;
                }
@@ -1136,10 +1136,9 @@ void ovs_flow_masks_rebalance(struct flow_table *table)
 
                        stats = per_cpu_ptr(ma->masks_usage_stats, cpu);
                        do {
-                               start = u64_stats_fetch_begin_irq(&stats->syncp);
+                               start = u64_stats_fetch_begin(&stats->syncp);
                                counter = stats->usage_cntrs[i];
-                       } while (u64_stats_fetch_retry_irq(&stats->syncp,
-                                                          start));
+                       } while (u64_stats_fetch_retry(&stats->syncp, start));
 
                        masks_and_count[i].counter += counter;
                }