From patchwork Tue Mar 12 16:41:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1055544 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="ZzzRhaSS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Jgmy4nPCz9s5c for ; Wed, 13 Mar 2019 03:44:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726813AbfCLQos (ORCPT ); Tue, 12 Mar 2019 12:44:48 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44023 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726329AbfCLQor (ORCPT ); Tue, 12 Mar 2019 12:44:47 -0400 Received: by mail-wr1-f67.google.com with SMTP id d17so3443401wre.10 for ; Tue, 12 Mar 2019 09:44:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9hiXh6N+0bVJ6vwaJrBSIyLFAX5MSuXdYQLQtfuNYSU=; b=ZzzRhaSSMkaMEX+aU1eJYdmfNqdmo6LCzDpPDV/NkKXFCD1jRCfpy2nw/WS9Ec8JKx Sa5nDbMcjrTBADigDq4wHrkX5Qfn+vzFJtZHVO+r1UPJ3KfZs+0SFJeuSfGrT7bh1w5/ iRk+A8X90aJtQMbceM0D6q6IF7FwpLPVZ5tKw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9hiXh6N+0bVJ6vwaJrBSIyLFAX5MSuXdYQLQtfuNYSU=; b=VV2NJydQ1PamShkYykBuA1cC1zVatSuQ1SIzM1BG+xIQX5Qv8yVG3CfKYwHvoaTjzP 0EuKNNEMx1f0VCJRP3W5k2LRrJ4U6xkSOWVp/bp34q8cB/I3NHYQ3fdVuxTkCJPHMoFE ZAlIdkUfPGTn1Fb5hj5Pcg0gfyB01pIQLcMbXMpEaXzFLLET3GGHlk4Shn0lwntkw298 HkuJTRTAlgtCozFhSBNBDfqSyF90SBMGbe+YHHycL+u7IzinqUq6Q8VFfmjszxawFImZ ggw/5LNfJq43y8m2hohWW9GOurXOpJ7dwkjBt7VtssKawjJ0E9/V18WQNrOH6lEDq4XC 5BXw== X-Gm-Message-State: APjAAAVsnugsQs71/omNbCWHG+Q/vF2AeHUVVD8TA2q6XuXP9jnshUfA ml8dbJ5FvAIQ+cYFISApUBhUbjAVPTk= X-Google-Smtp-Source: APXvYqxShag2X5hUi6GpluHH/I2/DrsAbwafOLC2yjU5oKQwXdXrlaDgj5XdbW0VJ54Hr3MRvHO2PQ== X-Received: by 2002:a5d:6b46:: with SMTP id x6mr15361472wrw.94.1552409085029; Tue, 12 Mar 2019 09:44:45 -0700 (PDT) Received: from localhost.localdomain ([93.152.141.58]) by smtp.gmail.com with ESMTPSA id b195sm5634864wmg.36.2019.03.12.09.44.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:44:43 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, dsa@cumulusnetworks.com, stephen@networkplumber.org, Nikolay Aleksandrov Subject: [PATCH iproute2-next 2/3] ip: bridge: add xstats json support Date: Tue, 12 Mar 2019 18:41:27 +0200 Message-Id: <20190312164128.22536-3-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190312164128.22536-1-nikolay@cumulusnetworks.com> References: <20190312164128.22536-1-nikolay@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add json support for bridge's xstats output. The plain text output format should remain the same. Note that this patch pulls the interface out of the attribute loop, this was an oversight when the set was upstreamed. This does not change the output format, but fixes it when new xstats attributes show up. Example: $ ip -p -j link xstats type bridge [ { "ifname": "br0", "multicast": { "igmp_queries": { "rx_v1": 0, "rx_v2": 32, "rx_v3": 0, "tx_v1": 0, "tx_v2": 0, "tx_v3": 0 }, "igmp_reports": { "rx_v1": 0, "rx_v2": 32, "rx_v3": 0, "tx_v1": 0, "tx_v2": 0, "tx_v3": 0 }, "igmp_leaves": { "rx": 0, "tx": 0 }, "igmp_parse_errors": 0, "mld_queries": { "rx_v1": 33, "rx_v2": 0, "tx_v1": 0, "tx_v2": 0 }, "mld_reports": { "rx_v1": 66, "rx_v2": 2, "tx_v1": 0, "tx_v2": 0 }, "mld_leaves": { "rx": 0, "tx": 0 }, "mld_parse_errors": 0 } } ] Signed-off-by: Nikolay Aleksandrov --- ip/iplink_bridge.c | 169 ++++++++++++++++++++++++++++----------------- 1 file changed, 104 insertions(+), 65 deletions(-) diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index fbf8a79bfbbb..e9b77fdfe377 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -670,7 +670,7 @@ static void bridge_print_xstats_help(struct link_util *lu, FILE *f) fprintf(f, "Usage: ... %s [ igmp ] [ dev DEVICE ]\n", lu->id); } -static void bridge_print_stats_attr(FILE *f, struct rtattr *attr, int ifindex) +static void bridge_print_stats_attr(struct rtattr *attr, int ifindex) { struct rtattr *brtb[LINK_XSTATS_TYPE_MAX+1]; struct br_mcast_stats *mstats; @@ -685,76 +685,116 @@ static void bridge_print_stats_attr(FILE *f, struct rtattr *attr, int ifindex) list = brtb[LINK_XSTATS_TYPE_BRIDGE]; rem = RTA_PAYLOAD(list); + open_json_object(NULL); + ifname = ll_index_to_name(ifindex); + print_string(PRINT_ANY, "ifname", "%-16s\n", ifname); for (i = RTA_DATA(list); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { if (xstats_print_attr && i->rta_type != xstats_print_attr) continue; switch (i->rta_type) { case BRIDGE_XSTATS_MCAST: mstats = RTA_DATA(i); - ifname = ll_index_to_name(ifindex); - fprintf(f, "%-16s\n", ifname); - fprintf(f, "%-16s IGMP queries:\n", ""); - fprintf(f, "%-16s RX: v1 %llu v2 %llu v3 %llu\n", - "", - mstats->igmp_v1queries[BR_MCAST_DIR_RX], - mstats->igmp_v2queries[BR_MCAST_DIR_RX], - mstats->igmp_v3queries[BR_MCAST_DIR_RX]); - fprintf(f, "%-16s TX: v1 %llu v2 %llu v3 %llu\n", - "", - mstats->igmp_v1queries[BR_MCAST_DIR_TX], - mstats->igmp_v2queries[BR_MCAST_DIR_TX], - mstats->igmp_v3queries[BR_MCAST_DIR_TX]); - - fprintf(f, "%-16s IGMP reports:\n", ""); - fprintf(f, "%-16s RX: v1 %llu v2 %llu v3 %llu\n", - "", - mstats->igmp_v1reports[BR_MCAST_DIR_RX], - mstats->igmp_v2reports[BR_MCAST_DIR_RX], - mstats->igmp_v3reports[BR_MCAST_DIR_RX]); - fprintf(f, "%-16s TX: v1 %llu v2 %llu v3 %llu\n", - "", - mstats->igmp_v1reports[BR_MCAST_DIR_TX], - mstats->igmp_v2reports[BR_MCAST_DIR_TX], - mstats->igmp_v3reports[BR_MCAST_DIR_TX]); - - fprintf(f, "%-16s IGMP leaves: RX: %llu TX: %llu\n", - "", - mstats->igmp_leaves[BR_MCAST_DIR_RX], - mstats->igmp_leaves[BR_MCAST_DIR_TX]); - - fprintf(f, "%-16s IGMP parse errors: %llu\n", - "", mstats->igmp_parse_errors); - - fprintf(f, "%-16s MLD queries:\n", ""); - fprintf(f, "%-16s RX: v1 %llu v2 %llu\n", - "", - mstats->mld_v1queries[BR_MCAST_DIR_RX], - mstats->mld_v2queries[BR_MCAST_DIR_RX]); - fprintf(f, "%-16s TX: v1 %llu v2 %llu\n", - "", - mstats->mld_v1queries[BR_MCAST_DIR_TX], - mstats->mld_v2queries[BR_MCAST_DIR_TX]); - - fprintf(f, "%-16s MLD reports:\n", ""); - fprintf(f, "%-16s RX: v1 %llu v2 %llu\n", - "", - mstats->mld_v1reports[BR_MCAST_DIR_RX], - mstats->mld_v2reports[BR_MCAST_DIR_RX]); - fprintf(f, "%-16s TX: v1 %llu v2 %llu\n", - "", - mstats->mld_v1reports[BR_MCAST_DIR_TX], - mstats->mld_v2reports[BR_MCAST_DIR_TX]); - - fprintf(f, "%-16s MLD leaves: RX: %llu TX: %llu\n", - "", - mstats->mld_leaves[BR_MCAST_DIR_RX], - mstats->mld_leaves[BR_MCAST_DIR_TX]); - - fprintf(f, "%-16s MLD parse errors: %llu\n", - "", mstats->mld_parse_errors); + open_json_object("multicast"); + open_json_object("igmp_queries"); + print_string(PRINT_FP, NULL, + "%-16s IGMP queries:\n", ""); + print_string(PRINT_FP, NULL, "%-16s ", ""); + print_u64(PRINT_ANY, "rx_v1", "RX: v1 %llu ", + mstats->igmp_v1queries[BR_MCAST_DIR_RX]); + print_u64(PRINT_ANY, "rx_v2", "v2 %llu ", + mstats->igmp_v2queries[BR_MCAST_DIR_RX]); + print_u64(PRINT_ANY, "rx_v3", "v3 %llu\n", + mstats->igmp_v3queries[BR_MCAST_DIR_RX]); + print_string(PRINT_FP, NULL, "%-16s ", ""); + print_u64(PRINT_ANY, "tx_v1", "TX: v1 %llu ", + mstats->igmp_v1queries[BR_MCAST_DIR_TX]); + print_u64(PRINT_ANY, "tx_v2", "v2 %llu ", + mstats->igmp_v2queries[BR_MCAST_DIR_TX]); + print_u64(PRINT_ANY, "tx_v3", "v3 %llu\n", + mstats->igmp_v3queries[BR_MCAST_DIR_TX]); + close_json_object(); + + open_json_object("igmp_reports"); + print_string(PRINT_FP, NULL, + "%-16s IGMP reports:\n", ""); + print_string(PRINT_FP, NULL, "%-16s ", ""); + print_u64(PRINT_ANY, "rx_v1", "RX: v1 %llu ", + mstats->igmp_v1reports[BR_MCAST_DIR_RX]); + print_u64(PRINT_ANY, "rx_v2", "v2 %llu ", + mstats->igmp_v2reports[BR_MCAST_DIR_RX]); + print_u64(PRINT_ANY, "rx_v3", "v3 %llu\n", + mstats->igmp_v3reports[BR_MCAST_DIR_RX]); + print_string(PRINT_FP, NULL, "%-16s ", ""); + print_u64(PRINT_ANY, "tx_v1", "TX: v1 %llu ", + mstats->igmp_v1reports[BR_MCAST_DIR_TX]); + print_u64(PRINT_ANY, "tx_v2", "v2 %llu", + mstats->igmp_v2reports[BR_MCAST_DIR_TX]); + print_u64(PRINT_ANY, "tx_v3", "v3 %llu\n", + mstats->igmp_v3reports[BR_MCAST_DIR_TX]); + close_json_object(); + + open_json_object("igmp_leaves"); + print_string(PRINT_FP, NULL, + "%-16s IGMP leaves: ", ""); + print_u64(PRINT_ANY, "rx", "RX: %llu ", + mstats->igmp_leaves[BR_MCAST_DIR_RX]); + print_u64(PRINT_ANY, "tx", "TX: %llu\n", + mstats->igmp_leaves[BR_MCAST_DIR_TX]); + close_json_object(); + + print_string(PRINT_FP, NULL, + "%-16s IGMP parse errors: ", ""); + print_u64(PRINT_ANY, "igmp_parse_errors", "%llu\n", + mstats->igmp_parse_errors); + + open_json_object("mld_queries"); + print_string(PRINT_FP, NULL, + "%-16s MLD queries:\n", ""); + print_string(PRINT_FP, NULL, "%-16s ", ""); + print_u64(PRINT_ANY, "rx_v1", "RX: v1 %llu ", + mstats->mld_v1queries[BR_MCAST_DIR_RX]); + print_u64(PRINT_ANY, "rx_v2", "v2 %llu\n", + mstats->mld_v2queries[BR_MCAST_DIR_RX]); + print_string(PRINT_FP, NULL, "%-16s ", ""); + print_u64(PRINT_ANY, "tx_v1", "TX: v1 %llu ", + mstats->mld_v1queries[BR_MCAST_DIR_TX]); + print_u64(PRINT_ANY, "tx_v2", "v2 %llu\n", + mstats->mld_v2queries[BR_MCAST_DIR_TX]); + close_json_object(); + + open_json_object("mld_reports"); + print_string(PRINT_FP, NULL, + "%-16s MLD reports:\n", ""); + print_string(PRINT_FP, NULL, "%-16s ", ""); + print_u64(PRINT_ANY, "rx_v1", "RX: v1 %llu ", + mstats->mld_v1reports[BR_MCAST_DIR_RX]); + print_u64(PRINT_ANY, "rx_v2", "v2 %llu\n", + mstats->mld_v2reports[BR_MCAST_DIR_RX]); + print_string(PRINT_FP, NULL, "%-16s ", ""); + print_u64(PRINT_ANY, "tx_v1", "TX: v1 %llu ", + mstats->mld_v1reports[BR_MCAST_DIR_TX]); + print_u64(PRINT_ANY, "tx_v2", "v2 %llu\n", + mstats->mld_v2reports[BR_MCAST_DIR_TX]); + close_json_object(); + + open_json_object("mld_leaves"); + print_string(PRINT_FP, NULL, + "%-16s MLD leaves: ", ""); + print_u64(PRINT_ANY, "rx", "RX: %llu ", + mstats->mld_leaves[BR_MCAST_DIR_RX]); + print_u64(PRINT_ANY, "tx", "TX: %llu\n", + mstats->mld_leaves[BR_MCAST_DIR_TX]); + close_json_object(); + + print_string(PRINT_FP, NULL, + "%-16s MLD parse errors: ", ""); + print_u64(PRINT_ANY, "mld_parse_errors", "%llu\n", + mstats->mld_parse_errors); + close_json_object(); break; } } + close_json_object(); } int bridge_print_xstats(struct nlmsghdr *n, void *arg) @@ -762,7 +802,6 @@ int bridge_print_xstats(struct nlmsghdr *n, void *arg) struct if_stats_msg *ifsm = NLMSG_DATA(n); struct rtattr *tb[IFLA_STATS_MAX+1]; int len = n->nlmsg_len; - FILE *fp = arg; len -= NLMSG_LENGTH(sizeof(*ifsm)); if (len < 0) { @@ -774,11 +813,11 @@ int bridge_print_xstats(struct nlmsghdr *n, void *arg) parse_rtattr(tb, IFLA_STATS_MAX, IFLA_STATS_RTA(ifsm), len); if (tb[IFLA_STATS_LINK_XSTATS]) - bridge_print_stats_attr(fp, tb[IFLA_STATS_LINK_XSTATS], + bridge_print_stats_attr(tb[IFLA_STATS_LINK_XSTATS], ifsm->ifindex); if (tb[IFLA_STATS_LINK_XSTATS_SLAVE]) - bridge_print_stats_attr(fp, tb[IFLA_STATS_LINK_XSTATS_SLAVE], + bridge_print_stats_attr(tb[IFLA_STATS_LINK_XSTATS_SLAVE], ifsm->ifindex); return 0;