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

net: openvswitch: fix data race in ovs_vport_get_upcall_stats

In ovs_vport_get_upcall_stats(), some statistics protected by
u64_stats_sync, are read and accumulated in ignorance of possible
u64_stats_fetch_retry() events. These statistics are already accumulated
by u64_stats_inc(). Fix this by reading them into temporary variables
first.

Fixes: 1933ea365aa7 ("net: openvswitch: Add support to count upcall packets")
Signed-off-by: David Yang <mmyangfl@gmail.com>
Acked-by: Ilya Maximets <i.maximets@ovn.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Aaron Conole <aconole@redhat.com>
Link: https://patch.msgid.link/20260121072932.2360971-1-mmyangfl@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

David Yang and committed by
Paolo Abeni
cc4816bd 19e4175e

+6 -5
+6 -5
net/openvswitch/vport.c
··· 310 310 */ 311 311 int ovs_vport_get_upcall_stats(struct vport *vport, struct sk_buff *skb) 312 312 { 313 + u64 tx_success = 0, tx_fail = 0; 313 314 struct nlattr *nla; 314 315 int i; 315 316 316 - __u64 tx_success = 0; 317 - __u64 tx_fail = 0; 318 - 319 317 for_each_possible_cpu(i) { 320 318 const struct vport_upcall_stats_percpu *stats; 319 + u64 n_success, n_fail; 321 320 unsigned int start; 322 321 323 322 stats = per_cpu_ptr(vport->upcall_stats, i); 324 323 do { 325 324 start = u64_stats_fetch_begin(&stats->syncp); 326 - tx_success += u64_stats_read(&stats->n_success); 327 - tx_fail += u64_stats_read(&stats->n_fail); 325 + n_success = u64_stats_read(&stats->n_success); 326 + n_fail = u64_stats_read(&stats->n_fail); 328 327 } while (u64_stats_fetch_retry(&stats->syncp, start)); 328 + tx_success += n_success; 329 + tx_fail += n_fail; 329 330 } 330 331 331 332 nla = nla_nest_start_noflag(skb, OVS_VPORT_ATTR_UPCALL_STATS);