Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2022-10-26 15:22:15 +02:00 committed by Jakub Kicinski
parent 068c38ad88
commit d120d1a63b
16 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/8021q/vlan_dev.c
View File

@ -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); p = per_cpu_ptr(vlan_dev_priv(dev)->vlan_pcpu_stats, i);
do { do {
start = u64_stats_fetch_begin_irq(&p->syncp); start = u64_stats_fetch_begin(&p->syncp);
rxpackets = u64_stats_read(&p->rx_packets); rxpackets = u64_stats_read(&p->rx_packets);
rxbytes = u64_stats_read(&p->rx_bytes); rxbytes = u64_stats_read(&p->rx_bytes);
rxmulticast = u64_stats_read(&p->rx_multicast); rxmulticast = u64_stats_read(&p->rx_multicast);
txpackets = u64_stats_read(&p->tx_packets); txpackets = u64_stats_read(&p->tx_packets);
txbytes = u64_stats_read(&p->tx_bytes); 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_packets += rxpackets;
stats->rx_bytes += rxbytes; stats->rx_bytes += rxbytes;

4
net/bridge/br_multicast.c
View File

@ -4899,9 +4899,9 @@ void br_multicast_get_stats(const struct net_bridge *br,
unsigned int start; unsigned int start;
do { 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)); 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_v1queries, temp.igmp_v1queries);
mcast_stats_add_dir(tdst.igmp_v2queries, temp.igmp_v2queries); mcast_stats_add_dir(tdst.igmp_v2queries, temp.igmp_v2queries);

4
net/bridge/br_vlan.c
View File

@ -1378,12 +1378,12 @@ void br_vlan_get_stats(const struct net_bridge_vlan *v,
cpu_stats = per_cpu_ptr(v->stats, i); cpu_stats = per_cpu_ptr(v->stats, i);
do { 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); rxpackets = u64_stats_read(&cpu_stats->rx_packets);
rxbytes = u64_stats_read(&cpu_stats->rx_bytes); rxbytes = u64_stats_read(&cpu_stats->rx_bytes);
txbytes = u64_stats_read(&cpu_stats->tx_bytes); txbytes = u64_stats_read(&cpu_stats->tx_bytes);
txpackets = u64_stats_read(&cpu_stats->tx_packets); 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_packets, rxpackets);
u64_stats_add(&stats->rx_bytes, rxbytes); u64_stats_add(&stats->rx_bytes, rxbytes);

4
net/core/dev.c
View File

@ -10477,12 +10477,12 @@ void dev_fetch_sw_netstats(struct rtnl_link_stats64 *s,
stats = per_cpu_ptr(netstats, cpu); stats = per_cpu_ptr(netstats, cpu);
do { 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_packets = u64_stats_read(&stats->rx_packets);
rx_bytes = u64_stats_read(&stats->rx_bytes); rx_bytes = u64_stats_read(&stats->rx_bytes);
tx_packets = u64_stats_read(&stats->tx_packets); tx_packets = u64_stats_read(&stats->tx_packets);
tx_bytes = u64_stats_read(&stats->tx_bytes); 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_packets += rx_packets;
s->rx_bytes += rx_bytes; s->rx_bytes += rx_bytes;

4
net/core/devlink.c
View File

@ -8304,10 +8304,10 @@ static void devlink_trap_stats_read(struct devlink_stats __percpu *trap_stats,
cpu_stats = per_cpu_ptr(trap_stats, i); cpu_stats = per_cpu_ptr(trap_stats, i);
do { 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_packets = u64_stats_read(&cpu_stats->rx_packets);
rx_bytes = u64_stats_read(&cpu_stats->rx_bytes); 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_packets, rx_packets);
u64_stats_add(&stats->rx_bytes, rx_bytes); u64_stats_add(&stats->rx_bytes, rx_bytes);

8
net/core/drop_monitor.c
View File

@ -1432,9 +1432,9 @@ static void net_dm_stats_read(struct net_dm_stats *stats)
u64 dropped; u64 dropped;
do { 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); 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); u64_stats_add(&stats->dropped, dropped);
} }
@ -1476,9 +1476,9 @@ static void net_dm_hw_stats_read(struct net_dm_stats *stats)
u64 dropped; u64 dropped;
do { 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); 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); u64_stats_add(&stats->dropped, dropped);
} }

16
net/core/gen_stats.c
View File

@ -135,10 +135,10 @@ static void gnet_stats_add_basic_cpu(struct gnet_stats_basic_sync *bstats,
u64 bytes, packets; u64 bytes, packets;
do { do {
start = u64_stats_fetch_begin_irq(&bcpu->syncp); start = u64_stats_fetch_begin(&bcpu->syncp);
bytes = u64_stats_read(&bcpu->bytes); bytes = u64_stats_read(&bcpu->bytes);
packets = u64_stats_read(&bcpu->packets); 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_bytes += bytes;
t_packets += packets; t_packets += packets;
@ -162,10 +162,10 @@ void gnet_stats_add_basic(struct gnet_stats_basic_sync *bstats,
} }
do { do {
if (running) if (running)
start = u64_stats_fetch_begin_irq(&b->syncp); start = u64_stats_fetch_begin(&b->syncp);
bytes = u64_stats_read(&b->bytes); bytes = u64_stats_read(&b->bytes);
packets = u64_stats_read(&b->packets); 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); _bstats_update(bstats, bytes, packets);
} }
@ -187,10 +187,10 @@ static void gnet_stats_read_basic(u64 *ret_bytes, u64 *ret_packets,
u64 bytes, packets; u64 bytes, packets;
do { do {
start = u64_stats_fetch_begin_irq(&bcpu->syncp); start = u64_stats_fetch_begin(&bcpu->syncp);
bytes = u64_stats_read(&bcpu->bytes); bytes = u64_stats_read(&bcpu->bytes);
packets = u64_stats_read(&bcpu->packets); 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_bytes += bytes;
t_packets += packets; t_packets += packets;
@ -201,10 +201,10 @@ static void gnet_stats_read_basic(u64 *ret_bytes, u64 *ret_packets,
} }
do { do {
if (running) 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_bytes = u64_stats_read(&b->bytes);
*ret_packets = u64_stats_read(&b->packets); *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 static int

4
net/dsa/slave.c
View File

@ -976,12 +976,12 @@ static void dsa_slave_get_ethtool_stats(struct net_device *dev,
s = per_cpu_ptr(dev->tstats, i); s = per_cpu_ptr(dev->tstats, i);
do { 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_packets = u64_stats_read(&s->tx_packets);
tx_bytes = u64_stats_read(&s->tx_bytes); tx_bytes = u64_stats_read(&s->tx_bytes);
rx_packets = u64_stats_read(&s->rx_packets); rx_packets = u64_stats_read(&s->rx_packets);
rx_bytes = u64_stats_read(&s->rx_bytes); 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[0] += tx_packets;
data[1] += tx_bytes; data[1] += tx_bytes;
data[2] += rx_packets; data[2] += rx_packets;

4
net/ipv4/af_inet.c
View File

@ -1706,9 +1706,9 @@ u64 snmp_get_cpu_field64(void __percpu *mib, int cpu, int offt,
bhptr = per_cpu_ptr(mib, cpu); bhptr = per_cpu_ptr(mib, cpu);
syncp = (struct u64_stats_sync *)(bhptr + syncp_offset); syncp = (struct u64_stats_sync *)(bhptr + syncp_offset);
do { do {
start = u64_stats_fetch_begin_irq(syncp); start = u64_stats_fetch_begin(syncp);
v = *(((u64 *)bhptr) + offt); v = *(((u64 *)bhptr) + offt);
} while (u64_stats_fetch_retry_irq(syncp, start)); } while (u64_stats_fetch_retry(syncp, start));
return v; return v;
} }

4
net/ipv6/seg6_local.c
View File

@ -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); pcounters = per_cpu_ptr(slwt->pcpu_counters, i);
do { do {
start = u64_stats_fetch_begin_irq(&pcounters->syncp); start = u64_stats_fetch_begin(&pcounters->syncp);
packets = u64_stats_read(&pcounters->packets); packets = u64_stats_read(&pcounters->packets);
bytes = u64_stats_read(&pcounters->bytes); bytes = u64_stats_read(&pcounters->bytes);
errors = u64_stats_read(&pcounters->errors); 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.packets += packets;
counters.bytes += bytes; counters.bytes += bytes;

8
net/mac80211/sta_info.c
View File

@ -2427,9 +2427,9 @@ static inline u64 sta_get_tidstats_msdu(struct ieee80211_sta_rx_stats *rxstats,
u64 value; u64 value;
do { do {
start = u64_stats_fetch_begin_irq(&rxstats->syncp); start = u64_stats_fetch_begin(&rxstats->syncp);
value = rxstats->msdu[tid]; value = rxstats->msdu[tid];
} while (u64_stats_fetch_retry_irq(&rxstats->syncp, start)); } while (u64_stats_fetch_retry(&rxstats->syncp, start));
return value; return value;
} }
@ -2495,9 +2495,9 @@ static inline u64 sta_get_stats_bytes(struct ieee80211_sta_rx_stats *rxstats)
u64 value; u64 value;
do { do {
start = u64_stats_fetch_begin_irq(&rxstats->syncp); start = u64_stats_fetch_begin(&rxstats->syncp);
value = rxstats->bytes; value = rxstats->bytes;
} while (u64_stats_fetch_retry_irq(&rxstats->syncp, start)); } while (u64_stats_fetch_retry(&rxstats->syncp, start));
return value; return value;
} }

4
net/mpls/af_mpls.c
View File

@ -1079,9 +1079,9 @@ static void mpls_get_stats(struct mpls_dev *mdev,
p = per_cpu_ptr(mdev->stats, i); p = per_cpu_ptr(mdev->stats, i);
do { do {
start = u64_stats_fetch_begin_irq(&p->syncp); start = u64_stats_fetch_begin(&p->syncp);
local = p->stats; 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_packets += local.rx_packets;
stats->rx_bytes += local.rx_bytes; stats->rx_bytes += local.rx_bytes;

4
net/netfilter/ipvs/ip_vs_ctl.c
View File

@ -2296,13 +2296,13 @@ static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v)
u64 conns, inpkts, outpkts, inbytes, outbytes; u64 conns, inpkts, outpkts, inbytes, outbytes;
do { do {
start = u64_stats_fetch_begin_irq(&u->syncp); start = u64_stats_fetch_begin(&u->syncp);
conns = u->cnt.conns; conns = u->cnt.conns;
inpkts = u->cnt.inpkts; inpkts = u->cnt.inpkts;
outpkts = u->cnt.outpkts; outpkts = u->cnt.outpkts;
inbytes = u->cnt.inbytes; inbytes = u->cnt.inbytes;
outbytes = u->cnt.outbytes; 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", seq_printf(seq, "%3X %8LX %8LX %8LX %16LX %16LX\n",
i, (u64)conns, (u64)inpkts, i, (u64)conns, (u64)inpkts,

4
net/netfilter/nf_tables_api.c
View File

@ -1534,10 +1534,10 @@ static int nft_dump_stats(struct sk_buff *skb, struct nft_stats __percpu *stats)
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
cpu_stats = per_cpu_ptr(stats, cpu); cpu_stats = per_cpu_ptr(stats, cpu);
do { do {
seq = u64_stats_fetch_begin_irq(&cpu_stats->syncp); seq = u64_stats_fetch_begin(&cpu_stats->syncp);
pkts = cpu_stats->pkts; pkts = cpu_stats->pkts;
bytes = cpu_stats->bytes; 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.pkts += pkts;
total.bytes += bytes; total.bytes += bytes;
} }

4
net/openvswitch/datapath.c
View File

@ -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); percpu_stats = per_cpu_ptr(dp->stats_percpu, i);
do { do {
start = u64_stats_fetch_begin_irq(&percpu_stats->syncp); start = u64_stats_fetch_begin(&percpu_stats->syncp);
local_stats = *percpu_stats; 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_hit += local_stats.n_hit;
stats->n_missed += local_stats.n_missed; stats->n_missed += local_stats.n_missed;

9
net/openvswitch/flow_table.c
View File

@ -205,9 +205,9 @@ static void tbl_mask_array_reset_counters(struct mask_array *ma)
stats = per_cpu_ptr(ma->masks_usage_stats, cpu); stats = per_cpu_ptr(ma->masks_usage_stats, cpu);
do { do {
start = u64_stats_fetch_begin_irq(&stats->syncp); start = u64_stats_fetch_begin(&stats->syncp);
counter = stats->usage_cntrs[i]; 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; 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); stats = per_cpu_ptr(ma->masks_usage_stats, cpu);
do { do {
start = u64_stats_fetch_begin_irq(&stats->syncp); start = u64_stats_fetch_begin(&stats->syncp);
counter = stats->usage_cntrs[i]; counter = stats->usage_cntrs[i];
} while (u64_stats_fetch_retry_irq(&stats->syncp, } while (u64_stats_fetch_retry(&stats->syncp, start));
start));
masks_and_count[i].counter += counter; masks_and_count[i].counter += counter;
} }