From nobody Sun Feb 8 08:27:55 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49D514657F5 for ; Wed, 21 Jan 2026 07:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768980757; cv=none; b=iFiCeNu4o9q/Mr+WJh+NZ4NC8OG8sVlxDZP3xkkZCgSdAarZpe/Eh2dGuEnI8LQ0j0hDFGbftWIodWIkyFpFJGxtEQnujMkwnedn8qXWOioXZ6VzNE4XjnQYjjAX0VCMjZs7QQiZcSWcxNx9JyUg+UaXvvyZWer3xmkTqcZfuOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768980757; c=relaxed/simple; bh=K8RrU+Wb8YJxZojVdorLJF0hxxkJ9QnqfN5f0fhKlww=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TDIOqT3LV4Akyz9pD0U0NMKh3bSqzJBnju5yTq8NfGVq6191RtVmbCMW2qcSlOXiIsk4k5qulhByrE5Zy67WtoW1+2o9BGzSLTvqQtk0GvY5K3IsQsFhLeN28968R2L4o7D1tN0HrTyUrEHkKab2PGd+exlFWdgUhJ+Qwc78cXM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ma9br3DJ; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ma9br3DJ" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-81f3c14027cso326663b3a.1 for ; Tue, 20 Jan 2026 23:32:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768980747; x=1769585547; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=0OgknG98lYGQ4DDCgWzz5ngQeI/Q8MCK+R+spum1Ndw=; b=Ma9br3DJu0Nm987BTQnGEqDvhcFwkxxY5uS3EW/5jeW4bzZGqqxyEvVCStxK9tXtxR w+CsyJG9I1ujhLlJ6ZdQnnf/RWkSSUTMksWMZ6vtGRDuoOFSQq3ufkJR2kbe5i1a7+Sj ue/ZixGNiqKb2sTmc5PcmlTuVXdrioeTPoAZT4+VRllAsxOfQpFe+9DE4w7rVGmOTZvq TKHt9CMHs2q5XReZ7trmglss95cIl477bcrClMCK33jf0Zlk58Iv7qB8xk3UxgWv2Okv p2QOQzqwqKr0TVlTYFdb5acKqTseEHTCIvihVnpytvfX1AWaBio81UzwXBJ5+AHqmdCU bdGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768980747; x=1769585547; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=0OgknG98lYGQ4DDCgWzz5ngQeI/Q8MCK+R+spum1Ndw=; b=EY2+0Wdz5HlfY7x9gqe6Ejrny3yMhEBB2xYdhFw1QSwYJZ6JjS23zYXiHRlKAO7Ib3 wns1yJZo4CywK6zf6ZB3N8H/nANv1JmwBA5l0N6oIUoDpYT6jhRlo/zWTIVAFJGnRhUm UZ66p9LsBq39ARL6ChSERBV+rEAANucwRENba4p7rax1mirGWdaw/cktB/89I55LE5uf UtU0R6xQ/cR0jKeZFyn9IdEns5kBh73C8l736+lfSc7+oV0RHIq0xUdKIggWqjrKiITi CHx4nOAMrEZ+6SRt5lzcCfOi34l+ccBZQ58xrX7le/AHwoCLdaIixA/IJvYxAQ3Ovzup AOYA== X-Forwarded-Encrypted: i=1; AJvYcCX3bWdV/GXmUzYSsaInt9KMAY6XzdLVB2+frEzhj6jbs/mL5am9WgLxTI6OBk5+Sm22Ol22+JTXBqG1jxQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxJFNfnGjJCM9qqSASVfbAUh9zvGOJzQ1PxLda/r2xYfTFSIPI7 BpUujI9MFRnldSIKdRMLam118dS2YtvGaPOhIjQsZFKLPsiCb2TBu3x2 X-Gm-Gg: AZuq6aL13J9Co5qTMuFk/I6k1rd/h+ZAZFL7/OHRRFOXqzYJBzOJJJuUr8Q4uyF3Qr7 5q4hg6E/usLJyvkpC+NnbqIJtzUHm95tHqZaPLpRiIrU9tupWPC51pXqABbrwMtvb44kek9tfxj 3hAmRWD5oPxQ8wOFnq2/YXbnyFvos1jqhOcnWLPjNLM1M1f7k1xEcVtIiMfVIJ7w73QvxDf2w51 db5jaxcQQPE7fYOBiUEG7Vcutp/UkdP6tuHRfxw95dDFvh7yPdhKzS5Q2ZggCaCa1wM707Z2nFQ AcYVEcNffTdPHvVA43SHzkuhGkfjSeLdNO57f6U5gFy3U0OeQzdO3D9vZgEJGM5zRapSmjS8tFD 89scm+6Ol/QL5hc5p0iP8EI/RfO9vqvDIGumlCYq4VU7gvUANsr1DYKq3746nI7r9r5H4dBqm6P TvXfxZpXhJnO+zbuocRIaMGGwsZxgWSOnfT5ydSCx7ZSfqeMsDk9lS4w== X-Received: by 2002:a05:6a00:b45:b0:81d:8872:941 with SMTP id d2e1a72fcca58-81f8f151963mr17850434b3a.26.1768980746781; Tue, 20 Jan 2026 23:32:26 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-81fa108c51dsm14125283b3a.14.2026.01.20.23.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 23:32:26 -0800 (PST) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Aaron Conole , Eelco Chaudron , Ilya Maximets , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , wangchuanlei , dev@openvswitch.org, linux-kernel@vger.kernel.org Subject: [PATCH net v2] net: openvswitch: fix data race in ovs_vport_get_upcall_stats Date: Wed, 21 Jan 2026 15:29:26 +0800 Message-ID: <20260121072932.2360971-1-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Acked-by: Ilya Maximets Reviewed-by: Aaron Conole Reviewed-by: Eric Dumazet --- v1: https://lore.kernel.org/r/20260119181339.1847451-1-mmyangfl@gmail.com - use u64 instead of __u64 net/openvswitch/vport.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 6bbbc16ab778..f0ce8ce1dce0 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -310,22 +310,23 @@ void ovs_vport_get_stats(struct vport *vport, struct = ovs_vport_stats *stats) */ int ovs_vport_get_upcall_stats(struct vport *vport, struct sk_buff *skb) { + u64 tx_success =3D 0, tx_fail =3D 0; struct nlattr *nla; int i; =20 - __u64 tx_success =3D 0; - __u64 tx_fail =3D 0; - for_each_possible_cpu(i) { const struct vport_upcall_stats_percpu *stats; + u64 n_success, n_fail; unsigned int start; =20 stats =3D per_cpu_ptr(vport->upcall_stats, i); do { start =3D u64_stats_fetch_begin(&stats->syncp); - tx_success +=3D u64_stats_read(&stats->n_success); - tx_fail +=3D u64_stats_read(&stats->n_fail); + n_success =3D u64_stats_read(&stats->n_success); + n_fail =3D u64_stats_read(&stats->n_fail); } while (u64_stats_fetch_retry(&stats->syncp, start)); + tx_success +=3D n_success; + tx_fail +=3D n_fail; } =20 nla =3D nla_nest_start_noflag(skb, OVS_VPORT_ATTR_UPCALL_STATS); --=20 2.51.0