From nobody Sun Feb 8 00:27:02 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 D1E9A302158 for ; Sat, 25 Oct 2025 17:13:26 +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=1761412408; cv=none; b=IkBf+V49Z4U9MsSMLHuAcY/yhrteT/iNFOTOXcdqz2xYkfigbktJsDKHuUL4lUN84gBjEjOaxOb1/BkfSDdSPbz2x/kUTcfar9nWyXD5+CIm61mRFD/0dibDi2NYvcouKJmYxSwvhjsg89R06PEuvych/ayjU1IzrkCh8BDZR4k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761412408; c=relaxed/simple; bh=e7A26unbaP9hAYoj1SkxhsFZbhJCuCK4u8p+jfhPlZE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pn2VjETGB4A34/EAZRqR4UzGWs+PrgF5UwE1dlTdkRB7Wbkbt87DK2NQDiMa+kkWIGq+6G7j7eZjd+xNMyRNpfRFHU3xQrnqGFLV9u40XLEYFOWM9+ssDcr9DknoC/3qRhzh8rMhBBu2e9b6EkeZREPgd/kN5ERom5zgsl9zZdo= 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=TD6FIVWP; 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="TD6FIVWP" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-780fc3b181aso2020898b3a.2 for ; Sat, 25 Oct 2025 10:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761412406; x=1762017206; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JHgAdAQC2Eo5vV0FXAPtfwzgCMbFl4JzyNeiEAhdKbs=; b=TD6FIVWPV2KvSRpF0/GWYxTSY3ppRVKG1tkxHD65aIatmDWuPgUMkR0yyJ7KvmAW9h 3zxdiqt0sVCa8pISmRJzKKL/EAiE9AFj2g6WSaamZWsTiz1Y4TqXiCPQKFOr3JMHWDtE YxqnQmOZo43wTtKgsJVOtK6KBx/f/+J7mBBvUwZfCeJ4PN2FcOOqTAFBcYKaiq5HR/7x xXwBB37r8czfiMzPFVWgzs2BAahiSf6kWJInRPzOyw2U/pqyz7NjDdNhMtAn1ZC83YwG SbELZfhnonnX+em/ThlnXbE9mSjWTZfZGVKTiJJSRwwvHXJNzZ8junuWTNvW6ct1CtPl brrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761412406; x=1762017206; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JHgAdAQC2Eo5vV0FXAPtfwzgCMbFl4JzyNeiEAhdKbs=; b=t+sZs3xNz0PgjOnJOqhGQ4kFbo1NEJ7oAN1TLD6+JN5QdEeiglEo3ukog+4jCmyel5 NOxtRCXs/ixsEj+9/WAJ4gn5z6HjUzTuKZgPOgC/Evydxnw283uE+p4LrhSpyLvloUPd jZVZOr+4WnAkTbDcJC/X4+Z5ZYkCpTD2ilw/pvsCPqn90BnkpBAGBb/b1Rekb4pSx7Ru LOFUUpe0v7i4N5Sgd7oxUu4AmU8YapziJIysiwhTg4S1vKo4AWJ8FouqvE3U0QxPFMOp r4FpT9Zm7yOXWk4N/IxZTh/xL3Muub2tLb5wCh6kcFcwevpjQls0wIVLToOsf83+KvCR HXkQ== X-Forwarded-Encrypted: i=1; AJvYcCUFjBJNOoGJkJpyOKzbZYDgSM/gUNpaIpRQZw4raV7cukEYW2YxQZaL8pq7/viI2LdMVsMK1rQ06eCw7b0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx88Ngnn5GozLPi8f80LgPR0a4BXjvWM+qkOgljcB1phsy/7vDL N8cM/UzcPP9oGEymsQLbkDfJ4JuH/MogD18Lcl0oVnYex7mPeQJDPaui X-Gm-Gg: ASbGncuGyj2mRWRvslXI2oY7H4iLdDOwbVx++lOZ9iSl5Uf1de/nhHnorLfBh05emUQ AbuIYk5GYYm6zNQeEhdmwvvHuup1jMsXFXjsBAAL0n8sGJl2hNCwVnzkX2VbwJ/hoPt5ZkAFKsH 3DUaHVHYfCwL3q/0qdCZixy33Gt8GbHykPud511AKFJ1x/KJGaXXc8sYTMjF+TRnKtCPcaL17Vt EGnMho34KUZAjXtfq9wYdi7MwCLCB2aj15GKnxqIkQ0mt5UN1hniRhqnwo1qVa4yHVwoStn9F1d KaO/TOCcLB4SIsdgqImEaXBe7nj1U76h/XyyTsHMz55DFMQw34z1jrHewkfrC3/XwgpR+QsJdRK TLYQ4EPmIJcZbwDdUlHQeSFJa5bVhUItjBMdcFeBS2/ti/YPy0iPjFaPpQx2G7rhL98PN3kJkls n1GfwEuuP5oLul3EQGoA== X-Google-Smtp-Source: AGHT+IHfToilxDihPAF+e6IlMbKYVG4dZh2XU8lYpWC/85adxFkFY8/ZMNS44ontsF/nLpMQ7bFdpw== X-Received: by 2002:a05:6a00:23c2:b0:780:f758:4133 with SMTP id d2e1a72fcca58-7a274ba91d9mr11356205b3a.10.1761412406107; Sat, 25 Oct 2025 10:13:26 -0700 (PDT) Received: from d.home.yangfl.dn42 ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a414012bcesm2850481b3a.8.2025.10.25.10.13.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 10:13:25 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org, Dan Carpenter , David Laight Subject: [PATCH net-next v2 1/2] net: dsa: yt921x: Fix MIB overflow wraparound routine Date: Sun, 26 Oct 2025 01:13:10 +0800 Message-ID: <20251025171314.1939608-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251025171314.1939608-1-mmyangfl@gmail.com> References: <20251025171314.1939608-1-mmyangfl@gmail.com> 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" Reported by the following Smatch static checker warning: drivers/net/dsa/yt921x.c:702 yt921x_read_mib() warn: was expecting a 64 bit value instead of '(~0)' Reported-by: Dan Carpenter Closes: https://lore.kernel.org/netdev/aPsjYKQMzpY0nSXm@stanley.mountain/ Suggested-by: David Laight Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index ab762ffc4661..97a7eeb4ea15 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -687,21 +687,22 @@ static int yt921x_read_mib(struct yt921x_priv *priv, = int port) const struct yt921x_mib_desc *desc =3D &yt921x_mib_descs[i]; u32 reg =3D YT921X_MIBn_DATA0(port) + desc->offset; u64 *valp =3D &((u64 *)mib)[i]; - u64 val =3D *valp; + u64 val; u32 val0; - u32 val1; =20 res =3D yt921x_reg_read(priv, reg, &val0); if (res) break; =20 if (desc->size <=3D 1) { - if (val < (u32)val) - /* overflow */ - val +=3D (u64)U32_MAX + 1; - val &=3D ~U32_MAX; - val |=3D val0; + u64 old_val =3D *valp; + + val =3D (old_val & ~(u64)U32_MAX) | val0; + if (val < old_val) + val +=3D 1ull << 32; } else { + u32 val1; + res =3D yt921x_reg_read(priv, reg + 4, &val1); if (res) break; --=20 2.51.0 From nobody Sun Feb 8 00:27:02 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 B3D20303A3C for ; Sat, 25 Oct 2025 17:13:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761412412; cv=none; b=kXvEmt/xH0W6lrJtPiXvoDFxalN5DztKXaQ5v0Vbs2IPm599QgPrvlVYxz+Kfwzxe8z8iLxL2uxuWzXwo8kABCC1p/SIMroAH1Xi05ZUvb4We6ODhFuIabf9Lono4jGWeVX7/J1IBZnDuM1dRP5DlFyhBLjgZMxiQorW25bui8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761412412; c=relaxed/simple; bh=uOFfSvYybj5U/YMLdHhj4kE0AVO6RfvG+9hqVvgsk+M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YwxeP5m+iEfDk6Z15N1uUyYNBKSdxw0/XdzZQnc4x8mDIyHyQUiu8fCOxCgl2Bg4DkwUHHwilZyqmbdSjL1NvugxI/R/kscojqzjQ2HdoZmMmhceolatUcUOEns/vXhGhiMRcwN0sM9JaUf8Bl72HH7HzTsl4A3+15GNb32Za3g= 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=Bs88pHsP; arc=none smtp.client-ip=209.85.210.177 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="Bs88pHsP" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-7833765433cso4115342b3a.0 for ; Sat, 25 Oct 2025 10:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761412410; x=1762017210; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=skkIsPjZzdIgiE62Lq5VQ7m30JaRsLRctIZwjBpQojY=; b=Bs88pHsPdWJ6e67+xU6Ifv4t/Mrl5R0GW/zuT6h09P/FS5nuWLrJmpaKZy2nq6vzKb NjEPGNG60xiq9KDxaKq7DnYZ+FLnqlNNsFocKw+U2956/TLeS3lwzs6nU9qGvd5zZnP4 hw3IhNXo5i+Y+wN+Q0kktfSOzDgYy09ZOUzCflYrOiGQ9weWLMUzWm1hpUctl5NhC6kb mk+FVZdqKmoNNCObPeux7ZI1UplaVawCRbHOWlJ2rdd3FOuvVY7/QlVbS3sEEAygbCyp eSGwonu/zdRsHUKvxq3UFV8SwWTsZ5q2klSif4VCX8Iw+7UKomQfQyXBE0MgXe6XFRWv Mlmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761412410; x=1762017210; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=skkIsPjZzdIgiE62Lq5VQ7m30JaRsLRctIZwjBpQojY=; b=e73zYkWRE5iDJ+U19FTAO0cRxhMlemh9SXty2zIm0IoPv8MiSonZfwJ9vPat3hkyx/ ZbZABIoqxIVnWg6bj20Qy73/7B8407WSLENARRoEx6L5feTtvRP2c/rAztWwDVR9FdPm DvY2McHZY36pQqxlqD0yTeGnCtdp24wT7+BGlZlkJu22o6qFLYSQJLk9nMHzJt6PKyeY 3gb58QWgu42L30WrcYzhtMCc8akTTA0Xg30bTaJZT1kLf5k0WsOcCgOQS8HHVAQHlFNA ws7Q8cA2C34BJBD8kHv3ch333z2qp25s1TfQYvJpSXGAGtpVA9XsuQ830eOgjgIydH8G WIFg== X-Forwarded-Encrypted: i=1; AJvYcCXjbsdT1u0cINkPMPePwASVXCAtawj7OTQ69gFTF7YE+csuI3HFbTMKM5ZT3f91WivFOa2w82GFygZR+5o=@vger.kernel.org X-Gm-Message-State: AOJu0YzYMms6ARe79si544v4kc9kdcj9EPKnzx2Df6YruewFOaMgcMrt s45Kqnlo2ZbSLRVbAAFpv+XCWFZ2TnrFDPVJTxt0qDVbZ8/i6QvJq/60 X-Gm-Gg: ASbGncsEYQrIcmX/2DxEzMOZOikhqgGCzsVR/OdaYJUMXat+0PwBDRdfEwTa9QktmFH wsCGO0NwfyD+mGNIjkUYxkn0D+32W5cECvF8XjSiU5f9LqUwz61ybYt5paocBaAk6gPhh47FSid AgG+KnRQscPn1OFlnHvPOUTPoreX8TRefsciMsLAVwdwdKxuEy2LrW7fMzA9RFOGYEcMuQnbNhu um6ZPIvZUTeY066xhJl3Sg7KhdMeM+FVSb8ozfcsX91OgBIComreD11D6k1DbY5ZXvr5Ch86mHC t/TrOpRCsIcJA/91tuah98Jx3H77U+4Ks1A+akf61yGZdQU3X7XCrdtPKR80NRFrzc5dZdNSq82 /z21fhLpPNW/eaZHyFNeWVAVDWwjltgQU1OyfyIFLgXh9jAAYWoz1IwrFbmk74wCgxJDjcRNq7U LI9SygdR5zdslcbi+KGQ== X-Google-Smtp-Source: AGHT+IFrE/I5QcKhRbXEdfK7JwyY2O+27cboGMuNOwu2tayp52hBp3cLe68UEO4DrutT6WE5Naid3g== X-Received: by 2002:a05:6a00:94d5:b0:780:7eaa:938 with SMTP id d2e1a72fcca58-7a220a7f285mr41815292b3a.12.1761412409917; Sat, 25 Oct 2025 10:13:29 -0700 (PDT) Received: from d.home.yangfl.dn42 ([45.32.227.231]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7a414012bcesm2850481b3a.8.2025.10.25.10.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 10:13:29 -0700 (PDT) From: David Yang To: netdev@vger.kernel.org Cc: David Yang , Andrew Lunn , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org Subject: [PATCH net-next v2 2/2] net: dsa: yt921x: Protect MIB stats with a lock Date: Sun, 26 Oct 2025 01:13:11 +0800 Message-ID: <20251025171314.1939608-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251025171314.1939608-1-mmyangfl@gmail.com> References: <20251025171314.1939608-1-mmyangfl@gmail.com> 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" 64bit variables might not be atomic on 32bit architectures, thus cannot be made lock-free. Protect them with a spin lock since get_stats64() cannot sleep. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 63 ++++++++++++++++++++++++++-------------- drivers/net/dsa/yt921x.h | 4 +++ 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 97a7eeb4ea15..e5d7c6820089 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -671,22 +671,16 @@ yt921x_mbus_ext_init(struct yt921x_priv *priv, struct= device_node *mnp) static int yt921x_read_mib(struct yt921x_priv *priv, int port) { struct yt921x_port *pp =3D &priv->ports[port]; + struct yt921x_mib *mib_new =3D &pp->mib_new; struct device *dev =3D to_device(priv); struct yt921x_mib *mib =3D &pp->mib; + u64 rx_frames; + u64 tx_frames; int res =3D 0; =20 - /* Reading of yt921x_port::mib is not protected by a lock and it's vain - * to keep its consistency, since we have to read registers one by one - * and there is no way to make a snapshot of MIB stats. - * - * Writing (by this function only) is and should be protected by - * reg_lock. - */ - for (size_t i =3D 0; i < ARRAY_SIZE(yt921x_mib_descs); i++) { const struct yt921x_mib_desc *desc =3D &yt921x_mib_descs[i]; u32 reg =3D YT921X_MIBn_DATA0(port) + desc->offset; - u64 *valp =3D &((u64 *)mib)[i]; u64 val; u32 val0; =20 @@ -695,7 +689,7 @@ static int yt921x_read_mib(struct yt921x_priv *priv, in= t port) break; =20 if (desc->size <=3D 1) { - u64 old_val =3D *valp; + u64 old_val =3D ((u64 *)mib)[i]; =20 val =3D (old_val & ~(u64)U32_MAX) | val0; if (val < old_val) @@ -709,22 +703,31 @@ static int yt921x_read_mib(struct yt921x_priv *priv, = int port) val =3D ((u64)val0 << 32) | val1; } =20 - WRITE_ONCE(*valp, val); + ((u64 *)mib_new)[i] =3D val; } =20 - pp->rx_frames =3D mib->rx_64byte + mib->rx_65_127byte + - mib->rx_128_255byte + mib->rx_256_511byte + - mib->rx_512_1023byte + mib->rx_1024_1518byte + - mib->rx_jumbo; - pp->tx_frames =3D mib->tx_64byte + mib->tx_65_127byte + - mib->tx_128_255byte + mib->tx_256_511byte + - mib->tx_512_1023byte + mib->tx_1024_1518byte + - mib->tx_jumbo; - - if (res) + if (res) { dev_err(dev, "Failed to %s port %d: %i\n", "read stats for", port, res); - return res; + return res; + } + + rx_frames =3D mib->rx_64byte + mib->rx_65_127byte + + mib->rx_128_255byte + mib->rx_256_511byte + + mib->rx_512_1023byte + mib->rx_1024_1518byte + + mib->rx_jumbo; + tx_frames =3D mib->tx_64byte + mib->tx_65_127byte + + mib->tx_128_255byte + mib->tx_256_511byte + + mib->tx_512_1023byte + mib->tx_1024_1518byte + + mib->tx_jumbo; + + spin_lock(&pp->stats_lock); + *mib =3D *mib_new; + pp->rx_frames =3D rx_frames; + pp->tx_frames =3D tx_frames; + spin_unlock(&pp->stats_lock); + + return 0; } =20 static void yt921x_poll_mib(struct work_struct *work) @@ -773,6 +776,7 @@ yt921x_dsa_get_ethtool_stats(struct dsa_switch *ds, int= port, uint64_t *data) yt921x_read_mib(priv, port); mutex_unlock(&priv->reg_lock); =20 + spin_lock(&pp->stats_lock); j =3D 0; for (size_t i =3D 0; i < ARRAY_SIZE(yt921x_mib_descs); i++) { const struct yt921x_mib_desc *desc =3D &yt921x_mib_descs[i]; @@ -783,6 +787,7 @@ yt921x_dsa_get_ethtool_stats(struct dsa_switch *ds, int= port, uint64_t *data) data[j] =3D ((u64 *)mib)[i]; j++; } + spin_unlock(&pp->stats_lock); } =20 static int yt921x_dsa_get_sset_count(struct dsa_switch *ds, int port, int = sset) @@ -814,6 +819,7 @@ yt921x_dsa_get_eth_mac_stats(struct dsa_switch *ds, int= port, yt921x_read_mib(priv, port); mutex_unlock(&priv->reg_lock); =20 + spin_lock(&pp->stats_lock); mac_stats->FramesTransmittedOK =3D pp->tx_frames; mac_stats->SingleCollisionFrames =3D mib->tx_single_collisions; mac_stats->MultipleCollisionFrames =3D mib->tx_multiple_collisions; @@ -836,6 +842,7 @@ yt921x_dsa_get_eth_mac_stats(struct dsa_switch *ds, int= port, /* mac_stats->InRangeLengthErrors */ /* mac_stats->OutOfRangeLengthField */ mac_stats->FrameTooLongErrors =3D mib->rx_oversize_errors; + spin_unlock(&pp->stats_lock); } =20 static void @@ -850,9 +857,11 @@ yt921x_dsa_get_eth_ctrl_stats(struct dsa_switch *ds, i= nt port, yt921x_read_mib(priv, port); mutex_unlock(&priv->reg_lock); =20 + spin_lock(&pp->stats_lock); ctrl_stats->MACControlFramesTransmitted =3D mib->tx_pause; ctrl_stats->MACControlFramesReceived =3D mib->rx_pause; /* ctrl_stats->UnsupportedOpcodesReceived */ + spin_unlock(&pp->stats_lock); } =20 static const struct ethtool_rmon_hist_range yt921x_rmon_ranges[] =3D { @@ -881,6 +890,8 @@ yt921x_dsa_get_rmon_stats(struct dsa_switch *ds, int po= rt, =20 *ranges =3D yt921x_rmon_ranges; =20 + spin_lock(&pp->stats_lock); + rmon_stats->undersize_pkts =3D mib->rx_undersize_errors; rmon_stats->oversize_pkts =3D mib->rx_oversize_errors; rmon_stats->fragments =3D mib->rx_alignment_errors; @@ -901,6 +912,8 @@ yt921x_dsa_get_rmon_stats(struct dsa_switch *ds, int po= rt, rmon_stats->hist_tx[4] =3D mib->tx_512_1023byte; rmon_stats->hist_tx[5] =3D mib->tx_1024_1518byte; rmon_stats->hist_tx[6] =3D mib->tx_jumbo; + + spin_unlock(&pp->stats_lock); } =20 static void @@ -911,6 +924,8 @@ yt921x_dsa_get_stats64(struct dsa_switch *ds, int port, struct yt921x_port *pp =3D &priv->ports[port]; struct yt921x_mib *mib =3D &pp->mib; =20 + spin_lock(&pp->stats_lock); + stats->rx_length_errors =3D mib->rx_undersize_errors + mib->rx_fragment_errors; stats->rx_over_errors =3D mib->rx_oversize_errors; @@ -937,6 +952,8 @@ yt921x_dsa_get_stats64(struct dsa_switch *ds, int port, /* stats->tx_dropped */ stats->multicast =3D mib->rx_multicast; stats->collisions =3D mib->tx_collisions; + + spin_unlock(&pp->stats_lock); } =20 static void @@ -951,8 +968,10 @@ yt921x_dsa_get_pause_stats(struct dsa_switch *ds, int = port, yt921x_read_mib(priv, port); mutex_unlock(&priv->reg_lock); =20 + spin_lock(&pp->stats_lock); pause_stats->tx_pause_frames =3D mib->tx_pause; pause_stats->rx_pause_frames =3D mib->rx_pause; + spin_unlock(&pp->stats_lock); } =20 static int diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index 3e85d90826fb..be69c3508da8 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -470,9 +470,13 @@ struct yt921x_port { bool isolated; =20 struct delayed_work mib_read; + spinlock_t stats_lock; struct yt921x_mib mib; u64 rx_frames; u64 tx_frames; + + /* only used by read routine to avoid huge allocations on the stack */ + struct yt921x_mib mib_new; }; =20 struct yt921x_reg_ops { --=20 2.51.0