[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20231204163451.whx3llb7zvnne433@skbuf>
Date: Mon, 4 Dec 2023 18:34:51 +0200
From: Vladimir Oltean <olteanv@...il.com>
To: Tobias Waldekranz <tobias@...dekranz.com>
Cc: davem@...emloft.net, kuba@...nel.org, andrew@...n.ch,
f.fainelli@...il.com, netdev@...r.kernel.org
Subject: Re: [PATCH net-next 3/4] net: dsa: mv88e6xxx: Add "eth-mac" counter
group support
On Fri, Dec 01, 2023 at 01:58:11PM +0100, Tobias Waldekranz wrote:
> Report the applicable subset of an mv88e6xxx port's counters using
> ethtool's standardized "eth-mac" counter group.
>
> Signed-off-by: Tobias Waldekranz <tobias@...dekranz.com>
> ---
> drivers/net/dsa/mv88e6xxx/chip.c | 52 ++++++++++++++++++++++++++++++++
> 1 file changed, 52 insertions(+)
>
> diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
> index 71c60f229a2f..51e3744cb89b 100644
> --- a/drivers/net/dsa/mv88e6xxx/chip.c
> +++ b/drivers/net/dsa/mv88e6xxx/chip.c
> @@ -1320,6 +1320,57 @@ static void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port,
>
> }
>
> +static void mv88e6xxx_get_eth_mac_stats(struct dsa_switch *ds, int port,
> + struct ethtool_eth_mac_stats *mac_stats)
> +{
> +#define MV88E6XXX_ETH_MAC_STAT_MAPPING(_id, _member) \
> + [MV88E6XXX_HW_STAT_ID_ ## _id] = \
> + offsetof(struct ethtool_eth_mac_stats, stats._member) \
> +
> + static const size_t stat_map[MV88E6XXX_HW_STAT_ID_MAX] = {
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(out_unicast, FramesTransmittedOK),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(single, SingleCollisionFrames),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(multiple, MultipleCollisionFrames),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(in_unicast, FramesReceivedOK),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(in_fcs_error, FrameCheckSequenceErrors),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(out_octets, OctetsTransmittedOK),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(deferred, FramesWithDeferredXmissions),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(late, LateCollisions),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(in_good_octets, OctetsReceivedOK),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(out_multicasts, MulticastFramesXmittedOK),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(out_broadcasts, BroadcastFramesXmittedOK),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(excessive, FramesWithExcessiveDeferral),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(in_multicasts, MulticastFramesReceivedOK),
> + MV88E6XXX_ETH_MAC_STAT_MAPPING(in_broadcasts, BroadcastFramesReceivedOK),
> + };
> + struct mv88e6xxx_chip *chip = ds->priv;
> + const struct mv88e6xxx_hw_stat *stat;
> + enum mv88e6xxx_hw_stat_id id;
> + u64 *member;
> + int ret;
> +
> + mv88e6xxx_reg_lock(chip);
> + ret = mv88e6xxx_stats_snapshot(chip, port);
> + mv88e6xxx_reg_unlock(chip);
Wouldn't it be more consistent with this driver's own convention if the
mv88e6xxx_reg_lock() was absorbed by mv88e6xxx_stats_snapshot()?
> +
> + if (ret < 0)
> + return;
> +
> + stat = mv88e6xxx_hw_stats;
> + for (id = 0; id < MV88E6XXX_HW_STAT_ID_MAX; id++, stat++) {
> + if (!stat_map[id])
> + continue;
Hmm, a bit fragile, this relies on offsetof(struct ethtool_eth_mac_stats, stats)
never being 0, which is not a documented requirement.
Would it be hard to make the stat_map[] array compressed rather than
sparse, and push the stat id inside the struct mv88e6xxx_hw_stat, and
only operate on ARRAY_SIZE() elements?
> +
> + member = (u64 *)(((char *)mac_stats) + stat_map[id]);
> + mv88e6xxx_stats_get_stat(chip, port, stat, member);
> + }
> +
> + mac_stats->stats.FramesTransmittedOK += mac_stats->stats.MulticastFramesXmittedOK;
> + mac_stats->stats.FramesTransmittedOK += mac_stats->stats.BroadcastFramesXmittedOK;
> + mac_stats->stats.FramesReceivedOK += mac_stats->stats.MulticastFramesReceivedOK;
> + mac_stats->stats.FramesReceivedOK += mac_stats->stats.BroadcastFramesReceivedOK;
> +}
> +
> static int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port)
> {
> struct mv88e6xxx_chip *chip = ds->priv;
> @@ -6839,6 +6890,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
> .phylink_mac_link_up = mv88e6xxx_mac_link_up,
> .get_strings = mv88e6xxx_get_strings,
> .get_ethtool_stats = mv88e6xxx_get_ethtool_stats,
> + .get_eth_mac_stats = mv88e6xxx_get_eth_mac_stats,
> .get_sset_count = mv88e6xxx_get_sset_count,
> .port_max_mtu = mv88e6xxx_get_max_mtu,
> .port_change_mtu = mv88e6xxx_change_mtu,
> --
> 2.34.1
>
Powered by blists - more mailing lists