Skip to content

Commit

Permalink
net: Remove the obsolte u64_stats_fetch_*_irq() users (net).
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Thomas Gleixner authored and Jakub Kicinski committed Oct 29, 2022
1 parent 068c38a commit d120d1a
Show file tree
Hide file tree
Showing 16 changed files with 44 additions and 45 deletions.
4 changes: 2 additions & 2 deletions net/8021q/vlan_dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions net/bridge/br_multicast.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions net/bridge/br_vlan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions net/core/dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions net/core/devlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions net/core/drop_monitor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
16 changes: 8 additions & 8 deletions net/core/gen_stats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
Expand All @@ -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;
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions net/dsa/slave.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions net/ipv4/af_inet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/seg6_local.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions net/mac80211/sta_info.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions net/mpls/af_mpls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/ipvs/ip_vs_ctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions net/netfilter/nf_tables_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions net/openvswitch/datapath.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions net/openvswitch/flow_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit d120d1a

Please sign in to comment.