Commit d120d1a6 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Jakub Kicinski
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 068c38ad

net/8021q/vlan_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/bridge/br_multicast.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/bridge/br_vlan.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/core/devlink.c

+2 −2
Original line number Diff line number Diff line
@@ -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);