From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7CB7C4320A for ; Tue, 3 Aug 2021 16:52:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 92A6D60230 for ; Tue, 3 Aug 2021 16:52:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237492AbhHCQwb (ORCPT ); Tue, 3 Aug 2021 12:52:31 -0400 Received: from mga17.intel.com ([192.55.52.151]:64065 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237446AbhHCQwW (ORCPT ); Tue, 3 Aug 2021 12:52:22 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10065"; a="194016036" X-IronPort-AV: E=Sophos;i="5.84,292,1620716400"; d="scan'208";a="194016036" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Aug 2021 09:52:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,292,1620716400"; d="scan'208";a="479592823" Received: from irvmail001.ir.intel.com ([10.43.11.63]) by fmsmga008.fm.intel.com with ESMTP; 03 Aug 2021 09:51:59 -0700 Received: from alobakin-mobl.ger.corp.intel.com (mszymcza-mobl.ger.corp.intel.com [10.213.25.231]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 173Gpg79004325; Tue, 3 Aug 2021 17:51:54 +0100 From: Alexander Lobakin To: Michal Kubecek Cc: "David S. Miller" , Jakub Kicinski , Alexander Lobakin , Jesse Brandeburg , Lukasz Czapnik , Marcin Kubiak , Michal Kubiak , Michal Swiatkowski , Jonathan Corbet , Netanel Belgazal , Arthur Kiyanovski , Guy Tzalik , Saeed Bishara , Ioana Ciornei , Claudiu Manoil , Thomas Petazzoni , Marcin Wojtas , Russell King , Edward Cree , Martin Habets , "Michael S. Tsirkin" , Jason Wang , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , Shay Agroskin , Sameeh Jubran , Alexander Duyck , Danielle Ratson , Ido Schimmel , Andrew Lunn , Vladyslav Tarasiuk , Arnd Bergmann , Andrew Morton , Jian Shen , Petr Vorel , Dan Murphy , Yangbo Lu , Zheng Yongjun , Heiner Kallweit , YueHaibing , Johannes Berg , netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, bpf@vger.kernel.org Subject: [PATCH ethtool-next 3/5] stats: add support for per-channel statistics [blocks] Date: Tue, 3 Aug 2021 18:51:38 +0200 Message-Id: <20210803165140.172-4-alexandr.lobakin@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210803165140.172-1-alexandr.lobakin@intel.com> References: <20210803165140.172-1-alexandr.lobakin@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Treat ETHTOOL_A_STATS_GRP_STAT_BLOCK as a block of the standard stats for one channel and print them prefixed with "channel%u-". The index will be started from 0 and incremented automatically for each new attr of that type. This means that stats blocks should follow each other one by one according to their channel number, otherwise the output can mess up with the indices. Signed-off-by: Alexander Lobakin Reviewed-by: Jesse Brandeburg --- netlink/stats.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/netlink/stats.c b/netlink/stats.c index 9d950b77d656..36a9dad97f15 100644 --- a/netlink/stats.c +++ b/netlink/stats.c @@ -87,8 +87,8 @@ err_close_rmon: return 1; } -static int parse_stat(const struct nlattr *attr, const char *grp_name, - const struct stringset *stat_str) +static int parse_stat(const struct nlattr *attr, const char *ch_name, + const char *grp_name, const struct stringset *stat_str) { const struct nlattr *stat; unsigned long long val; @@ -108,8 +108,12 @@ static int parse_stat(const struct nlattr *attr, const char *grp_name, if (!name || !name[0]) return 0; - if (!is_json_context()) + if (!is_json_context()) { + if (ch_name) + fprintf(stdout, "%s-", ch_name); + fprintf(stdout, "%s-%s: ", grp_name, name); + } val = mnl_attr_get_u64(stat); print_u64(PRINT_ANY, name, "%llu\n", val); @@ -117,12 +121,62 @@ static int parse_stat(const struct nlattr *attr, const char *grp_name, return 0; } +static int parse_one_block(const struct nlattr *block, const char *grp_name, + const struct stringset *stat_str, + unsigned int channel) +{ + char ch_name[ETH_GSTRING_LEN]; + const struct nlattr *attr; + + snprintf(ch_name, sizeof(ch_name), "channel%u", channel); + open_json_object(ch_name); + + mnl_attr_for_each_nested(attr, block) { + if (mnl_attr_get_type(attr) != ETHTOOL_A_STATS_GRP_STAT || + parse_stat(attr, ch_name, grp_name, stat_str)) + goto err_close_block; + } + + close_json_object(); + + return 0; + +err_close_block: + close_json_object(); + + return 1; +} + +static int parse_blocks(const struct nlattr *grp, const char *grp_name, + const struct stringset *stat_str) +{ + const struct nlattr *attr; + unsigned int channel = 0; + + open_json_array("per-channel", ""); + + mnl_attr_for_each_nested(attr, grp) { + if (mnl_attr_get_type(attr) == ETHTOOL_A_STATS_GRP_STAT_BLOCK && + parse_one_block(attr, grp_name, stat_str, channel++)) + goto err_close_block; + } + + close_json_array(""); + + return 0; + +err_close_block: + close_json_array(""); + + return 1; +} + static int parse_grp(struct nl_context *nlctx, const struct nlattr *grp, const struct stringset *std_str) { const struct nlattr *tb[ETHTOOL_A_STATS_GRP_SS_ID + 1] = {}; DECLARE_ATTR_TB_INFO(tb); - bool hist_rx = false, hist_tx = false; + bool hist_rx = false, hist_tx = false, blocks = false; const struct stringset *stat_str; const struct nlattr *attr; unsigned int ss_id, id; @@ -156,6 +210,9 @@ static int parse_grp(struct nl_context *nlctx, const struct nlattr *grp, case ETHTOOL_A_STATS_GRP_HIST_TX: hist_tx = true; continue; + case ETHTOOL_A_STATS_GRP_STAT_BLOCK: + blocks = true; + continue; default: continue; } @@ -170,6 +227,8 @@ static int parse_grp(struct nl_context *nlctx, const struct nlattr *grp, if (hist_tx) parse_rmon_hist(grp, std_name, "tx-pktsNtoM", "tx", ETHTOOL_A_STATS_GRP_HIST_TX); + if (blocks) + parse_blocks(grp, std_name, stat_str); close_json_object(); -- 2.31.1