From nobody Sun Feb 8 03:58:26 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 CF49930F52F for ; Mon, 19 Jan 2026 18:14:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768846495; cv=none; b=GcSBq1RhujgpbEy2Stl8dQCW+NhRMcdmwtM/b+nuLfKUvgIi8xQJSwwqjskUxdoxOgvZ8LeMCgZqD6SBmdtnomWbUCSz+cFhQbqgQy6iWXwyYpB3ezrvarrLnqyIVL3m7vuHkyGmYwJVzrk33qtdQpjO1iVrt8Cw8v8+PqEYu/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768846495; c=relaxed/simple; bh=KRlvyiPdOgWjaxLBz2wxPfYpZQKMBz8PLU0ghSnguQQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Yv7hDm546V8UDJkwTydXqawEQTu65x3EmT9bLJOWJ3X6uWGEqVyGEe8sb+cfF1AffCIfRobZgLonVEEF9eElCmxj86ZuxqlwDLDudfWICkigRP2I1juRPz40Lo8FNYc9mCOS8eJRScuc4l0ubk0+180JYTdefgaGD+8nkYqlWbs= 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=Jrg+OOFy; arc=none smtp.client-ip=209.85.214.181 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="Jrg+OOFy" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2a0bb2f093aso29759185ad.3 for ; Mon, 19 Jan 2026 10:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768846494; x=1769451294; 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=HDGrOETKogt96LjVqGzaFdVyjaVcAYfl4rZy/ucfVuU=; b=Jrg+OOFyiWFH/TJLOhk1nbqwnFm7tLIABb7wIvTX8yoeP7VUV1KXZmuzni2R9PXYcL xYadtWhHA/9Ka7wCPktBYcI6OWj4ccBjlW34D3jPMCrM1+KzlKDT6C2q7qg54yqVZfdK S6CwpOUrKnRmqntnTfHoTj4Xwi4gb8CGiuzLO6+xllGwwPT84YE/C4SATZoHnkmpKXwN GYQdFBD7Ldo1W6wr5siT+ffUQp7XkN+b3Gn1ZXAQ1LCVOX9Drrl0xYIn2kZWQr9Sgxwl 15PG1ZP1fJWPm98FT2ZrnwnUcAxE0yje16tABeOft0fMjPJ/15sJS2R88h3iS3esmNbY pdsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768846494; x=1769451294; 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=HDGrOETKogt96LjVqGzaFdVyjaVcAYfl4rZy/ucfVuU=; b=RJOMe0qCqiGWcVvL+j2bFKdN3rO/sVSHXYnAI7sLhxZNJubUQJaPe+gW8t8+NWBz7V 3q1UmLpg9v9YRni34tZaTAXlglEJxNr/ZQnTqAse4DoL0smNVKOn2DdS3U85XyHCD9Pt R3rrhx+HROpXiWY1LtKA5iyKPAsoT0BQxtcaQoWvHEjtq68CD2cxI43kQWzL4D8WEvn1 kEM7mi6+HLf8Rua0+DkX60u9zX6zK5LniEF771Uzy2VgdyCgunFKMoBj3O+TD+smRqP+ jqy4TVlLmDvPZlY2MPLNq7itsuPlTFT42MgZIhP1eJDrYd6yUYxcYnXC3FufTsVbKEqk eIdA== X-Forwarded-Encrypted: i=1; AJvYcCUBHP5hJA5sCybJK8E2wUT2pinSs9obd/aWzBBJgVkfxZHIGBeEkcd8C/RsNzMzO1mBUJ7jWu17fkbUfkQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyVaf/qu/tlJYOHgd/AziPFjoYhkT1ww/bxcVwGVl1eBGxbp1XE k7dMCg0k1gvsmstSNpK+LiH5e8LLCdgAJp+O9YzqQD4RxU+SD8c9QHve X-Gm-Gg: AZuq6aJe1b3zZjEz5UC4XEm7yK56V47sBM9mk/2D/LbZXHzs2h7WMVzrj3i5dK4U7M/ Wq/T5G/l3nwBdKTNe2RM33HMH7OTw3uzf74EkGGG4ojAn3aGHRjSi208XHfnompcxZoSYXaQGFg 7YkWkS2OcYVtjLp7L6VYIRlXAPgUjnZK41Of2tpkRg9E6pc6IuP5X0QWVz95P/bxN7OSlLf029n LUo3GUaXIncsD++ZEhjDi/vVtMmbdUcOAc/UniBl+1ChannPB+jxyiM5Urs7Z9XQ3+k44rsjyj2 g0f1aLdQd87VTupGVxm39bGJqqEousdZzGlMhnB3eqgeddF6+3YfimS1RIywzJgAWoUz1culnCz uPSmRr/EHPdTFzJEj2OiVBuKKzp6/Nr3D9KRPPxl88F4BGeP34JNi42Hw6RgwQjyd5l9WoK0jHL Tu8UBrc3duH/+vD5deXdmQRHuzjOnNbre5ADV6thMBi8ya4QMf5mMCqg== X-Received: by 2002:a17:903:244f:b0:2a7:5171:921f with SMTP id d9443c01a7336-2a75171932amr1730065ad.46.1768846494076; Mon, 19 Jan 2026 10:14:54 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7190ac3bdsm101769645ad.18.2026.01.19.10.14.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jan 2026 10:14:53 -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] net: openvswitch: fix data race in ovs_vport_get_upcall_stats Date: Tue, 20 Jan 2026 02:13:09 +0800 Message-ID: <20260119181339.1847451-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 --- net/openvswitch/vport.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 6bbbc16ab778..bc46d661b527 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -319,13 +319,17 @@ int ovs_vport_get_upcall_stats(struct vport *vport, s= truct sk_buff *skb) for_each_possible_cpu(i) { const struct vport_upcall_stats_percpu *stats; unsigned int start; + __u64 n_success; + __u64 n_fail; =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