Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Thomas Gleixner and committed by
Jakub Kicinski
d120d1a6 068c38ad

+44 -45
+2 -2
net/8021q/vlan_dev.c
··· 712 712 713 713 p = per_cpu_ptr(vlan_dev_priv(dev)->vlan_pcpu_stats, i); 714 714 do { 715 - start = u64_stats_fetch_begin_irq(&p->syncp); 715 + start = u64_stats_fetch_begin(&p->syncp); 716 716 rxpackets = u64_stats_read(&p->rx_packets); 717 717 rxbytes = u64_stats_read(&p->rx_bytes); 718 718 rxmulticast = u64_stats_read(&p->rx_multicast); 719 719 txpackets = u64_stats_read(&p->tx_packets); 720 720 txbytes = u64_stats_read(&p->tx_bytes); 721 - } while (u64_stats_fetch_retry_irq(&p->syncp, start)); 721 + } while (u64_stats_fetch_retry(&p->syncp, start)); 722 722 723 723 stats->rx_packets += rxpackets; 724 724 stats->rx_bytes += rxbytes;
+2 -2
net/bridge/br_multicast.c
··· 4899 4899 unsigned int start; 4900 4900 4901 4901 do { 4902 - start = u64_stats_fetch_begin_irq(&cpu_stats->syncp); 4902 + start = u64_stats_fetch_begin(&cpu_stats->syncp); 4903 4903 memcpy(&temp, &cpu_stats->mstats, sizeof(temp)); 4904 - } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start)); 4904 + } while (u64_stats_fetch_retry(&cpu_stats->syncp, start)); 4905 4905 4906 4906 mcast_stats_add_dir(tdst.igmp_v1queries, temp.igmp_v1queries); 4907 4907 mcast_stats_add_dir(tdst.igmp_v2queries, temp.igmp_v2queries);
+2 -2
net/bridge/br_vlan.c
··· 1378 1378 1379 1379 cpu_stats = per_cpu_ptr(v->stats, i); 1380 1380 do { 1381 - start = u64_stats_fetch_begin_irq(&cpu_stats->syncp); 1381 + start = u64_stats_fetch_begin(&cpu_stats->syncp); 1382 1382 rxpackets = u64_stats_read(&cpu_stats->rx_packets); 1383 1383 rxbytes = u64_stats_read(&cpu_stats->rx_bytes); 1384 1384 txbytes = u64_stats_read(&cpu_stats->tx_bytes); 1385 1385 txpackets = u64_stats_read(&cpu_stats->tx_packets); 1386 - } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start)); 1386 + } while (u64_stats_fetch_retry(&cpu_stats->syncp, start)); 1387 1387 1388 1388 u64_stats_add(&stats->rx_packets, rxpackets); 1389 1389 u64_stats_add(&stats->rx_bytes, rxbytes);
+2 -2
net/core/dev.c
··· 10477 10477 10478 10478 stats = per_cpu_ptr(netstats, cpu); 10479 10479 do { 10480 - start = u64_stats_fetch_begin_irq(&stats->syncp); 10480 + start = u64_stats_fetch_begin(&stats->syncp); 10481 10481 rx_packets = u64_stats_read(&stats->rx_packets); 10482 10482 rx_bytes = u64_stats_read(&stats->rx_bytes); 10483 10483 tx_packets = u64_stats_read(&stats->tx_packets); 10484 10484 tx_bytes = u64_stats_read(&stats->tx_bytes); 10485 - } while (u64_stats_fetch_retry_irq(&stats->syncp, start)); 10485 + } while (u64_stats_fetch_retry(&stats->syncp, start)); 10486 10486 10487 10487 s->rx_packets += rx_packets; 10488 10488 s->rx_bytes += rx_bytes;
+2 -2
net/core/devlink.c
··· 8304 8304 8305 8305 cpu_stats = per_cpu_ptr(trap_stats, i); 8306 8306 do { 8307 - start = u64_stats_fetch_begin_irq(&cpu_stats->syncp); 8307 + start = u64_stats_fetch_begin(&cpu_stats->syncp); 8308 8308 rx_packets = u64_stats_read(&cpu_stats->rx_packets); 8309 8309 rx_bytes = u64_stats_read(&cpu_stats->rx_bytes); 8310 - } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start)); 8310 + } while (u64_stats_fetch_retry(&cpu_stats->syncp, start)); 8311 8311 8312 8312 u64_stats_add(&stats->rx_packets, rx_packets); 8313 8313 u64_stats_add(&stats->rx_bytes, rx_bytes);
+4 -4
net/core/drop_monitor.c
··· 1432 1432 u64 dropped; 1433 1433 1434 1434 do { 1435 - start = u64_stats_fetch_begin_irq(&cpu_stats->syncp); 1435 + start = u64_stats_fetch_begin(&cpu_stats->syncp); 1436 1436 dropped = u64_stats_read(&cpu_stats->dropped); 1437 - } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start)); 1437 + } while (u64_stats_fetch_retry(&cpu_stats->syncp, start)); 1438 1438 1439 1439 u64_stats_add(&stats->dropped, dropped); 1440 1440 } ··· 1476 1476 u64 dropped; 1477 1477 1478 1478 do { 1479 - start = u64_stats_fetch_begin_irq(&cpu_stats->syncp); 1479 + start = u64_stats_fetch_begin(&cpu_stats->syncp); 1480 1480 dropped = u64_stats_read(&cpu_stats->dropped); 1481 - } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, start)); 1481 + } while (u64_stats_fetch_retry(&cpu_stats->syncp, start)); 1482 1482 1483 1483 u64_stats_add(&stats->dropped, dropped); 1484 1484 }
+8 -8
net/core/gen_stats.c
··· 135 135 u64 bytes, packets; 136 136 137 137 do { 138 - start = u64_stats_fetch_begin_irq(&bcpu->syncp); 138 + start = u64_stats_fetch_begin(&bcpu->syncp); 139 139 bytes = u64_stats_read(&bcpu->bytes); 140 140 packets = u64_stats_read(&bcpu->packets); 141 - } while (u64_stats_fetch_retry_irq(&bcpu->syncp, start)); 141 + } while (u64_stats_fetch_retry(&bcpu->syncp, start)); 142 142 143 143 t_bytes += bytes; 144 144 t_packets += packets; ··· 162 162 } 163 163 do { 164 164 if (running) 165 - start = u64_stats_fetch_begin_irq(&b->syncp); 165 + start = u64_stats_fetch_begin(&b->syncp); 166 166 bytes = u64_stats_read(&b->bytes); 167 167 packets = u64_stats_read(&b->packets); 168 - } while (running && u64_stats_fetch_retry_irq(&b->syncp, start)); 168 + } while (running && u64_stats_fetch_retry(&b->syncp, start)); 169 169 170 170 _bstats_update(bstats, bytes, packets); 171 171 } ··· 187 187 u64 bytes, packets; 188 188 189 189 do { 190 - start = u64_stats_fetch_begin_irq(&bcpu->syncp); 190 + start = u64_stats_fetch_begin(&bcpu->syncp); 191 191 bytes = u64_stats_read(&bcpu->bytes); 192 192 packets = u64_stats_read(&bcpu->packets); 193 - } while (u64_stats_fetch_retry_irq(&bcpu->syncp, start)); 193 + } while (u64_stats_fetch_retry(&bcpu->syncp, start)); 194 194 195 195 t_bytes += bytes; 196 196 t_packets += packets; ··· 201 201 } 202 202 do { 203 203 if (running) 204 - start = u64_stats_fetch_begin_irq(&b->syncp); 204 + start = u64_stats_fetch_begin(&b->syncp); 205 205 *ret_bytes = u64_stats_read(&b->bytes); 206 206 *ret_packets = u64_stats_read(&b->packets); 207 - } while (running && u64_stats_fetch_retry_irq(&b->syncp, start)); 207 + } while (running && u64_stats_fetch_retry(&b->syncp, start)); 208 208 } 209 209 210 210 static int
+2 -2
net/dsa/slave.c
··· 976 976 977 977 s = per_cpu_ptr(dev->tstats, i); 978 978 do { 979 - start = u64_stats_fetch_begin_irq(&s->syncp); 979 + start = u64_stats_fetch_begin(&s->syncp); 980 980 tx_packets = u64_stats_read(&s->tx_packets); 981 981 tx_bytes = u64_stats_read(&s->tx_bytes); 982 982 rx_packets = u64_stats_read(&s->rx_packets); 983 983 rx_bytes = u64_stats_read(&s->rx_bytes); 984 - } while (u64_stats_fetch_retry_irq(&s->syncp, start)); 984 + } while (u64_stats_fetch_retry(&s->syncp, start)); 985 985 data[0] += tx_packets; 986 986 data[1] += tx_bytes; 987 987 data[2] += rx_packets;
+2 -2
net/ipv4/af_inet.c
··· 1706 1706 bhptr = per_cpu_ptr(mib, cpu); 1707 1707 syncp = (struct u64_stats_sync *)(bhptr + syncp_offset); 1708 1708 do { 1709 - start = u64_stats_fetch_begin_irq(syncp); 1709 + start = u64_stats_fetch_begin(syncp); 1710 1710 v = *(((u64 *)bhptr) + offt); 1711 - } while (u64_stats_fetch_retry_irq(syncp, start)); 1711 + } while (u64_stats_fetch_retry(syncp, start)); 1712 1712 1713 1713 return v; 1714 1714 }
+2 -2
net/ipv6/seg6_local.c
··· 1644 1644 1645 1645 pcounters = per_cpu_ptr(slwt->pcpu_counters, i); 1646 1646 do { 1647 - start = u64_stats_fetch_begin_irq(&pcounters->syncp); 1647 + start = u64_stats_fetch_begin(&pcounters->syncp); 1648 1648 1649 1649 packets = u64_stats_read(&pcounters->packets); 1650 1650 bytes = u64_stats_read(&pcounters->bytes); 1651 1651 errors = u64_stats_read(&pcounters->errors); 1652 1652 1653 - } while (u64_stats_fetch_retry_irq(&pcounters->syncp, start)); 1653 + } while (u64_stats_fetch_retry(&pcounters->syncp, start)); 1654 1654 1655 1655 counters.packets += packets; 1656 1656 counters.bytes += bytes;
+4 -4
net/mac80211/sta_info.c
··· 2427 2427 u64 value; 2428 2428 2429 2429 do { 2430 - start = u64_stats_fetch_begin_irq(&rxstats->syncp); 2430 + start = u64_stats_fetch_begin(&rxstats->syncp); 2431 2431 value = rxstats->msdu[tid]; 2432 - } while (u64_stats_fetch_retry_irq(&rxstats->syncp, start)); 2432 + } while (u64_stats_fetch_retry(&rxstats->syncp, start)); 2433 2433 2434 2434 return value; 2435 2435 } ··· 2495 2495 u64 value; 2496 2496 2497 2497 do { 2498 - start = u64_stats_fetch_begin_irq(&rxstats->syncp); 2498 + start = u64_stats_fetch_begin(&rxstats->syncp); 2499 2499 value = rxstats->bytes; 2500 - } while (u64_stats_fetch_retry_irq(&rxstats->syncp, start)); 2500 + } while (u64_stats_fetch_retry(&rxstats->syncp, start)); 2501 2501 2502 2502 return value; 2503 2503 }
+2 -2
net/mpls/af_mpls.c
··· 1079 1079 1080 1080 p = per_cpu_ptr(mdev->stats, i); 1081 1081 do { 1082 - start = u64_stats_fetch_begin_irq(&p->syncp); 1082 + start = u64_stats_fetch_begin(&p->syncp); 1083 1083 local = p->stats; 1084 - } while (u64_stats_fetch_retry_irq(&p->syncp, start)); 1084 + } while (u64_stats_fetch_retry(&p->syncp, start)); 1085 1085 1086 1086 stats->rx_packets += local.rx_packets; 1087 1087 stats->rx_bytes += local.rx_bytes;
+2 -2
net/netfilter/ipvs/ip_vs_ctl.c
··· 2296 2296 u64 conns, inpkts, outpkts, inbytes, outbytes; 2297 2297 2298 2298 do { 2299 - start = u64_stats_fetch_begin_irq(&u->syncp); 2299 + start = u64_stats_fetch_begin(&u->syncp); 2300 2300 conns = u->cnt.conns; 2301 2301 inpkts = u->cnt.inpkts; 2302 2302 outpkts = u->cnt.outpkts; 2303 2303 inbytes = u->cnt.inbytes; 2304 2304 outbytes = u->cnt.outbytes; 2305 - } while (u64_stats_fetch_retry_irq(&u->syncp, start)); 2305 + } while (u64_stats_fetch_retry(&u->syncp, start)); 2306 2306 2307 2307 seq_printf(seq, "%3X %8LX %8LX %8LX %16LX %16LX\n", 2308 2308 i, (u64)conns, (u64)inpkts,
+2 -2
net/netfilter/nf_tables_api.c
··· 1534 1534 for_each_possible_cpu(cpu) { 1535 1535 cpu_stats = per_cpu_ptr(stats, cpu); 1536 1536 do { 1537 - seq = u64_stats_fetch_begin_irq(&cpu_stats->syncp); 1537 + seq = u64_stats_fetch_begin(&cpu_stats->syncp); 1538 1538 pkts = cpu_stats->pkts; 1539 1539 bytes = cpu_stats->bytes; 1540 - } while (u64_stats_fetch_retry_irq(&cpu_stats->syncp, seq)); 1540 + } while (u64_stats_fetch_retry(&cpu_stats->syncp, seq)); 1541 1541 total.pkts += pkts; 1542 1542 total.bytes += bytes; 1543 1543 }
+2 -2
net/openvswitch/datapath.c
··· 716 716 percpu_stats = per_cpu_ptr(dp->stats_percpu, i); 717 717 718 718 do { 719 - start = u64_stats_fetch_begin_irq(&percpu_stats->syncp); 719 + start = u64_stats_fetch_begin(&percpu_stats->syncp); 720 720 local_stats = *percpu_stats; 721 - } while (u64_stats_fetch_retry_irq(&percpu_stats->syncp, start)); 721 + } while (u64_stats_fetch_retry(&percpu_stats->syncp, start)); 722 722 723 723 stats->n_hit += local_stats.n_hit; 724 724 stats->n_missed += local_stats.n_missed;
+4 -5
net/openvswitch/flow_table.c
··· 205 205 206 206 stats = per_cpu_ptr(ma->masks_usage_stats, cpu); 207 207 do { 208 - start = u64_stats_fetch_begin_irq(&stats->syncp); 208 + start = u64_stats_fetch_begin(&stats->syncp); 209 209 counter = stats->usage_cntrs[i]; 210 - } while (u64_stats_fetch_retry_irq(&stats->syncp, start)); 210 + } while (u64_stats_fetch_retry(&stats->syncp, start)); 211 211 212 212 ma->masks_usage_zero_cntr[i] += counter; 213 213 } ··· 1136 1136 1137 1137 stats = per_cpu_ptr(ma->masks_usage_stats, cpu); 1138 1138 do { 1139 - start = u64_stats_fetch_begin_irq(&stats->syncp); 1139 + start = u64_stats_fetch_begin(&stats->syncp); 1140 1140 counter = stats->usage_cntrs[i]; 1141 - } while (u64_stats_fetch_retry_irq(&stats->syncp, 1142 - start)); 1141 + } while (u64_stats_fetch_retry(&stats->syncp, start)); 1143 1142 1144 1143 masks_and_count[i].counter += counter; 1145 1144 }