From nobody Fri Jun 12 17:16:16 2026 Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) (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 832B940DFBE for ; Wed, 13 May 2026 12:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677182; cv=none; b=DCDx1VBaOn9yvNtNHqK2JXl5jXI6+38aOOT60MNhndt9WAzKNmH/+HylxuEhRwknrrikoaJaomz2T+KBNQnUjTgTS872wF/mNFjoswrFpTYBrsH9wF+jQup//rX/pFqm4mfSs/8IAV2ZQnqv4XwccC+erxddmxa9w4Y50uHcWKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677182; c=relaxed/simple; bh=WJHk8maGSEB65sDoFPyWaoUlOubnzhtY1l+tFa9b1+4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uo9drpCPsK2UYMDIUQyD4x9A7p+RjJ94dDahzSt92nMIPUU8FFhxH+vxxP02B65LgRzJj4WaX8F6iifhkXTrEUg//AQAyCYOt65SZRqN1TwzGR+j9kwlzUhcVnJ5dCIGu4EeicAZr9+PtjYVycLg5klLcyT/9I4oa1qRhOpcYu8= 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=Cv98Wn85; arc=none smtp.client-ip=209.85.167.179 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="Cv98Wn85" Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-47c35be031dso4218042b6e.3 for ; Wed, 13 May 2026 05:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778677180; x=1779281980; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=YEd8B+4ETorMRvaZk4A2OA33txPGEogtxfH5SN4ZIzU=; b=Cv98Wn859DOpJvWMzZIyqEXrPZHikDrZUTsv0nGNnBpKDm3Y6/W3m6kHzmlvazCEOR XIc1e10sdw81ncgGOgMYLJOtzKZMCi0NgwzCQ/5G3xdgPBf84IO0dAxcW44SgaVJyh07 XKYglN8ApKV1v82f3LkpcOEyMFpBEkGsN4OcubsCs6aOVkCSFjBUndGjl1mePv7P8w6V 391MBqGzsI7TaDSaw2+jix8THCxoz87Q1F+WaCfaysWy6ix5rYZ8nV804I9yjaBo2/ZN UdGzOOjOHDoqjIhcB1H9VIF0VrkfzSFsUWRi1d9ileEKhnThT4mdhQLVOdKbwX7M6QNl LoYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677180; x=1779281980; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=YEd8B+4ETorMRvaZk4A2OA33txPGEogtxfH5SN4ZIzU=; b=RwMw1i8UZSePB/PPbqIIiAwg96ZgVn6Z9jUkH6hJE7fdLrsIJ3Wc7CjADeggZE/W/f DJ9v33VMLm7+1YbGHRCa5w7FwFlDnNCsdvfi0wDnqwzxTtdxm0yJW3ls20hAXhNeT7G8 AxkAZP3PmOjzdbR7Ksu63GT0fmjFAbKrZNgRJH2SZMGarvC1ytZh3mDGxQVb1T9NbMcV OEqrblaoc2KjXBqRs8zhAQ+sZQeJ86sOoGAods8uwvdKwc4zzmRDVWQhHtWaRizUq0hL kd03vmd5paM4lL8uHmIskrDdImg1NnoOqkzYtRcwdPM2OPYc8ovv9EReU8LVBRv6pwvm s/Pw== X-Forwarded-Encrypted: i=1; AFNElJ+qWjDJC0B2p+KGkTo9Bl/3h4+hQ1WXzD5obhYAAChBIrcN6I5gWxyHF5ulrN3/TXEnZFJjMZmRcPQfdRk=@vger.kernel.org X-Gm-Message-State: AOJu0YwI3ewAm6cHpwK9ZCG9ktUHUVx82I5mI/U6uCPZmSFzkpUZDY1Z gNLLA+kyJae4GnC+weaNBuifKcbbKyoBp7QRCLab9a3Bo2NoHPbzfiFW X-Gm-Gg: Acq92OECAdpTUoMeR6FTiNsxYwmbRtstHiOKm9jv1BlAd9o1Hhb/gtwCS7QkOd1AbLU QzAMjVSsOItQisDKwgcspkaIQB/fo7fnQihXKHWCiDvWtc7c7YTqPlQfZ6RCMFwC1FwAqhU30tl 7j1R1uHIqSE+hjGDcYbJdiThKT4v3TW75HIbQDfE7P4QUkiunTTB62ocZ02WYLUfQMR/2nqiWsT f4lgdXYmQl3jKweh2HgYM1c4D6V/z+hj2V9rcrnWapuednotoOwffhRm8owKI0YKe4ZB6Uope6k K4FVv+CkB4o8bjds6hB9yvlRKxBIcPSH1B8H0GwjgBUSgXU/HfDFnMIKc+JVpLTLVxec+W0vWkZ OC8qP7N4r+rw54/bXz4Jnwz2rsQwuJtjVVysbrKTntijWECTICZCTgOsQJTgyoKYuzZC2szyxSU 4k9+Q2gXb16IMnbMUbnHlboecR7Q+n2A== X-Received: by 2002:a05:6808:660d:b0:479:c81f:8e18 with SMTP id 5614622812f47-482b28c35cemr2091090b6e.3.1778677180593; Wed, 13 May 2026 05:59:40 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:5::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-435574490b0sm15661031fac.17.2026.05.13.05.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 05:59:40 -0700 (PDT) From: Daniel Zahka Date: Wed, 13 May 2026 05:59:36 -0700 Subject: [PATCH net 1/3] netdevsim: psp: initialize stats syncp before use Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260513-fix-psp-stats-v1-1-cdb3174f252f@gmail.com> References: <20260513-fix-psp-stats-v1-0-cdb3174f252f@gmail.com> In-Reply-To: <20260513-fix-psp-stats-v1-0-cdb3174f252f@gmail.com> To: Jakub Kicinski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Willem de Bruijn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13.0 The reader and writer stats paths access this object, which was not being initialized. Initialize in nsim_psp_init() before registering the psp device. Fixes: 178f0763c5f3 ("netdevsim: implement psp device stats") Assisted-by: Codex:gpt-5.5 Signed-off-by: Daniel Zahka --- drivers/net/netdevsim/psp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/netdevsim/psp.c b/drivers/net/netdevsim/psp.c index 6936ecb8173e..92a2ed770a36 100644 --- a/drivers/net/netdevsim/psp.c +++ b/drivers/net/netdevsim/psp.c @@ -268,6 +268,8 @@ int nsim_psp_init(struct netdevsim *ns) struct dentry *ddir =3D ns->nsim_dev_port->ddir; struct psp_dev *psd; =20 + u64_stats_init(&ns->psp.syncp); + psd =3D psp_dev_create(ns->netdev, &nsim_psp_ops, &nsim_psp_caps, ns); if (IS_ERR(psd)) return PTR_ERR(psd); --=20 2.52.0 From nobody Fri Jun 12 17:16:16 2026 Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) (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 A35AB421EE6 for ; Wed, 13 May 2026 12:59:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677184; cv=none; b=FyomAlLQDjvxtLfoxtgWMN0upV6qG9pMDR88rIq21TkIOs688dEpKd9AdwkdDwOhSgjHHnsbDA7s1+w3BuI/kDbh0JEV14OKDHooR7HDlp69g9v8dRCzCxrnFGlV0tE/n8N0lBm/VbJosxPv/ynNeyUvQITB9vfCsPh3/jwMdsE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677184; c=relaxed/simple; bh=mCCve/XWxpjDAvshnWGhRzGeWPn5vE5uTNjG4Th9yoA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Dkq5/h0zE/W472K+u2HUVPuqkbsxwvHM88ieWUDNHe05wKetYP8Lu08OKR8kOQnM80bzTce7MOn9q/d70NAdm7BhUbW5NWRBw4lnzB7G678UqL1589xUXT5llurOdbLHrczeelrRFuQGVvI/V6IGDyA3O0U1kTFFFg9+UgH+rB4= 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=MozZsnhO; arc=none smtp.client-ip=209.85.160.53 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="MozZsnhO" Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-439bdbc86b1so896946fac.1 for ; Wed, 13 May 2026 05:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778677182; x=1779281982; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=U+AwLwaO4ONCHasEnZUf3l3ifse+yp4aIXtzs6brKIM=; b=MozZsnhOCEb+YijyIYuPE99HZ13njpivCvQM6LvInjil8AEaTM8XvLgY7u7BBccK9y 0pYF/QnfHLsn3JuL2SaGrMnRZH4CHDTF6AOSOAe0bqVV6omaMAI1almMy4EtzZJvn1S1 qEduinkS7SrVjVNE54JCzQ9dA/RBt7ub5v0FI+8k/uOPmj1PyeeAjORiY1HQnpLlOWpr osQfz7Xt9hiMnBeDMoeNBjjDbqqZ5dX3QS3NwY1ehdanW1PeQZagIBlKF3uPUYpPkKhp 0fpxD63ZBoQ+CEkbkmt1Pb2ZX4+RnJCshiiB1MWzX+m3Re8xw1MEgRrURWXYXfz6CyA7 LhmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677182; x=1779281982; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=U+AwLwaO4ONCHasEnZUf3l3ifse+yp4aIXtzs6brKIM=; b=F0QAsT0yOmXxxqYaSAmeJHfCh+srvz/bI7lzvLCce1CM+RXQ+C5xVksmF2VTJfwQ9S r/fb3rcsO5FH2cqoNd8jA8n/DR7adluCB7fQ9wTBTEZAbojQgiXrGzZBdRr6kzP88li7 lp0tOuGo53ncL1v+yo/j2ay0KYESGoFC2c9fa+q78xIIc10fCr62x/L2iRnt9QLRvKmV Ef0e9HH5swaq610F6eYBfz1LRFwJwaON29yvsa10P2qrpNG1VKKKell5ppAQ2VBQns/L 9afP0eelrs5g7GH/feMqOQmtOVmQsinCzpWGBSteIT/NpcAUSGhQq77y8up1spCvDKSc nxaA== X-Forwarded-Encrypted: i=1; AFNElJ+ExepVpV24I8L/ZCYMd5NE+BUintgC6Jrj7d/ogBK+VRjM8nSAkxLKtAZfzyqcLz0n98c/tfkGfCduLs4=@vger.kernel.org X-Gm-Message-State: AOJu0YymvjMkYM5VrNFOQel9Es+HwhzxULekavtv94BuCofnwTvBaAdc Wegm62HjlOV7YfC1XbrTLo46pHYSLbm9V627CpKX0QBZBZ9DxuEN3Nyl X-Gm-Gg: Acq92OHUjdvc1Sc/oHnirp/FHNim/4o/t5VEfDP7RJupt8AQrlGhvq4L/Iy0g7Wk4xU XtSn7r2oHwLC6N99W+hlsyyyH1WtYJbCrV7MKU/tIyN3edXeCD9hHhuUeFU0EufwCTk0yw1fbwH H55U3858UaHEh9mUnMIIplx8KiK0Y76DgYNQX6SpwmQ9hhpJJZ0KPJ6m6iYkcHIp4xjVEOiDpbq 7GzMf66ve5eXcvxGgmgOSVqIg+KqgQo4bWI39al+l0Tk4hQtcUvjtdmp/uPammnSkkMiXL194Z8 ACJruXmtOfN1KOTGI2L/loibuKEEBs5cksLx4pe+5jubVv4+1orYAQvsC+fiZKav8sSHGwL5dS8 wHTb3j3s5E//e1EyHX1yfypI7YgTxf3z+dbG/1bR+IyOE3uNUSC4iEIFRNUfc1ACbHu/Sw1CRQI dwr9j/r6Eo2hnUOa0oREGLYTD/02XHdQ== X-Received: by 2002:a05:6870:71c1:b0:417:43c8:a58e with SMTP id 586e51a60fabf-439ca86fe06mr1686595fac.3.1778677181707; Wed, 13 May 2026 05:59:41 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:1::]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-439a9054cd3sm4042051fac.7.2026.05.13.05.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 05:59:41 -0700 (PDT) From: Daniel Zahka Date: Wed, 13 May 2026 05:59:37 -0700 Subject: [PATCH net 2/3] netdevsim: psp: update rx stats on the peer netdevsim Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260513-fix-psp-stats-v1-2-cdb3174f252f@gmail.com> References: <20260513-fix-psp-stats-v1-0-cdb3174f252f@gmail.com> In-Reply-To: <20260513-fix-psp-stats-v1-0-cdb3174f252f@gmail.com> To: Jakub Kicinski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Willem de Bruijn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13.0 nsim_do_psp() handles both tx and rx psp processing in the sending device's nsim_start_xmit() path. The existing code has a logical bug, where we erroneously increment rx_bytes and rx_packets on the sending devices stats, instead of the peer device. Additionally, compute psp_len after psp_dev_encapsulate() and before psp_dev_rcv(), which modifies the header region of the skb. The existing calculation was actually correct, because psp_dev_rcv() leaves skb_inner_transport_header pointing at the tcp header, but this is fragile and confusing as there is no actual inner transport header after psp_dev_rcv has removed udp encapsulation. Fixes: 178f0763c5f3 ("netdevsim: implement psp device stats") Assisted-by: Codex:gpt-5.5 Signed-off-by: Daniel Zahka --- drivers/net/netdevsim/psp.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/net/netdevsim/psp.c b/drivers/net/netdevsim/psp.c index 92a2ed770a36..5ff91da24539 100644 --- a/drivers/net/netdevsim/psp.c +++ b/drivers/net/netdevsim/psp.c @@ -22,6 +22,7 @@ nsim_do_psp(struct sk_buff *skb, struct netdevsim *ns, struct psp_dev *peer_psd; struct psp_assoc *pas; struct net *net; + int psp_len; void **ptr; =20 rcu_read_lock(); @@ -48,6 +49,12 @@ nsim_do_psp(struct sk_buff *skb, struct netdevsim *ns, goto out_unlock; } =20 + psp_len =3D skb->len - skb_inner_transport_offset(skb); + u64_stats_update_begin(&ns->psp.syncp); + u64_stats_inc(&ns->psp.tx_packets); + u64_stats_add(&ns->psp.tx_bytes, psp_len); + u64_stats_update_end(&ns->psp.syncp); + /* Now pretend we just received this frame */ peer_psd =3D rcu_dereference(peer_ns->psp.dev); if (peer_psd && peer_psd->config.versions & (1 << pas->version)) { @@ -72,14 +79,10 @@ nsim_do_psp(struct sk_buff *skb, struct netdevsim *ns, refcount_inc(&(*psp_ext)->refcnt); skb->decrypted =3D 1; =20 - u64_stats_update_begin(&ns->psp.syncp); - u64_stats_inc(&ns->psp.tx_packets); - u64_stats_inc(&ns->psp.rx_packets); - u64_stats_add(&ns->psp.tx_bytes, - skb->len - skb_inner_transport_offset(skb)); - u64_stats_add(&ns->psp.rx_bytes, - skb->len - skb_inner_transport_offset(skb)); - u64_stats_update_end(&ns->psp.syncp); + u64_stats_update_begin(&peer_ns->psp.syncp); + u64_stats_inc(&peer_ns->psp.rx_packets); + u64_stats_add(&peer_ns->psp.rx_bytes, psp_len); + u64_stats_update_end(&peer_ns->psp.syncp); } else { struct ipv6hdr *ip6h __maybe_unused; struct iphdr *iph; --=20 2.52.0 From nobody Fri Jun 12 17:16:16 2026 Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) (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 392C34266AE for ; Wed, 13 May 2026 12:59:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677185; cv=none; b=gh/1j4HlO5RVkYN585sb+nF80Ew1zsCKagd7//1WKA0XUvlSme9fafhsgXH5VqLCPtRMZ7J9ylg+X0Grw57PCqBuSFi7uaYncXFJ8fKLvKNC33brLcWRb8+zrwKcLB6YcSxiYYOCEXtZhxOPmI0WUeIwsqW8YtZTjrSLs624hEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778677185; c=relaxed/simple; bh=LHOE1mMbJxQim/OpEcoRlURxuH0eMEhtOg9F7R8wTPE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DVJcF54vSSGV1LfpPfyNbx0ZSjBS5RPkfa5hmW1evfI4Wiy4JVoxUaHrG0IlCVJCgB0OLLFJSK6K/eXWgZXonc0MUGy6VCfCG91zf79cmmx4yk3WEfQ+cozKNsY3xQlBMPQzH6sOzt8D77ZNZZN6IxDRN2ACTveb+6nbo8N3CbM= 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=X1d6r5F4; arc=none smtp.client-ip=209.85.167.178 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="X1d6r5F4" Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-47cbd444fd0so4290486b6e.2 for ; Wed, 13 May 2026 05:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778677183; x=1779281983; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=f23t0zSaqUAfWSysjbdO/3Qdq/GLiYIEowumVnM/uXw=; b=X1d6r5F4OIR/xwrnP96n4s0rJOA+PgXSDt7sPGI4KXgr6Isx55LQ5c39eaMcozXymQ 5hz8aL0phRxOZ1d9xvalaseN/8BhwzQ5816FtAcwks19DrDdJvcDGWxKBxbyYOoyTL7L qKvFQpDJKWsk0qEF8RxwC+mbAYr/tjSa8Ougvs4PDC/xQIPt3wHjB9oER21Q9RetaaGA 5rp2huZJj7loOol5Nc6u0Om3SqH3sSdWXNApXw8WsehpeB6HeiSRe+hTMqucJfCfFUpU g5oXpb8iqkHRHl3KobI9J+T71iSxfKelnW7oFwUC77Y6RNoAGFkS+wxRACfcOqJWrPxx 1mTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778677183; x=1779281983; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=f23t0zSaqUAfWSysjbdO/3Qdq/GLiYIEowumVnM/uXw=; b=hiyRFuvZG3qO5xxggLaaF1MRcQmJJ65lqf8UIl/VtpkbJV1BnaKNPONMg+bpoYs1ai WEAacylGwxBlJLdMYNkoexv9ZMTq5wpwF4fz8viKCXUk62WYkNBFSvgKaYQFYvvCDq0U FFX0pqI2jAQjiTORshlnJJQghFmh1k2PocApSZvwFhMl/oeb8kQ7ZrVSCfRVaoafDLfr N4oRoMPitB7MbmvAQHN/lHJ2pBaH0IqpFkH4reQj0Y7ZgqIdXMeTfT9V1J+Ihaf+p5mr D6i6jeqzN9xHA6PKfgTIu7qoLawbSefKNAj2l7L8q58ilbeFo5u9uzhW/nqSS5zlXekb ICSw== X-Forwarded-Encrypted: i=1; AFNElJ+YO4SpIme5bU9hKcp12IghUXy/bF0mgnLXD9nCBebnA/zlvOvc55KsHuVEAVFWFpGJmYUeidDqeKC6vUA=@vger.kernel.org X-Gm-Message-State: AOJu0YxLuJCZLy7svIxYGw4Lt8AkCQ50neRlj5VVQa/MyzoFdYNRi5bA o3fNGmFMrjN3TC55O9PNirK8AYk2OgIDKavCe31mRHhT5FcAhAmf582cMLmGxg== X-Gm-Gg: Acq92OGyvs7BNLtfhKV3/fIokOlJ+DFKL+E8WfmKmXHmQmi0kcPEbt+EXGOtD0QZ4BO YF90vv2j9sXaeeg0r0thyg6+1Tb3TV9OkxlSn/7KtBaOhfQRs4PBUJKSqPauqhiYWmnk0x9z4ai oCHQQ2I/esrIbzW9IawB2evKRs8MrvT+EFQ3NNun0gThvroSAVbh358xq15vcVcfem+1INij53w GboUh8muQmJmG25lmEQiGL/kabYHCqE3PEuqVbX68ZywiAaXHmFjQdxGet2b2qEDfMCQBsxJp0F RON7xzcmfcwO9WcJLt7Iv24pFokrB0O1mHrRlsXYxHvLLVQfDEntFCOW4qz3u7JzSHLxTEv9hFj guhwpQWEfnviMF7HeeDQU3Qgr+5/UWZH9dRwM4qMYQt7L4farqikl6rGujnJ0UbV1LAUFZmQGDT 0yOBQDQgRYNzVzZOrsiUXe X-Received: by 2002:a05:6808:5390:b0:479:ae1d:ffe8 with SMTP id 5614622812f47-482b5d460c2mr1560078b6e.4.1778677183125; Wed, 13 May 2026 05:59:43 -0700 (PDT) Received: from localhost ([2a03:2880:10ff:41::]) by smtp.gmail.com with ESMTPSA id 5614622812f47-47c76986404sm24249176b6e.15.2026.05.13.05.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2026 05:59:42 -0700 (PDT) From: Daniel Zahka Date: Wed, 13 May 2026 05:59:38 -0700 Subject: [PATCH net 3/3] netdevsim: psp: serialize psp stats writers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260513-fix-psp-stats-v1-3-cdb3174f252f@gmail.com> References: <20260513-fix-psp-stats-v1-0-cdb3174f252f@gmail.com> In-Reply-To: <20260513-fix-psp-stats-v1-0-cdb3174f252f@gmail.com> To: Jakub Kicinski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni , Willem de Bruijn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.13.0 The u64_stats_* api requires mutual exclusion on writers. The simplest way to do this is just to add a spinlock to the writer path, rather than making the stats per queue. Synchronization of the reader and writer paths use the u64_stats_update_begin() api and does not require any fixes. Fixes: 178f0763c5f3 ("netdevsim: implement psp device stats") Assisted-by: Codex:gpt-5.5 Signed-off-by: Daniel Zahka --- drivers/net/netdevsim/netdevsim.h | 1 + drivers/net/netdevsim/psp.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netd= evsim.h index d909c4160ea1..bc36033b511b 100644 --- a/drivers/net/netdevsim/netdevsim.h +++ b/drivers/net/netdevsim/netdevsim.h @@ -115,6 +115,7 @@ struct netdevsim { int rq_reset_mode; =20 struct { + spinlock_t stats_lock; u64_stats_t rx_packets; u64_stats_t rx_bytes; u64_stats_t tx_packets; diff --git a/drivers/net/netdevsim/psp.c b/drivers/net/netdevsim/psp.c index 5ff91da24539..56ddbf146489 100644 --- a/drivers/net/netdevsim/psp.c +++ b/drivers/net/netdevsim/psp.c @@ -50,10 +50,12 @@ nsim_do_psp(struct sk_buff *skb, struct netdevsim *ns, } =20 psp_len =3D skb->len - skb_inner_transport_offset(skb); + spin_lock_bh(&ns->psp.stats_lock); u64_stats_update_begin(&ns->psp.syncp); u64_stats_inc(&ns->psp.tx_packets); u64_stats_add(&ns->psp.tx_bytes, psp_len); u64_stats_update_end(&ns->psp.syncp); + spin_unlock_bh(&ns->psp.stats_lock); =20 /* Now pretend we just received this frame */ peer_psd =3D rcu_dereference(peer_ns->psp.dev); @@ -79,10 +81,12 @@ nsim_do_psp(struct sk_buff *skb, struct netdevsim *ns, refcount_inc(&(*psp_ext)->refcnt); skb->decrypted =3D 1; =20 + spin_lock_bh(&peer_ns->psp.stats_lock); u64_stats_update_begin(&peer_ns->psp.syncp); u64_stats_inc(&peer_ns->psp.rx_packets); u64_stats_add(&peer_ns->psp.rx_bytes, psp_len); u64_stats_update_end(&peer_ns->psp.syncp); + spin_unlock_bh(&peer_ns->psp.stats_lock); } else { struct ipv6hdr *ip6h __maybe_unused; struct iphdr *iph; @@ -271,6 +275,7 @@ int nsim_psp_init(struct netdevsim *ns) struct dentry *ddir =3D ns->nsim_dev_port->ddir; struct psp_dev *psd; =20 + spin_lock_init(&ns->psp.stats_lock); u64_stats_init(&ns->psp.syncp); =20 psd =3D psp_dev_create(ns->netdev, &nsim_psp_ops, &nsim_psp_caps, ns); --=20 2.52.0