Skip to content

Commit

Permalink
ipvs: use u64_stats_t for the per-cpu counters
Browse files Browse the repository at this point in the history 
Use the provided u64_stats_t type to avoid
load/store tearing.

Fixes: 316580b ("u64_stats: provide u64_stats_t type")
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Cc: yunhong-cgl jiang <xintian1976@gmail.com>
Cc: "dust.li" <dust.li@linux.alibaba.com>
Reviewed-by: Jiri Wiesner <jwiesner@suse.de>
Tested-by: Jiri Wiesner <jwiesner@suse.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Julian Anastasov authored and Pablo Neira Ayuso committed Dec 10, 2022
1 parent de39afb commit 1dbd8d9
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 35 deletions.
10 changes: 5 additions & 5 deletions include/net/ip_vs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,11 @@ struct ip_vs_seq {

/* counters per cpu */
struct ip_vs_counters {
__u64 conns; /* connections scheduled */
__u64 inpkts; /* incoming packets */
__u64 outpkts; /* outgoing packets */
__u64 inbytes; /* incoming bytes */
__u64 outbytes; /* outgoing bytes */
u64_stats_t conns; /* connections scheduled */
u64_stats_t inpkts; /* incoming packets */
u64_stats_t outpkts; /* outgoing packets */
u64_stats_t inbytes; /* incoming bytes */
u64_stats_t outbytes; /* outgoing bytes */
};
/* Stats per cpu */
struct ip_vs_cpu_stats {
Expand Down
30 changes: 15 additions & 15 deletions net/netfilter/ipvs/ip_vs_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,21 +132,21 @@ ip_vs_in_stats(struct ip_vs_conn *cp, struct sk_buff *skb)

s = this_cpu_ptr(dest->stats.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.inpkts++;
s->cnt.inbytes += skb->len;
u64_stats_inc(&s->cnt.inpkts);
u64_stats_add(&s->cnt.inbytes, skb->len);
u64_stats_update_end(&s->syncp);

svc = rcu_dereference(dest->svc);
s = this_cpu_ptr(svc->stats.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.inpkts++;
s->cnt.inbytes += skb->len;
u64_stats_inc(&s->cnt.inpkts);
u64_stats_add(&s->cnt.inbytes, skb->len);
u64_stats_update_end(&s->syncp);

s = this_cpu_ptr(ipvs->tot_stats->s.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.inpkts++;
s->cnt.inbytes += skb->len;
u64_stats_inc(&s->cnt.inpkts);
u64_stats_add(&s->cnt.inbytes, skb->len);
u64_stats_update_end(&s->syncp);

local_bh_enable();
Expand All @@ -168,21 +168,21 @@ ip_vs_out_stats(struct ip_vs_conn *cp, struct sk_buff *skb)

s = this_cpu_ptr(dest->stats.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.outpkts++;
s->cnt.outbytes += skb->len;
u64_stats_inc(&s->cnt.outpkts);
u64_stats_add(&s->cnt.outbytes, skb->len);
u64_stats_update_end(&s->syncp);

svc = rcu_dereference(dest->svc);
s = this_cpu_ptr(svc->stats.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.outpkts++;
s->cnt.outbytes += skb->len;
u64_stats_inc(&s->cnt.outpkts);
u64_stats_add(&s->cnt.outbytes, skb->len);
u64_stats_update_end(&s->syncp);

s = this_cpu_ptr(ipvs->tot_stats->s.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.outpkts++;
s->cnt.outbytes += skb->len;
u64_stats_inc(&s->cnt.outpkts);
u64_stats_add(&s->cnt.outbytes, skb->len);
u64_stats_update_end(&s->syncp);

local_bh_enable();
Expand All @@ -200,17 +200,17 @@ ip_vs_conn_stats(struct ip_vs_conn *cp, struct ip_vs_service *svc)

s = this_cpu_ptr(cp->dest->stats.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.conns++;
u64_stats_inc(&s->cnt.conns);
u64_stats_update_end(&s->syncp);

s = this_cpu_ptr(svc->stats.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.conns++;
u64_stats_inc(&s->cnt.conns);
u64_stats_update_end(&s->syncp);

s = this_cpu_ptr(ipvs->tot_stats->s.cpustats);
u64_stats_update_begin(&s->syncp);
s->cnt.conns++;
u64_stats_inc(&s->cnt.conns);
u64_stats_update_end(&s->syncp);

local_bh_enable();
Expand Down
10 changes: 5 additions & 5 deletions net/netfilter/ipvs/ip_vs_ctl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2335,11 +2335,11 @@ static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v)

do {
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;
conns = u64_stats_read(&u->cnt.conns);
inpkts = u64_stats_read(&u->cnt.inpkts);
outpkts = u64_stats_read(&u->cnt.outpkts);
inbytes = u64_stats_read(&u->cnt.inbytes);
outbytes = u64_stats_read(&u->cnt.outbytes);
} while (u64_stats_fetch_retry(&u->syncp, start));

seq_printf(seq, "%3X %8LX %8LX %8LX %16LX %16LX\n",
Expand Down
20 changes: 10 additions & 10 deletions net/netfilter/ipvs/ip_vs_est.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ static void ip_vs_read_cpu_stats(struct ip_vs_kstats *sum,
if (add) {
do {
start = u64_stats_fetch_begin(&s->syncp);
conns = s->cnt.conns;
inpkts = s->cnt.inpkts;
outpkts = s->cnt.outpkts;
inbytes = s->cnt.inbytes;
outbytes = s->cnt.outbytes;
conns = u64_stats_read(&s->cnt.conns);
inpkts = u64_stats_read(&s->cnt.inpkts);
outpkts = u64_stats_read(&s->cnt.outpkts);
inbytes = u64_stats_read(&s->cnt.inbytes);
outbytes = u64_stats_read(&s->cnt.outbytes);
} while (u64_stats_fetch_retry(&s->syncp, start));
sum->conns += conns;
sum->inpkts += inpkts;
Expand All @@ -82,11 +82,11 @@ static void ip_vs_read_cpu_stats(struct ip_vs_kstats *sum,
add = true;
do {
start = u64_stats_fetch_begin(&s->syncp);
sum->conns = s->cnt.conns;
sum->inpkts = s->cnt.inpkts;
sum->outpkts = s->cnt.outpkts;
sum->inbytes = s->cnt.inbytes;
sum->outbytes = s->cnt.outbytes;
sum->conns = u64_stats_read(&s->cnt.conns);
sum->inpkts = u64_stats_read(&s->cnt.inpkts);
sum->outpkts = u64_stats_read(&s->cnt.outpkts);
sum->inbytes = u64_stats_read(&s->cnt.inbytes);
sum->outbytes = u64_stats_read(&s->cnt.outbytes);
} while (u64_stats_fetch_retry(&s->syncp, start));
}
}
Expand Down

0 comments on commit 1dbd8d9

Please sign in to comment.