From nobody Thu Apr 2 06:31:32 2026 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (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 D06173E9F97 for ; Fri, 6 Mar 2026 15:49:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772812175; cv=none; b=k0vkA1PsTSXGCUq8P8ogR/eCcf3aLh8bmqkv3VrOqbt2+d8NyKchHuyzxf8zxjB/gAyBW1fzmGRenhRugFwsbQli5g8fnzcrLpPn0pPL47miSLJxuZzO41ii9m8CFnW6rJTa6vFgnUVavuvv6v62O/8/ZHtOFR6XJVZjvp6kjfE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772812175; c=relaxed/simple; bh=2bqmAe4MDbDAkCULiEykTd+QxH4ulctvP2IJ9jekacs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DYrtYwqphVK9TAcbgXlLhwFly4sNGzbL97XYNFBiQ0WjmU6VArO1gZh4WeLBqOp9NNxqXM0c25ITsdwigt8Ge8RY2yxP28YNY+1MnlidqL5ujKfv+wvc49svhvQa5+JczyGMNXkV3ahAOJZammTVf/NvVbmj0ITxWHWuehy6NGQ= 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=Rr5T8ZVo; arc=none smtp.client-ip=209.85.216.42 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="Rr5T8ZVo" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-354a18c48b5so8144464a91.1 for ; Fri, 06 Mar 2026 07:49:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772812173; x=1773416973; 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=wouP51WRVkoVl7gi11YNMLD9kIN48p1TbHSTtEAAOxY=; b=Rr5T8ZVoEzlvHuUS+/K5y67qjCPCQCcz1JDSV1EUHvTGXqntNHPe0sd7e6h9DoUfgS ex6qCC2SI7kMqIGDI0p/x/1cGjsqgTQ+nV3g3NCqRtMSfSaYam+M8ni5ohX4f2mxbfPU uTGh5JVgzQ8N7iOL+xuF5OOCessgzy5yVBtiNHAytuVoV+nLdyAdLdV/MVa74awdpqW9 Wd7oO48yhuLG1dRIE9L1ZpVjRDkdgBpE+z8i+lVWeWauyLGBMjsKh7kuc3UaYfwJ7REm 2c31+JDxLC48eQgU5JWGcqTcNWM0MsP/J04o9coC2Y46/UQ7f9ZZiSwVJGADlYs4Kd0l 5B8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772812173; x=1773416973; 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=wouP51WRVkoVl7gi11YNMLD9kIN48p1TbHSTtEAAOxY=; b=jCq0jPa3v31spBsaenEmOnL62S3gGum7Dtr1XhGvHwsvPzd1sjX6qu0d9RnXaKx7iN 95/ultl3Ug+rvSYGpV0Xsh32jjWUqw7ehRTHGhdeEZq143qvHJ2/0nshQEWkkrpq/V3u 8DB1wO1RE8qq2TggKnVPsKOtoNBtjb5q+1Oa0T+UP0b3dgQktI06406yqpnfrKCMW5RW XApnWWaMQdNWTrGLdmyUMEHIZLvs/k65yCPtChdEkOVoL8AjEGEPtt3dpZokEb24L647 +adT0bBwaiYa+frPkg3OTF09vmZ6MVksTphvXpWK1e5TdWYwB3I1ihZwojXi51z213tE zAUQ== X-Forwarded-Encrypted: i=1; AJvYcCWmuC9imtGNbabrRnCC0NSt7LW7k04uPMR4sxAnl4BlQKHE/9gu8CG9iaXWevNwYP6/WgiXfPhI2N+b4hg=@vger.kernel.org X-Gm-Message-State: AOJu0YztiDdrg1bVtqJodwamKgIYX2pagrjMW1EMGp04vB1Sqo8TZmmu JT0YT30HkrA7SYP/AVw+9F1LJ9DF11ykkZ+9KIiR2Z8O8oJfO1jAuyh7 X-Gm-Gg: ATEYQzyi8V+Z4akljqN8/oiTHNdneMaCwMiMnKdF8rhHfV0k/vtH9h4JHFLP8hmuQss 8pZbMheaAbxdQNJZ+wbvCrRODuXOA0gjQEtJswcMkCDavSatRTWyoomW7GxdKYSq2kyc/JhfpPP tmegw9XX/HMqHObwRZz695DF1eSVqfM+KjE1ewWmC4CO+a0ykpvBTxAIW6memyWyc5WC7yl+APF vEqd9UXvGKwXplj3r9rOSHiQPZapLKWor23BpAVTVm9HdfeFm5s8xIJg98UHCTnfNLijH9cjlrv 9cQBKgfgc4iaN3iJKguwGnGCH9HjoWHrg2KzrddgzvhfmLr8C0lf5BqyHVnB1CjjA70QYeCtaSU sw4ro8KZk0ctAlcvp8nHt/xT0hpujDp4c3nICqVHIEQjEE+SJN57adNtcRGDH4kAPa6uupP6EI1 7xoHEkRbcfSuJHyZeVRbQdwWISefMp4MkaZS2klkkCEnTs X-Received: by 2002:a17:90b:33c4:b0:359:806c:7a94 with SMTP id 98e67ed59e1d1-359be233997mr2425732a91.7.1772812173122; Fri, 06 Mar 2026 07:49:33 -0800 (PST) Received: from d.home.yangfl.dn42 ([2603:c020:800b:d7ff::38]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359bbaa5fa1sm1532769a91.0.2026.03.06.07.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 07:49:32 -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: Fri, 6 Mar 2026 23:46:27 +0800 Message-ID: <20260306154637.3126497-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260306154637.3126497-1-mmyangfl@gmail.com> References: <20260306154637.3126497-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, and could lead to load/store tearing. Use u64_stats_t to ensure consistency. Signed-off-by: David Yang --- drivers/net/dsa/yt921x.c | 197 +++++++++++++++++++++++---------------- drivers/net/dsa/yt921x.h | 114 ++++++++++++---------- 2 files changed, 178 insertions(+), 133 deletions(-) diff --git a/drivers/net/dsa/yt921x.c b/drivers/net/dsa/yt921x.c index a968a3fb56f8..b9ae49e01c2e 100644 --- a/drivers/net/dsa/yt921x.c +++ b/drivers/net/dsa/yt921x.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include #include @@ -670,22 +671,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 @@ -694,7 +693,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(&mib->stats[i]); =20 val =3D (old_val & ~(u64)U32_MAX) | val0; if (val < old_val) @@ -708,7 +707,7 @@ static int yt921x_read_mib(struct yt921x_priv *priv, in= t port) val =3D ((u64)val1 << 32) | val0; } =20 - WRITE_ONCE(*valp, val); + u64_stats_set(&mib_new->stats[i], val); } =20 if (res) { @@ -717,14 +716,29 @@ static int yt921x_read_mib(struct yt921x_priv *priv, = int port) return res; } =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; + 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(&mib->stats[i], + u64_stats_read(&mib_new->stats[i])); + } + u64_stats_set(&pp->rx_frames, rx_frames); + u64_stats_set(&pp->tx_frames, tx_frames); + u64_stats_update_end(&pp->syncp); =20 return 0; } @@ -772,8 +786,8 @@ yt921x_dsa_get_ethtool_stats(struct dsa_switch *ds, int= port, uint64_t *data) 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++) { @@ -782,9 +796,11 @@ yt921x_dsa_get_ethtool_stats(struct dsa_switch *ds, in= t port, uint64_t *data) if (!desc->name) continue; =20 - data[j] =3D ((u64 *)mib)[i]; + data[j] =3D u64_stats_read(&mib->stats[i]); j++; } + + mutex_unlock(&priv->reg_lock); } =20 static int yt921x_dsa_get_sset_count(struct dsa_switch *ds, int port, int = sset) @@ -813,31 +829,33 @@ yt921x_dsa_get_eth_mac_stats(struct dsa_switch *ds, i= nt port, struct yt921x_mib *mib =3D &pp->mib; =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->FramesTransmittedOK =3D u64_stats_read(&pp->tx_frames); + mac_stats->SingleCollisionFrames =3D u64_stats_read(&mib->tx_single_colli= sions); + mac_stats->MultipleCollisionFrames =3D u64_stats_read(&mib->tx_multiple_c= ollisions); + mac_stats->FramesReceivedOK =3D u64_stats_read(&pp->rx_frames); + mac_stats->FrameCheckSequenceErrors =3D u64_stats_read(&mib->rx_crc_error= s); + 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_deferr= ed); + 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 mib->rx_good_bytes; + mac_stats->OctetsReceivedOK =3D u64_stats_read(&mib->rx_good_bytes); /* mac_stats->FramesLostDueToIntMACRcvError */ - mac_stats->MulticastFramesXmittedOK =3D mib->tx_multicast; - mac_stats->BroadcastFramesXmittedOK =3D mib->tx_broadcast; + mac_stats->MulticastFramesXmittedOK =3D u64_stats_read(&mib->tx_multicast= ); + mac_stats->BroadcastFramesXmittedOK =3D u64_stats_read(&mib->tx_broadcast= ); /* mac_stats->FramesWithExcessiveDeferral */ - mac_stats->MulticastFramesReceivedOK =3D mib->rx_multicast; - mac_stats->BroadcastFramesReceivedOK =3D mib->rx_broadcast; + mac_stats->MulticastFramesReceivedOK =3D u64_stats_read(&mib->rx_multicas= t); + mac_stats->BroadcastFramesReceivedOK =3D u64_stats_read(&mib->rx_broadcas= t); /* mac_stats->InRangeLengthErrors */ /* mac_stats->OutOfRangeLengthField */ - mac_stats->FrameTooLongErrors =3D mib->rx_oversize_errors; + mac_stats->FrameTooLongErrors =3D u64_stats_read(&mib->rx_oversize_errors= ); + + mutex_unlock(&priv->reg_lock); } =20 static void @@ -849,12 +867,14 @@ yt921x_dsa_get_eth_ctrl_stats(struct dsa_switch *ds, = int port, struct yt921x_mib *mib =3D &pp->mib; =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->MACControlFramesTransmitted =3D u64_stats_read(&mib->tx_pause= ); + ctrl_stats->MACControlFramesReceived =3D u64_stats_read(&mib->rx_pause); /* ctrl_stats->UnsupportedOpcodesReceived */ + + mutex_unlock(&priv->reg_lock); } =20 static const struct ethtool_rmon_hist_range yt921x_rmon_ranges[] =3D { @@ -878,31 +898,33 @@ yt921x_dsa_get_rmon_stats(struct dsa_switch *ds, int = port, struct yt921x_mib *mib =3D &pp->mib; =20 mutex_lock(&priv->reg_lock); + yt921x_read_mib(priv, port); - mutex_unlock(&priv->reg_lock); =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->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 */ =20 - 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[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); =20 - 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; + mutex_unlock(&priv->reg_lock); } =20 static void @@ -912,33 +934,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 @@ -950,11 +980,13 @@ yt921x_dsa_get_pause_stats(struct dsa_switch *ds, int= port, struct yt921x_mib *mib =3D &pp->mib; =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; + pause_stats->tx_pause_frames =3D u64_stats_read(&mib->tx_pause); + pause_stats->rx_pause_frames =3D u64_stats_read(&mib->rx_pause); + + mutex_unlock(&priv->reg_lock); } =20 static int @@ -3423,6 +3455,7 @@ static int yt921x_mdio_probe(struct mdio_device *mdio= dev) =20 pp->index =3D i; INIT_DELAYED_WORK(&pp->mib_read, yt921x_poll_mib); + u64_stats_init(&pp->syncp); } =20 ds =3D &priv->ds; diff --git a/drivers/net/dsa/yt921x.h b/drivers/net/dsa/yt921x.h index 3f129b8d403f..93d0f55d1745 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) @@ -530,55 +532,61 @@ 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; + union { + struct { + 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; + }; + + u64_stats_t stats[]; + }; }; =20 struct yt921x_port { @@ -588,9 +596,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