From patchwork Wed Nov 30 13:28:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Sankaranarayanan X-Patchwork-Id: 27797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp927594wrr; Wed, 30 Nov 2022 05:35:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf6oSBsmuqOx5AtUTDPp9tPqNNA6sXXCEnqDqfbHkNobysuIvPyqrYRRFrsI2eexTDBdiDIv X-Received: by 2002:a17:902:ef8e:b0:189:6793:644e with SMTP id iz14-20020a170902ef8e00b001896793644emr26994997plb.55.1669815350158; Wed, 30 Nov 2022 05:35:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669815350; cv=none; d=google.com; s=arc-20160816; b=cZRKtwyIiS4oMaQgfsO3E7HeAzbZekU8la1vznZHocVyUpYwFoibjIpdmsrBNqxq21 ObXJg0XtfKJCAmlMQTXvEyDEDrjuJOaNVuWMttwAK7s8TjCeUWQn1nmEFZticeDFPIhm QiP6E6em0NXewYD9Ub4+0sApr+HNczZupKCknG5INg3Mn0hj+gbF8o7FSErlApROuBbq 2iYC145kVmSln0xMtiWhve2p9JZ35IwMaEouh7kfmyWT47S0zKwMDSsYk8n0uHhfYkTZ tr1QHmHqDUV3GbJ3VOIZ3zLCbmRg8/rNdnlCWLTvje2S8Sn2pplUnriJ1kbLmujHBY4s 0kGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=D/vSeSdwlsuAyGy7/zaKmfNmlu08tkKoT9SamBW+fqs=; b=KmgCJDWtFVmgyjoL7HAF2ssm5PQE/A2QBcrAazyD//L6NZwPo7YT2QPvL9HZWvuheR h+3Vy/D9O34upi+p05urEf+Pft9TgPdFskh5MjZVFyluLfTdUsvyOH85gbCZHxntUDuq MuHPX4qViILO0qpQA29w7TIzCscgfWlppoq6wJ/BKEoAGOYR7/3K1WjuEV810QzEyEo4 9IvJ77YAvkGBdwCmCRezF+rQqxcLQ7O7RHMGJRhVzWmo4nNvDQx/HsOgXS4UNv96mr4K KHYiOEn1ot5aWQetK+hMgPSHqU7PoN159qNnoCA6qH8CudJwj4WbYai9OLPJTSItBgY8 YGnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=Kl+iITf3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d21-20020a056a00199500b00574694c97c7si1692061pfl.300.2022.11.30.05.35.36; Wed, 30 Nov 2022 05:35:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=Kl+iITf3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229472AbiK3N3x (ORCPT + 99 others); Wed, 30 Nov 2022 08:29:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234022AbiK3N3s (ORCPT ); Wed, 30 Nov 2022 08:29:48 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0BB366C9A; Wed, 30 Nov 2022 05:29:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1669814987; x=1701350987; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=D8xEpmhqSV+pyWd3PBzu+0gtBcOl/hTNlpWkQLkNN3c=; b=Kl+iITf3EJ9UkZCqezdIVV8e29ph3bojYC7qn4Uit4x6gBh9U2Ahk7hg 9hQhIiECgo802dGOk1Ssx9UB4xcBVjCOFJhE3+gFcnnYOAv/3mwaepuxf UG8vZMunv+yMXrnsytWZCU64N7Im9iWDPh7XJhklxxM5p/9S1jHflNED3 pwduSJbGKUGXdmVU5Jb0eY6Ius+ShxfVlHQaEQuehNI9B+r+pMGNxjzs6 1j0oHQQi426tGfHdy45BgMfNC6GgJ36Pjt65qQLJ2mjnl4SDM+GGZVxJK I2Wt2oH51CyTovjxHOpo4Oesoug5odOQt1DWu1OjLYvWoCAUmo437nzMM Q==; X-IronPort-AV: E=Sophos;i="5.96,206,1665471600"; d="scan'208";a="202016568" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 30 Nov 2022 06:29:47 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Wed, 30 Nov 2022 06:29:46 -0700 Received: from che-lt-i67786lx.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Wed, 30 Nov 2022 06:29:43 -0700 From: Rakesh Sankaranarayanan To: , CC: , , , , , , , , Subject: [RFC Patch net-next 1/5] net: dsa: microchip: add rmon grouping for ethtool statistics Date: Wed, 30 Nov 2022 18:58:58 +0530 Message-ID: <20221130132902.2984580-2-rakesh.sankaranarayanan@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221130132902.2984580-1-rakesh.sankaranarayanan@microchip.com> References: <20221130132902.2984580-1-rakesh.sankaranarayanan@microchip.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750928300691417869?= X-GMAIL-MSGID: =?utf-8?q?1750928300691417869?= Add support for ethtool standard device statistics grouping. Support rmon statistics grouping using rmon groups parameter in ethtool command. rmon provides packet size based range grouping. Common mib parameters are used across all KSZ series swtches for packet size statistics, except for KSZ8830. KSZ series have mib counters for packets with size: - less than 64 Bytes, - 65 to 127 Bytes, - 128 to 255 Bytes, - 256 to 511 Bytes, - 512 to 1023 Bytes, - 1024 to 1522 Bytes, - 1523 to 2000 Bytes and - More than 2001 Bytes KSZ8830 have mib counters upto 1024-1522 range only. Since no other change, common range used across all KSZ series, but used upto only upto 1024-1522 for KSZ8830. Signed-off-by: Rakesh Sankaranarayanan --- drivers/net/dsa/microchip/Makefile | 1 + drivers/net/dsa/microchip/ksz_common.c | 15 ++ drivers/net/dsa/microchip/ksz_common.h | 3 + drivers/net/dsa/microchip/ksz_ethtool.c | 178 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ethtool.h | 18 +++ 5 files changed, 215 insertions(+) create mode 100644 drivers/net/dsa/microchip/ksz_ethtool.c create mode 100644 drivers/net/dsa/microchip/ksz_ethtool.h diff --git a/drivers/net/dsa/microchip/Makefile b/drivers/net/dsa/microchip/Makefile index 28873559efc2..413a706a47fb 100644 --- a/drivers/net/dsa/microchip/Makefile +++ b/drivers/net/dsa/microchip/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON) += ksz_switch.o ksz_switch-objs := ksz_common.o +ksz_switch-objs += ksz_ethtool.o ksz_switch-objs += ksz9477.o ksz_switch-objs += ksz8795.o ksz_switch-objs += lan937x_main.o diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 8c8db315317d..7a9d7ef818a7 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -24,6 +24,7 @@ #include #include "ksz_common.h" +#include "ksz_ethtool.h" #include "ksz8.h" #include "ksz9477.h" #include "lan937x.h" @@ -157,6 +158,7 @@ static const struct ksz_dev_ops ksz8_dev_ops = { .r_mib_pkt = ksz8_r_mib_pkt, .freeze_mib = ksz8_freeze_mib, .port_init_cnt = ksz8_port_init_cnt, + .get_rmon_stats = ksz8_get_rmon_stats, .fdb_dump = ksz8_fdb_dump, .mdb_add = ksz8_mdb_add, .mdb_del = ksz8_mdb_del, @@ -194,6 +196,7 @@ static const struct ksz_dev_ops ksz9477_dev_ops = { .r_mib_stat64 = ksz_r_mib_stats64, .freeze_mib = ksz9477_freeze_mib, .port_init_cnt = ksz9477_port_init_cnt, + .get_rmon_stats = ksz9477_get_rmon_stats, .vlan_filtering = ksz9477_port_vlan_filtering, .vlan_add = ksz9477_port_vlan_add, .vlan_del = ksz9477_port_vlan_del, @@ -230,6 +233,7 @@ static const struct ksz_dev_ops lan937x_dev_ops = { .r_mib_stat64 = ksz_r_mib_stats64, .freeze_mib = ksz9477_freeze_mib, .port_init_cnt = ksz9477_port_init_cnt, + .get_rmon_stats = ksz9477_get_rmon_stats, .vlan_filtering = ksz9477_port_vlan_filtering, .vlan_add = ksz9477_port_vlan_add, .vlan_del = ksz9477_port_vlan_del, @@ -1609,6 +1613,16 @@ static void ksz_get_pause_stats(struct dsa_switch *ds, int port, spin_unlock(&mib->stats64_lock); } +static void ksz_get_rmon_stats(struct dsa_switch *ds, int port, + struct ethtool_rmon_stats *rmon_stats, + const struct ethtool_rmon_hist_range **ranges) +{ + struct ksz_device *dev = ds->priv; + + if (dev->dev_ops->get_rmon_stats) + dev->dev_ops->get_rmon_stats(dev, port, rmon_stats, ranges); +} + static void ksz_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *buf) { @@ -2859,6 +2873,7 @@ static const struct dsa_switch_ops ksz_switch_ops = { .port_mirror_del = ksz_port_mirror_del, .get_stats64 = ksz_get_stats64, .get_pause_stats = ksz_get_pause_stats, + .get_rmon_stats = ksz_get_rmon_stats, .port_change_mtu = ksz_change_mtu, .port_max_mtu = ksz_max_mtu, }; diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index c6726cbd5465..ad6d196d2927 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -339,6 +339,9 @@ struct ksz_dev_ops { int (*reset)(struct ksz_device *dev); int (*init)(struct ksz_device *dev); void (*exit)(struct ksz_device *dev); + void (*get_rmon_stats)(struct ksz_device *dev, int port, + struct ethtool_rmon_stats *rmon_stats, + const struct ethtool_rmon_hist_range **ranges); }; struct ksz_device *ksz_switch_alloc(struct device *base, void *priv); diff --git a/drivers/net/dsa/microchip/ksz_ethtool.c b/drivers/net/dsa/microchip/ksz_ethtool.c new file mode 100644 index 000000000000..7e1f1b4d1e98 --- /dev/null +++ b/drivers/net/dsa/microchip/ksz_ethtool.c @@ -0,0 +1,178 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Microchip KSZ series ethtool statistics + * + * Copyright (C) 2022 Microchip Technology Inc. + */ + +#include "ksz_common.h" +#include "ksz_ethtool.h" + +enum ksz8_mib_entry { + ksz8_rx, + ksz8_rx_hi, + ksz8_rx_undersize, + ksz8_rx_fragments, + ksz8_rx_oversize, + ksz8_rx_jabbers, + ksz8_rx_symbol_err, + ksz8_rx_crc_err, + ksz8_rx_align_err, + ksz8_rx_mac_ctrl, + ksz8_rx_pause, + ksz8_rx_bcast, + ksz8_rx_mcast, + ksz8_rx_ucast, + ksz8_rx_64_or_less, + ksz8_rx_65_127, + ksz8_rx_128_255, + ksz8_rx_256_511, + ksz8_rx_512_1023, + ksz8_rx_1024_1522, + ksz8_tx, + ksz8_tx_hi, + ksz8_tx_late_col, + ksz8_tx_pause, + ksz8_tx_bcast, + ksz8_tx_mcast, + ksz8_tx_ucast, + ksz8_tx_deferred, + ksz8_tx_total_col, + ksz8_tx_exc_col, + ksz8_tx_single_col, + ksz8_tx_mult_col, + ksz8_rx_discards = 0x100, + ksz8_tx_discards, +}; + +enum ksz9477_mib_entry { + ksz9477_rx_hi, + ksz9477_rx_undersize, + ksz9477_rx_fragments, + ksz9477_rx_oversize, + ksz9477_rx_jabbers, + ksz9477_rx_symbol_err, + ksz9477_rx_crc_err, + ksz9477_rx_align_err, + ksz9477_rx_mac_ctrl, + ksz9477_rx_pause, + ksz9477_rx_bcast, + ksz9477_rx_mcast, + ksz9477_rx_ucast, + ksz9477_rx_64_or_less, + ksz9477_rx_65_127, + ksz9477_rx_128_255, + ksz9477_rx_256_511, + ksz9477_rx_512_1023, + ksz9477_rx_1024_1522, + ksz9477_rx_1523_2000, + ksz9477_rx_2001, + ksz9477_tx_hi, + ksz9477_tx_late_col, + ksz9477_tx_pause, + ksz9477_tx_bcast, + ksz9477_tx_mcast, + ksz9477_tx_ucast, + ksz9477_tx_deferred, + ksz9477_tx_total_col, + ksz9477_tx_exc_col, + ksz9477_tx_single_col, + ksz9477_tx_mult_col, + ksz9477_rx_total = 0x80, + ksz9477_tx_total, + ksz9477_rx_discards, + ksz9477_tx_discards, +}; + +static const struct ethtool_rmon_hist_range ksz_rmon_ranges[] = { + { 0, 64 }, + { 65, 127 }, + { 128, 255 }, + { 256, 511 }, + { 512, 1023 }, + { 1024, 1522 }, + { 1523, 2000 }, + { 2001, 9000 }, + {} +}; + +#define KSZ8_HIST_LEN 6 +#define KSZ9477_HIST_LEN 8 + +void ksz8_get_rmon_stats(struct ksz_device *dev, int port, + struct ethtool_rmon_stats *rmon_stats, + const struct ethtool_rmon_hist_range **ranges) +{ + struct ksz_port_mib *mib; + u64 *cnt; + u8 i; + + mib = &dev->ports[port].mib; + + mutex_lock(&mib->cnt_mutex); + + cnt = &mib->counters[ksz8_rx_undersize]; + dev->dev_ops->r_mib_pkt(dev, port, ksz8_rx_undersize, NULL, cnt); + rmon_stats->undersize_pkts = *cnt; + + cnt = &mib->counters[ksz8_rx_oversize]; + dev->dev_ops->r_mib_pkt(dev, port, ksz8_rx_oversize, NULL, cnt); + rmon_stats->oversize_pkts = *cnt; + + cnt = &mib->counters[ksz8_rx_fragments]; + dev->dev_ops->r_mib_pkt(dev, port, ksz8_rx_fragments, NULL, cnt); + rmon_stats->fragments = *cnt; + + cnt = &mib->counters[ksz8_rx_jabbers]; + dev->dev_ops->r_mib_pkt(dev, port, ksz8_rx_jabbers, NULL, cnt); + rmon_stats->jabbers = *cnt; + + for (i = 0; i < KSZ8_HIST_LEN; i++) { + cnt = &mib->counters[ksz8_rx_64_or_less + i]; + dev->dev_ops->r_mib_pkt(dev, port, (ksz8_rx_64_or_less + i), NULL, cnt); + rmon_stats->hist[i] = *cnt; + } + + mutex_unlock(&mib->cnt_mutex); + + *ranges = ksz_rmon_ranges; +} + +void ksz9477_get_rmon_stats(struct ksz_device *dev, int port, + struct ethtool_rmon_stats *rmon_stats, + const struct ethtool_rmon_hist_range **ranges) +{ + struct ksz_port_mib *mib; + u64 *cnt; + u8 i; + + mib = &dev->ports[port].mib; + + mutex_lock(&mib->cnt_mutex); + + cnt = &mib->counters[ksz9477_rx_undersize]; + dev->dev_ops->r_mib_pkt(dev, port, ksz9477_rx_undersize, NULL, cnt); + rmon_stats->undersize_pkts = *cnt; + + cnt = &mib->counters[ksz9477_rx_oversize]; + dev->dev_ops->r_mib_pkt(dev, port, ksz9477_rx_oversize, NULL, cnt); + rmon_stats->oversize_pkts = *cnt; + + cnt = &mib->counters[ksz9477_rx_fragments]; + dev->dev_ops->r_mib_pkt(dev, port, ksz9477_rx_fragments, NULL, cnt); + rmon_stats->fragments = *cnt; + + cnt = &mib->counters[ksz9477_rx_jabbers]; + dev->dev_ops->r_mib_pkt(dev, port, ksz9477_rx_jabbers, NULL, cnt); + rmon_stats->jabbers = *cnt; + + for (i = 0; i < KSZ9477_HIST_LEN; i++) { + cnt = &mib->counters[ksz9477_rx_64_or_less + i]; + dev->dev_ops->r_mib_pkt(dev, port, (ksz9477_rx_64_or_less + i), NULL, cnt); + rmon_stats->hist[i] = *cnt; + } + + mutex_unlock(&mib->cnt_mutex); + + *ranges = ksz_rmon_ranges; +} diff --git a/drivers/net/dsa/microchip/ksz_ethtool.h b/drivers/net/dsa/microchip/ksz_ethtool.h new file mode 100644 index 000000000000..6927e2f143f8 --- /dev/null +++ b/drivers/net/dsa/microchip/ksz_ethtool.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Microchip KSZ series ethtool statistics + * + * Copyright (C) 2022 Microchip Technology Inc. + */ + +#ifndef __KSZ_ETHTOOL_H +#define __KSZ_ETHTOOL_H + +void ksz8_get_rmon_stats(struct ksz_device *dev, int port, + struct ethtool_rmon_stats *rmon_stats, + const struct ethtool_rmon_hist_range **ranges); + +void ksz9477_get_rmon_stats(struct ksz_device *dev, int port, + struct ethtool_rmon_stats *rmon_stats, + const struct ethtool_rmon_hist_range **ranges); +#endif