From nobody Sun Feb 8 07:07:47 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 7DFE41DB356 for ; Thu, 8 Jan 2026 00:43:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767833007; cv=none; b=BzgBCn4L0Z1QqCXvFWsb6Pf82FD6OSUWtWO1Ew6gJueMLwsTK6I5wKWHuZFdVVl/nr1TFqSsJZDLK8LzW3qJ2d4crcKXH+dre9Ad0AzNVGeE9dmzEpcCxLtm0A27dNU5vcWpxmOT6wEtn8Envw/uSu2VjO4pgCnxrGZNAoHXG94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767833007; c=relaxed/simple; bh=mHd5/FDiQ86yScP8/xKWBTcg+ow54G9KDtNwccSg1Uk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fok2FxulQ8c9wemVgqOphIDqgycf3+ra5w7Ed6BfPt9ydpGjZTKIGbESuCDTnV+Io6ipcWZ7WYpqjFQTsDNKQER5lvFeefdQwVkrQAqIiswjMO8LE35AaXtRgXJlEgJwZsmXAS6CszhvpJC5kTbzCQ4PFTCLH18oWWDVaKKUEzg= 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=du4J1+jI; arc=none smtp.client-ip=209.85.214.171 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="du4J1+jI" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2a12ebe4b74so28124095ad.0 for ; Wed, 07 Jan 2026 16:43:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767833006; x=1768437806; 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=qykhmziqocBs83eOMsCXS+riegj3dQCRKqwsythsgqI=; b=du4J1+jIknx8EyqHTRi0ncr9q3iul358A+qkdtHPGmY1T87z72tODfL9wrBdHUXx3C 6vuBhcM3Eq9jzPvkGRqLTgzj9nJR4Ck9GpH1MDShirsStyiZgjvPxqOmWWEcihXzA3ya G3xJOG63lFSptgDN9M3vmG9TwwEzK6LGbaIeqt8oEfUsT1qn9rSvyk4YjZuFvwM0l1Tk uCzU4zgb1nEaccdShko7q2gsBct0GScnzi2lYI7BnnvW2aXSSuZeNI2J16jHezg+h9hn aJmEPMJUo6Edq92re9YyLELdWkHL6I1Srjq5tqvpj+Xc4WAwUWl2AtktLr4QmXtrFkZ/ hk3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767833006; x=1768437806; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qykhmziqocBs83eOMsCXS+riegj3dQCRKqwsythsgqI=; b=w8YtmlVaGb2gH9QinjYzEEL608yEFCMt5i0yYKqlDOAGqwwyzbXcH+xIueIG8uqMOX D5A3aLKh8o6unztmMnAWefXnJpMrwkH3H+M0Tf0GvZ1Vz6tRIQymBhCqjxu4hljngZYr 9+q1LU179caMt0bAESu1wIr8h7w2NV3JGNwTtUJ+3yDWVpDUdl4QWLQyl4k3vUHu9bdD IDDZx+sLA41ad66Fl7SXTaYSmOdFvgTTXTMDHJCI0agjFciOxv83gV7mWQJV3yciu7A+ x6h6yMt2/EHywHTMnAUBgiKLhEZxmesY2jqvoIas5yI0FRhoixwIskUGztgOoYj7n2yo 2KUg== X-Forwarded-Encrypted: i=1; AJvYcCXN5SOVQVASgqjA34yhPFl3PkjK1CEIv/cYOS/f0boNZpj+AjB5Qpz+HbYHCiieFv04tEYBFQGp7JLYktk=@vger.kernel.org X-Gm-Message-State: AOJu0YykufvFcs5D2EKvDOXYCTZJE8/xOOEi+Z/rRUOaGphNCePi8HgI q2dW8p1NPLxUmIHZw2siMtGOZbsVHLFm1+Z3pKgtUj0Gy7pOBY+lJYTK X-Gm-Gg: AY/fxX7tJmntDLFEpBddoKk/GIqBg19dBtqDvP0MaeMMHcEDCFptS32P2DMJQdRH+oK HeKMLBCyDAAYQ/y7b2HkPawrM1+K5BvY3WSqWgbtTLVGxdHGanAvgqTId3F93BIO5TGB8UmJfkx gJx/Bmi5jkTRhCKU63R4Q7L6fNQRmk3f/v6LAO4OH+rkYCooU4i5tXAKgjQDaubMw/YIgWWCIAk FgxarZAzDIs2gUHZskQLdwA1oCkGA2BlgsSjyQRx7g1ufqhYdNnyhoxtVIV6//ODTfuQh2WpKXI KgJWXSl5mt8qvmnsgVoKxngxbxnIRVc9gYc85g8vhtApvl9vGugmAvl9PGTj6OgJwVJURS8rVlp W8LDGLlDGVyIpB1H83z+N19xGzKftIpyvyml/p7BvqncXD88VpTMcU1Kel79fkPP15XzB+J09ZA TnTBA+TkOi7yMgyy0bXh3Y+ioGzShx+D/34Xe9OChjuus6EP6E+qvu8A== X-Google-Smtp-Source: AGHT+IExI20PPQrc2gAMhaAb+xN+DaUa+vqsuFXYJDYlwqt9scGkXOXGekbyt2CGFVkragmqd33jTQ== X-Received: by 2002:a17:903:38c8:b0:269:b6c8:4a4b with SMTP id d9443c01a7336-2a3ee41358cmr41763815ad.6.1767833005702; Wed, 07 Jan 2026 16:43:25 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cc88d8sm60198435ad.80.2026.01.07.16.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 16:43:25 -0800 (PST) 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 v4 1/2] net: dsa: yt921x: Fix MIB overflow wraparound routine Date: Thu, 8 Jan 2026 08:43:05 +0800 Message-ID: <20260108004309.4087448-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260108004309.4087448-1-mmyangfl@gmail.com> References: <20260108004309.4087448-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)' Fixes: 186623f4aa72 ("net: dsa: yt921x: Add support for Motorcomm YT921x") 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 0b3df732c0d1..5e4e8093ba16 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -682,21 +682,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; u32 val0; - u32 val1; + u64 val; =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 07:07:47 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 B1AE31DE3B5 for ; Thu, 8 Jan 2026 00:43:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767833012; cv=none; b=kC3A6YI+E89TQCD/zkC4k9FnMIQ4wRlHoEtcYX8crOWgF8s4QzftNS7Qa/A8NXnLxycEQ/i1I2kZw6Svn3Axl2d8GQY/ZKE6ehZRxAHYge/xe1EFCCXYSTcReAJzPepVJNwUzzTcHFbZFb/T3gleBCneF2E5m5KBPoL//cHaHOk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767833012; c=relaxed/simple; bh=WukKBFqsL2UyVgUwBp6IUN0AYvTxAGJibq/DKbpfxhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hVao+7R1tYu76TZtyoSZSTLMXl5jwtlS+Rw7iSgk0bhzIBvuyn8L4LIxFnXXzCjeFU1qL3Su/fNU9LRcWyezwPIYxvY4R9FJ7JfFZHhPs5p5+bnDMeEXUt96pm1VjTuW5TmB4EDH+GXz0oOuMxBZsidbzIi7uLU9aNBT245qopg= 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=PaiskFbM; arc=none smtp.client-ip=209.85.214.170 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="PaiskFbM" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2a0d52768ccso20414415ad.1 for ; Wed, 07 Jan 2026 16:43:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767833010; x=1768437810; 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=LlUhdWKSTngNddj3axDVd9p/L/6yFrp9IQe3pieorqw=; b=PaiskFbMQY8re1O4LgMAq50gTJXzNUHTafrpdvAIalHBM7yhsc7PGNBlUoCdhGEzUX 7ANdXgDDchXoZ9dKEUzDuyZWx1VCY1NYIxcAkNnFC4t/vyiPN64Eti3QFqUClD8ZcC+W KilNBZnfTLmtGDXAug9tHruCUk+E6aIPr2dcYRfL7nBCUq57p621bIV2xu872xQ87w7T SBOLzdEGJ6dfeR2P+hs4E07qbbH7sVMDgmPvTaTWCKPoRu28u/ajBFQTDaPveVQ454So qo/Mb9XC6CRZ9XHhD8xoz0KWnh86ZZj9LDH7lS6xgcc1UkGQeRut1Wrq7Z86Xay8kGnU D6Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767833010; x=1768437810; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LlUhdWKSTngNddj3axDVd9p/L/6yFrp9IQe3pieorqw=; b=C4SloQ8rr7TByNF6ZGiJM5FAoKWbHmLGBe25u8hg3pOZElOhVNMPVavsRKxpsjeA3G CS4qMc6GPFbEZPvX/BMchaV+qn345R2Jly28KFNFHMNNl+jXeZ0HmujF9oipGtpG2+m7 R+3E95CMcuimdabK2hK7GlTzXWNcBDNpaXQKUiXlwQPSsIqI+0e/4V1jFJNk6V4ZlB9N TiqHq6sADaN6k3n7NvzPfZsig1Of3g6BiIzPr92bygM0Xo3k2A30Df2LenrMYQBEaK5K 4lxm/fBqadKN7g4hdnthl8arK9RGfnKkk5i1kXXbWW8u4oDqxqFf41gdNLEjRv5duVaE gfew== X-Forwarded-Encrypted: i=1; AJvYcCXMoZNQOLrmqS1z7xHQYd6Q/IHBXW3RouCUjpAurQyH+xml+aOn2PeUthxcQGnmUCEMTVOqpmH2kIU2r2A=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7vgkglW7QoCqO1jc4b/gNJDIU6a8OSUBevRm5jM/OrB2f0tsS 7RGXZ8PRHFL99CVNdeA3ap1llOmiTN3gD5ZfAJzGKNjYWSy2qhSU1Kxz X-Gm-Gg: AY/fxX44GPnUhte8YkPEjrG6mz5RPHhXo+JMjnon7n6OUvvjabu/iwiPhktpsAaiPZJ AJ0naGi6v/ZILoYUQ2IXrWV5ISXlOR1VQy/5ZLW2pz41CYF/UugJ3ZX33MUpVGj8ajM6k9Q8/MG gM+qIp98VNeN5zNgRt9+BzBJpbyNBdyN6bZJM5dkXtlX7iyM2BN5mv5RkCm6sWlKDT8tIhED+ll 9rO6OOZEs/4e9syuNgwIT/MR6QIJBSGRHEabO/GKfVIphCtaJLOReKKl17ZgwAM+Z5z+S9x9WXx jD20xFDrT10abABxn0AyzGsS7dxkuULM4t5ZIwIZIQ8vIjyNxIAZwx2hKxzA+T6JeYDgOU02JyY As4Rn7tYJ4rApk9MGwmA4flmmTJqX4UNMEEOSaNk4HohGQ/V3zjrsxUuXGFw589YZ4YUo6Mtrxb MYhd8Gdqtz4QgigAl9TUIAynWPfsOpiw98zc9kdADEp5gT2yP08u5yPA== X-Google-Smtp-Source: AGHT+IHTwABlumK/DsVkymuWbY76ci9d1+uR0wbEGyd5zrcwv4xLhnzAccCvz2cYZKK/K3MDAUazdg== X-Received: by 2002:a17:903:3806:b0:2a1:3dae:8f22 with SMTP id d9443c01a7336-2a3ee5211demr34987385ad.61.1767833009905; Wed, 07 Jan 2026 16:43:29 -0800 (PST) Received: from d.home.mmyangfl.tk ([2001:19f0:8001:1644:5400:5ff:fe3e:12b1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cc88d8sm60198435ad.80.2026.01.07.16.43.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jan 2026 16:43:29 -0800 (PST) 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 v4 2/2] net: dsa: yt921x: Use u64_stats_t for MIB stats Date: Thu, 8 Jan 2026 08:43:06 +0800 Message-ID: <20260108004309.4087448-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260108004309.4087448-1-mmyangfl@gmail.com> References: <20260108004309.4087448-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" 64-bit variables might not be atomic on 32-bit architectures, thus cannot be unconditionally made lock-free. Use u64_stats_t so it would still be lock-free on 64-bit architectures. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 244 +++++++++++++++++++++++---------------- drivers/net/dsa/yt921x.h | 108 +++++++++-------- 2 files changed, 204 insertions(+), 148 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index 5e4e8093ba16..eee6652cee39 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -18,6 +18,7 @@ #include #include #include +#include =20 #include =20 @@ -666,22 +667,20 @@ 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. + /* u64_stats_read/set is redundant for mib_new, but I don't want to + * declare a plain u64 yt921x_mib variant. */ =20 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]; u32 val0; u64 val; =20 @@ -690,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_stats_read(&((u64_stats_t *)mib)[i]); =20 val =3D (old_val & ~(u64)U32_MAX) | val0; if (val < old_val) @@ -704,22 +703,40 @@ static int yt921x_read_mib(struct yt921x_priv *priv, = int port) val =3D ((u64)val1 << 32) | val0; } =20 - WRITE_ONCE(*valp, val); + u64_stats_set(&((u64_stats_t *)mib_new)[i], 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 u64_stats_read(&mib_new->rx_64byte) + + u64_stats_read(&mib_new->rx_65_127byte) + + u64_stats_read(&mib_new->rx_128_255byte) + + u64_stats_read(&mib_new->rx_256_511byte) + + u64_stats_read(&mib_new->rx_512_1023byte) + + u64_stats_read(&mib_new->rx_1024_1518byte) + + u64_stats_read(&mib_new->rx_jumbo); + tx_frames =3D u64_stats_read(&mib_new->tx_64byte) + + u64_stats_read(&mib_new->tx_65_127byte) + + u64_stats_read(&mib_new->tx_128_255byte) + + u64_stats_read(&mib_new->tx_256_511byte) + + u64_stats_read(&mib_new->tx_512_1023byte) + + u64_stats_read(&mib_new->tx_1024_1518byte) + + u64_stats_read(&mib_new->tx_jumbo); + + u64_stats_update_begin(&pp->syncp); + for (size_t i =3D 0; i < ARRAY_SIZE(yt921x_mib_descs); i++) { + u64_stats_set(&((u64_stats_t *)mib)[i], + u64_stats_read(&((u64_stats_t *)mib_new)[i])); + } + u64_stats_set(&pp->rx_frames, rx_frames); + u64_stats_set(&pp->tx_frames, tx_frames); + u64_stats_update_end(&pp->syncp); + + return 0; } =20 static void yt921x_poll_mib(struct work_struct *work) @@ -762,22 +779,27 @@ yt921x_dsa_get_ethtool_stats(struct dsa_switch *ds, i= nt port, uint64_t *data) struct yt921x_priv *priv =3D to_yt921x_priv(ds); struct yt921x_port *pp =3D &priv->ports[port]; struct yt921x_mib *mib =3D &pp->mib; + unsigned int start; size_t j; =20 mutex_lock(&priv->reg_lock); yt921x_read_mib(priv, port); mutex_unlock(&priv->reg_lock); =20 - 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]; + do { + start =3D u64_stats_fetch_begin(&pp->syncp); =20 - if (!desc->name) - continue; + 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]; =20 - data[j] =3D ((u64 *)mib)[i]; - j++; - } + if (!desc->name) + continue; + + data[j] =3D u64_stats_read(&((u64_stats_t *)mib)[i]); + j++; + } + } while (u64_stats_fetch_retry(&pp->syncp, start)); } =20 static int yt921x_dsa_get_sset_count(struct dsa_switch *ds, int port, int = sset) @@ -804,33 +826,38 @@ yt921x_dsa_get_eth_mac_stats(struct dsa_switch *ds, i= nt port, struct yt921x_priv *priv =3D to_yt921x_priv(ds); struct yt921x_port *pp =3D &priv->ports[port]; struct yt921x_mib *mib =3D &pp->mib; + unsigned int start; =20 mutex_lock(&priv->reg_lock); yt921x_read_mib(priv, port); mutex_unlock(&priv->reg_lock); =20 - mac_stats->FramesTransmittedOK =3D pp->tx_frames; - mac_stats->SingleCollisionFrames =3D mib->tx_single_collisions; - mac_stats->MultipleCollisionFrames =3D mib->tx_multiple_collisions; - mac_stats->FramesReceivedOK =3D pp->rx_frames; - mac_stats->FrameCheckSequenceErrors =3D mib->rx_crc_errors; - mac_stats->AlignmentErrors =3D mib->rx_alignment_errors; - mac_stats->OctetsTransmittedOK =3D mib->tx_good_bytes; - mac_stats->FramesWithDeferredXmissions =3D mib->tx_deferred; - mac_stats->LateCollisions =3D mib->tx_late_collisions; - mac_stats->FramesAbortedDueToXSColls =3D mib->tx_aborted_errors; - /* mac_stats->FramesLostDueToIntMACXmitError */ - /* mac_stats->CarrierSenseErrors */ - mac_stats->OctetsReceivedOK =3D mib->rx_good_bytes; - /* mac_stats->FramesLostDueToIntMACRcvError */ - mac_stats->MulticastFramesXmittedOK =3D mib->tx_multicast; - mac_stats->BroadcastFramesXmittedOK =3D mib->tx_broadcast; - /* mac_stats->FramesWithExcessiveDeferral */ - mac_stats->MulticastFramesReceivedOK =3D mib->rx_multicast; - mac_stats->BroadcastFramesReceivedOK =3D mib->rx_broadcast; - /* mac_stats->InRangeLengthErrors */ - /* mac_stats->OutOfRangeLengthField */ - mac_stats->FrameTooLongErrors =3D mib->rx_oversize_errors; + do { + start =3D u64_stats_fetch_begin(&pp->syncp); + + mac_stats->FramesTransmittedOK =3D u64_stats_read(&pp->tx_frames); + mac_stats->SingleCollisionFrames =3D u64_stats_read(&mib->tx_single_coll= isions); + mac_stats->MultipleCollisionFrames =3D u64_stats_read(&mib->tx_multiple_= collisions); + mac_stats->FramesReceivedOK =3D u64_stats_read(&pp->rx_frames); + mac_stats->FrameCheckSequenceErrors =3D u64_stats_read(&mib->rx_crc_erro= rs); + mac_stats->AlignmentErrors =3D u64_stats_read(&mib->rx_alignment_errors); + mac_stats->OctetsTransmittedOK =3D u64_stats_read(&mib->tx_good_bytes); + mac_stats->FramesWithDeferredXmissions =3D u64_stats_read(&mib->tx_defer= red); + mac_stats->LateCollisions =3D u64_stats_read(&mib->tx_late_collisions); + mac_stats->FramesAbortedDueToXSColls =3D u64_stats_read(&mib->tx_aborted= _errors); + /* mac_stats->FramesLostDueToIntMACXmitError */ + /* mac_stats->CarrierSenseErrors */ + mac_stats->OctetsReceivedOK =3D u64_stats_read(&mib->rx_good_bytes); + /* mac_stats->FramesLostDueToIntMACRcvError */ + mac_stats->MulticastFramesXmittedOK =3D u64_stats_read(&mib->tx_multicas= t); + mac_stats->BroadcastFramesXmittedOK =3D u64_stats_read(&mib->tx_broadcas= t); + /* mac_stats->FramesWithExcessiveDeferral */ + mac_stats->MulticastFramesReceivedOK =3D u64_stats_read(&mib->rx_multica= st); + mac_stats->BroadcastFramesReceivedOK =3D u64_stats_read(&mib->rx_broadca= st); + /* mac_stats->InRangeLengthErrors */ + /* mac_stats->OutOfRangeLengthField */ + mac_stats->FrameTooLongErrors =3D u64_stats_read(&mib->rx_oversize_error= s); + } while (u64_stats_fetch_retry(&pp->syncp, start)); } =20 static void @@ -840,14 +867,19 @@ yt921x_dsa_get_eth_ctrl_stats(struct dsa_switch *ds, = int port, struct yt921x_priv *priv =3D to_yt921x_priv(ds); struct yt921x_port *pp =3D &priv->ports[port]; struct yt921x_mib *mib =3D &pp->mib; + unsigned int start; =20 mutex_lock(&priv->reg_lock); yt921x_read_mib(priv, port); mutex_unlock(&priv->reg_lock); =20 - ctrl_stats->MACControlFramesTransmitted =3D mib->tx_pause; - ctrl_stats->MACControlFramesReceived =3D mib->rx_pause; - /* ctrl_stats->UnsupportedOpcodesReceived */ + do { + start =3D u64_stats_fetch_begin(&pp->syncp); + + ctrl_stats->MACControlFramesTransmitted =3D u64_stats_read(&mib->tx_paus= e); + ctrl_stats->MACControlFramesReceived =3D u64_stats_read(&mib->rx_pause); + /* ctrl_stats->UnsupportedOpcodesReceived */ + } while (u64_stats_fetch_retry(&pp->syncp, start)); } =20 static const struct ethtool_rmon_hist_range yt921x_rmon_ranges[] =3D { @@ -869,6 +901,7 @@ yt921x_dsa_get_rmon_stats(struct dsa_switch *ds, int po= rt, struct yt921x_priv *priv =3D to_yt921x_priv(ds); struct yt921x_port *pp =3D &priv->ports[port]; struct yt921x_mib *mib =3D &pp->mib; + unsigned int start; =20 mutex_lock(&priv->reg_lock); yt921x_read_mib(priv, port); @@ -876,26 +909,30 @@ yt921x_dsa_get_rmon_stats(struct dsa_switch *ds, int = port, =20 *ranges =3D yt921x_rmon_ranges; =20 - 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; - /* rmon_stats->jabbers */ - - rmon_stats->hist[0] =3D mib->rx_64byte; - rmon_stats->hist[1] =3D mib->rx_65_127byte; - rmon_stats->hist[2] =3D mib->rx_128_255byte; - rmon_stats->hist[3] =3D mib->rx_256_511byte; - rmon_stats->hist[4] =3D mib->rx_512_1023byte; - rmon_stats->hist[5] =3D mib->rx_1024_1518byte; - rmon_stats->hist[6] =3D mib->rx_jumbo; - - rmon_stats->hist_tx[0] =3D mib->tx_64byte; - rmon_stats->hist_tx[1] =3D mib->tx_65_127byte; - rmon_stats->hist_tx[2] =3D mib->tx_128_255byte; - rmon_stats->hist_tx[3] =3D mib->tx_256_511byte; - 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; + do { + start =3D u64_stats_fetch_begin(&pp->syncp); + + rmon_stats->undersize_pkts =3D u64_stats_read(&mib->rx_undersize_errors); + rmon_stats->oversize_pkts =3D u64_stats_read(&mib->rx_oversize_errors); + rmon_stats->fragments =3D u64_stats_read(&mib->rx_alignment_errors); + /* rmon_stats->jabbers */ + + rmon_stats->hist[0] =3D u64_stats_read(&mib->rx_64byte); + rmon_stats->hist[1] =3D u64_stats_read(&mib->rx_65_127byte); + rmon_stats->hist[2] =3D u64_stats_read(&mib->rx_128_255byte); + rmon_stats->hist[3] =3D u64_stats_read(&mib->rx_256_511byte); + rmon_stats->hist[4] =3D u64_stats_read(&mib->rx_512_1023byte); + rmon_stats->hist[5] =3D u64_stats_read(&mib->rx_1024_1518byte); + rmon_stats->hist[6] =3D u64_stats_read(&mib->rx_jumbo); + + rmon_stats->hist_tx[0] =3D u64_stats_read(&mib->tx_64byte); + rmon_stats->hist_tx[1] =3D u64_stats_read(&mib->tx_65_127byte); + rmon_stats->hist_tx[2] =3D u64_stats_read(&mib->tx_128_255byte); + rmon_stats->hist_tx[3] =3D u64_stats_read(&mib->tx_256_511byte); + rmon_stats->hist_tx[4] =3D u64_stats_read(&mib->tx_512_1023byte); + rmon_stats->hist_tx[5] =3D u64_stats_read(&mib->tx_1024_1518byte); + rmon_stats->hist_tx[6] =3D u64_stats_read(&mib->tx_jumbo); + } while (u64_stats_fetch_retry(&pp->syncp, start)); } =20 static void @@ -905,33 +942,41 @@ yt921x_dsa_get_stats64(struct dsa_switch *ds, int por= t, struct yt921x_priv *priv =3D to_yt921x_priv(ds); struct yt921x_port *pp =3D &priv->ports[port]; struct yt921x_mib *mib =3D &pp->mib; + unsigned int start; + + do { + start =3D u64_stats_fetch_begin(&pp->syncp); + + stats->rx_length_errors =3D u64_stats_read(&mib->rx_undersize_errors) + + u64_stats_read(&mib->rx_fragment_errors); + stats->rx_over_errors =3D u64_stats_read(&mib->rx_oversize_errors); + stats->rx_crc_errors =3D u64_stats_read(&mib->rx_crc_errors); + stats->rx_frame_errors =3D u64_stats_read(&mib->rx_alignment_errors); + /* stats->rx_fifo_errors */ + /* stats->rx_missed_errors */ + + stats->tx_aborted_errors =3D u64_stats_read(&mib->tx_aborted_errors); + /* stats->tx_carrier_errors */ + stats->tx_fifo_errors =3D u64_stats_read(&mib->tx_undersize_errors); + /* stats->tx_heartbeat_errors */ + stats->tx_window_errors =3D u64_stats_read(&mib->tx_late_collisions); + + stats->rx_packets =3D u64_stats_read(&pp->rx_frames); + stats->tx_packets =3D u64_stats_read(&pp->tx_frames); + stats->rx_bytes =3D u64_stats_read(&mib->rx_good_bytes) - + ETH_FCS_LEN * stats->rx_packets; + stats->tx_bytes =3D u64_stats_read(&mib->tx_good_bytes) - + ETH_FCS_LEN * stats->tx_packets; + stats->rx_dropped =3D u64_stats_read(&mib->rx_dropped); + /* stats->tx_dropped */ + stats->multicast =3D u64_stats_read(&mib->rx_multicast); + stats->collisions =3D u64_stats_read(&mib->tx_collisions); + } while (u64_stats_fetch_retry(&pp->syncp, start)); =20 - stats->rx_length_errors =3D mib->rx_undersize_errors + - mib->rx_fragment_errors; - stats->rx_over_errors =3D mib->rx_oversize_errors; - stats->rx_crc_errors =3D mib->rx_crc_errors; - stats->rx_frame_errors =3D mib->rx_alignment_errors; - /* stats->rx_fifo_errors */ - /* stats->rx_missed_errors */ - - stats->tx_aborted_errors =3D mib->tx_aborted_errors; - /* stats->tx_carrier_errors */ - stats->tx_fifo_errors =3D mib->tx_undersize_errors; - /* stats->tx_heartbeat_errors */ - stats->tx_window_errors =3D mib->tx_late_collisions; - - stats->rx_packets =3D pp->rx_frames; - stats->tx_packets =3D pp->tx_frames; - stats->rx_bytes =3D mib->rx_good_bytes - ETH_FCS_LEN * stats->rx_packets; - stats->tx_bytes =3D mib->tx_good_bytes - ETH_FCS_LEN * stats->tx_packets; stats->rx_errors =3D stats->rx_length_errors + stats->rx_over_errors + stats->rx_crc_errors + stats->rx_frame_errors; stats->tx_errors =3D stats->tx_aborted_errors + stats->tx_fifo_errors + stats->tx_window_errors; - stats->rx_dropped =3D mib->rx_dropped; - /* stats->tx_dropped */ - stats->multicast =3D mib->rx_multicast; - stats->collisions =3D mib->tx_collisions; } =20 static void @@ -941,13 +986,18 @@ yt921x_dsa_get_pause_stats(struct dsa_switch *ds, int= port, struct yt921x_priv *priv =3D to_yt921x_priv(ds); struct yt921x_port *pp =3D &priv->ports[port]; struct yt921x_mib *mib =3D &pp->mib; + unsigned int start; =20 mutex_lock(&priv->reg_lock); yt921x_read_mib(priv, port); mutex_unlock(&priv->reg_lock); =20 - pause_stats->tx_pause_frames =3D mib->tx_pause; - pause_stats->rx_pause_frames =3D mib->rx_pause; + do { + start =3D u64_stats_fetch_begin(&pp->syncp); + + pause_stats->tx_pause_frames =3D u64_stats_read(&mib->tx_pause); + pause_stats->rx_pause_frames =3D u64_stats_read(&mib->rx_pause); + } while (u64_stats_fetch_retry(&pp->syncp, start)); } =20 static int diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index 61bb0ab3b09a..17fee83952c2 100644 --- a/drivers/net/dsa/yt921x.h +++ b/drivers/net/dsa/yt921x.h @@ -6,6 +6,8 @@ #ifndef __YT921X_H #define __YT921X_H =20 +#include + #include =20 #define YT921X_SMI_SWITCHID_M GENMASK(3, 2) @@ -475,55 +477,55 @@ enum yt921x_fdb_entry_status { #define yt921x_port_is_external(port) (8 <=3D (port) && (port) < 9) =20 struct yt921x_mib { - u64 rx_broadcast; - u64 rx_pause; - u64 rx_multicast; - u64 rx_crc_errors; - - u64 rx_alignment_errors; - u64 rx_undersize_errors; - u64 rx_fragment_errors; - u64 rx_64byte; - - u64 rx_65_127byte; - u64 rx_128_255byte; - u64 rx_256_511byte; - u64 rx_512_1023byte; - - u64 rx_1024_1518byte; - u64 rx_jumbo; - u64 rx_good_bytes; - - u64 rx_bad_bytes; - u64 rx_oversize_errors; - - u64 rx_dropped; - u64 tx_broadcast; - u64 tx_pause; - u64 tx_multicast; - - u64 tx_undersize_errors; - u64 tx_64byte; - u64 tx_65_127byte; - u64 tx_128_255byte; - - u64 tx_256_511byte; - u64 tx_512_1023byte; - u64 tx_1024_1518byte; - u64 tx_jumbo; - - u64 tx_good_bytes; - u64 tx_collisions; - - u64 tx_aborted_errors; - u64 tx_multiple_collisions; - u64 tx_single_collisions; - u64 tx_good; - - u64 tx_deferred; - u64 tx_late_collisions; - u64 rx_oam; - u64 tx_oam; + u64_stats_t rx_broadcast; + u64_stats_t rx_pause; + u64_stats_t rx_multicast; + u64_stats_t rx_crc_errors; + + u64_stats_t rx_alignment_errors; + u64_stats_t rx_undersize_errors; + u64_stats_t rx_fragment_errors; + u64_stats_t rx_64byte; + + u64_stats_t rx_65_127byte; + u64_stats_t rx_128_255byte; + u64_stats_t rx_256_511byte; + u64_stats_t rx_512_1023byte; + + u64_stats_t rx_1024_1518byte; + u64_stats_t rx_jumbo; + u64_stats_t rx_good_bytes; + + u64_stats_t rx_bad_bytes; + u64_stats_t rx_oversize_errors; + + u64_stats_t rx_dropped; + u64_stats_t tx_broadcast; + u64_stats_t tx_pause; + u64_stats_t tx_multicast; + + u64_stats_t tx_undersize_errors; + u64_stats_t tx_64byte; + u64_stats_t tx_65_127byte; + u64_stats_t tx_128_255byte; + + u64_stats_t tx_256_511byte; + u64_stats_t tx_512_1023byte; + u64_stats_t tx_1024_1518byte; + u64_stats_t tx_jumbo; + + u64_stats_t tx_good_bytes; + u64_stats_t tx_collisions; + + u64_stats_t tx_aborted_errors; + u64_stats_t tx_multiple_collisions; + u64_stats_t tx_single_collisions; + u64_stats_t tx_good; + + u64_stats_t tx_deferred; + u64_stats_t tx_late_collisions; + u64_stats_t rx_oam; + u64_stats_t tx_oam; }; =20 struct yt921x_port { @@ -533,9 +535,13 @@ struct yt921x_port { bool isolated; =20 struct delayed_work mib_read; + struct u64_stats_sync syncp; struct yt921x_mib mib; - u64 rx_frames; - u64 tx_frames; + u64_stats_t rx_frames; + u64_stats_t 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