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

veth: fix data race in veth_get_ethtool_stats

In veth_get_ethtool_stats(), some statistics protected by
u64_stats_sync, are read and accumulated in ignorance of possible
u64_stats_fetch_retry() events. These statistics, peer_tq_xdp_xmit and
peer_tq_xdp_xmit_err, are already accumulated by veth_xdp_xmit(). Fix
this by reading them into a temporary buffer first.

Fixes: 5fe6e56776ba ("veth: rely on peer veth_rq for ndo_xdp_xmit accounting")
Signed-off-by: David Yang <mmyangfl@gmail.com>
Link: https://patch.msgid.link/20260114122450.227982-1-mmyangfl@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

David Yang and committed by
Jakub Kicinski
b47adaab 6a5e5a3d

+6 -2
+6 -2
drivers/net/veth.c
··· 228 228 const struct veth_rq_stats *rq_stats = &rcv_priv->rq[i].stats; 229 229 const void *base = (void *)&rq_stats->vs; 230 230 unsigned int start, tx_idx = idx; 231 + u64 buf[VETH_TQ_STATS_LEN]; 231 232 size_t offset; 232 233 233 - tx_idx += (i % dev->real_num_tx_queues) * VETH_TQ_STATS_LEN; 234 234 do { 235 235 start = u64_stats_fetch_begin(&rq_stats->syncp); 236 236 for (j = 0; j < VETH_TQ_STATS_LEN; j++) { 237 237 offset = veth_tq_stats_desc[j].offset; 238 - data[tx_idx + j] += *(u64 *)(base + offset); 238 + buf[j] = *(u64 *)(base + offset); 239 239 } 240 240 } while (u64_stats_fetch_retry(&rq_stats->syncp, start)); 241 + 242 + tx_idx += (i % dev->real_num_tx_queues) * VETH_TQ_STATS_LEN; 243 + for (j = 0; j < VETH_TQ_STATS_LEN; j++) 244 + data[tx_idx + j] += buf[j]; 241 245 } 242 246 pp_idx = idx + dev->real_num_tx_queues * VETH_TQ_STATS_LEN; 243 247