From patchwork Tue Apr 16 15:14:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1086373 X-Patchwork-Delegate: shemminger@vyatta.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="KY2bNluz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44k86X3H4Zz9s3l for ; Wed, 17 Apr 2019 01:14:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728173AbfDPPO0 (ORCPT ); Tue, 16 Apr 2019 11:14:26 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35630 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725796AbfDPPO0 (ORCPT ); Tue, 16 Apr 2019 11:14:26 -0400 Received: by mail-wr1-f66.google.com with SMTP id w1so27626782wrp.2 for ; Tue, 16 Apr 2019 08:14:24 -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 :mime-version:content-transfer-encoding; bh=5ZT3JH9pfXyXhpodjg1nY4KtM37mD1N274Of5/kxAvU=; b=KY2bNluzqOmCtiTo01wVVDgfFHQbTRtiwk5QMtux9zRkqXRJ4sBAhGCxxn4agzIrKw 2sBMjOtQBRNRziFrlzPKmq4mehrCqhUpP1zZsBE7OxhbwwptWaZLdrwK59dkcSFFQpXb hAL35N67Gd35dgjozxCYe/P2/VJoOkNY4w8ZA= 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:mime-version:content-transfer-encoding; bh=5ZT3JH9pfXyXhpodjg1nY4KtM37mD1N274Of5/kxAvU=; b=g/oiIdu5lkJnezleqT/bmZp5qKCD5ds/4Wy1ksAryagXGPgMS+vIvz04mU6vfTGC2Y yDO0aF7qvW+kmytfM15zKenh8YbUz2xV54/Zr+YV/8k3Id3+3uClNXqIFFC4PP+V5I53 p5aD1x/KWg62QNtZ8BSIzPvbvhoezelPTt2iZD8M1QYs/0o/GwEqbCmHvrGyLmaw0lO9 fhihfgca0SAwg6T7mWU2CidEbEIva/iqdE7KpEZOPNEc13CYZDAUqu2IrfYyuwcf1wsp Wl170nLN9sCFYe6RHSnefb3Xu2latp/MjCXtcXhyEy9YujC+fCROjXzYtJzngkqqi1t3 oPAg== X-Gm-Message-State: APjAAAX/heN5nDFEh9AjEL+1pfNHZyUTU3agXPQmEVYASjL6EmXsfmrA juixWRmVJzOzlGR5ZQ0LWi6uGYG3z9E= X-Google-Smtp-Source: APXvYqzWhe3DpJpCf3xqQ84XpxO5CWV4/wgr3cN3TRZ2I7f8XikFcSs65pwpnPCkMNJTuhF6L46Nzw== X-Received: by 2002:a05:6000:12c7:: with SMTP id l7mr53479750wrx.4.1555427663447; Tue, 16 Apr 2019 08:14:23 -0700 (PDT) Received: from localhost.localdomain ([93.152.141.58]) by smtp.gmail.com with ESMTPSA id z74sm5515454wmc.2.2019.04.16.08.14.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Apr 2019 08:14:22 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, Stephen Hemminger , Nikolay Aleksandrov Subject: [PATCH iproute2] bridge: vlan: fix standard stats output Date: Tue, 16 Apr 2019 18:14:20 +0300 Message-Id: <20190416151420.31785-1-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <2da90287-6526-5523-9e58-7f00a9dd1781@cumulusnetworks.com> References: <2da90287-6526-5523-9e58-7f00a9dd1781@cumulusnetworks.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Each of the commits below broke the vlan stats output in a different way: - 45fca4ed9412 ("bridge: fix vlan show stats formatting") Added a second print of an interface name (e.g. eth4eth4) - c7c1a1ef51ae ("bridge: colorize output and use JSON print library") Broke normal vlan stats output by not printing a new line after them Also printed interfaces without any vlans when printing stats This fix is not pretty but it brings back the previous behaviour. Before this fix: $ bridge -s vlan show port vlan id br0br0 1 PVID Egress Untagged RX: 0 bytes 0 packets TX: 0 bytes 0 packets 4 RX: 0 bytes 0 packets TX: 0 bytes 0 packetseth4eth4 4 RX: 0 bytes 0 packets TX: 0 bytes 0 packetsroot@debian:~/ After this fix: $ bridge -s vlan show port vlan id br0 1 PVID Egress Untagged RX: 0 bytes 0 packets TX: 0 bytes 0 packets 4 RX: 0 bytes 0 packets TX: 0 bytes 0 packets eth4 4 RX: 0 bytes 0 packets TX: 0 bytes 0 packets Fixes: 45fca4ed9412 ("bridge: fix vlan show stats formatting") Fixes: c7c1a1ef51ae ("bridge: colorize output and use JSON print library") Signed-off-by: Nikolay Aleksandrov --- bridge/vlan.c | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/bridge/vlan.c b/bridge/vlan.c index d075a42d139b..dbed7fbd8c02 100644 --- a/bridge/vlan.c +++ b/bridge/vlan.c @@ -252,11 +252,11 @@ static int filter_vlan_check(__u16 vid, __u16 flags) return 1; } -static void open_vlan_port(int ifi_index) +static void open_vlan_port(int ifi_index, const char *fmt) { open_json_object(NULL); - print_string(PRINT_ANY, "ifname", "%s", - ll_index_to_name(ifi_index)); + print_color_string(PRINT_ANY, COLOR_IFNAME, "ifname", fmt, + ll_index_to_name(ifi_index)); open_json_array(PRINT_JSON, "vlans"); } @@ -286,7 +286,7 @@ static void print_vlan_tunnel_info(FILE *fp, struct rtattr *tb, int ifindex) __u32 last_tunid_start = 0; if (!filter_vlan) - open_vlan_port(ifindex); + open_vlan_port(ifindex, "%s"); open_json_array(PRINT_JSON, "tunnel"); for (i = RTA_DATA(list); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { @@ -331,7 +331,7 @@ static void print_vlan_tunnel_info(FILE *fp, struct rtattr *tb, int ifindex) continue; if (filter_vlan) - open_vlan_port(ifindex); + open_vlan_port(ifindex, "%s"); open_json_object(NULL); print_range("vlan", last_vid_start, tunnel_vid); @@ -448,9 +448,15 @@ static void print_vlan_flags(__u16 flags) close_json_array(PRINT_JSON, NULL); } -static void print_one_vlan_stats(const struct bridge_vlan_xstats *vstats) +static void print_one_vlan_stats(const struct bridge_vlan_xstats *vstats, + int vlan_idx) { open_json_object(NULL); + /* we need to know if this is the initial vlan to align vlan ids + * properly under it + */ + if (vlan_idx > 0) + print_string(PRINT_FP, NULL, "%-16s", ""); print_hu(PRINT_ANY, "vid", " %hu", vstats->vid); print_vlan_flags(vstats->flags); @@ -463,7 +469,7 @@ static void print_one_vlan_stats(const struct bridge_vlan_xstats *vstats) print_lluint(PRINT_ANY, "tx_bytes", " TX: %llu bytes", vstats->tx_bytes); - print_lluint(PRINT_ANY, "tx_packets", " %llu packets", + print_lluint(PRINT_ANY, "tx_packets", " %llu packets\n", vstats->tx_packets); close_json_object(); } @@ -472,8 +478,7 @@ static void print_vlan_stats_attr(struct rtattr *attr, int ifindex) { struct rtattr *brtb[LINK_XSTATS_TYPE_MAX+1]; struct rtattr *i, *list; - const char *ifname; - int rem; + int rem, vlan_idx; parse_rtattr(brtb, LINK_XSTATS_TYPE_MAX, RTA_DATA(attr), RTA_PAYLOAD(attr)); @@ -483,13 +488,8 @@ static void print_vlan_stats_attr(struct rtattr *attr, int ifindex) list = brtb[LINK_XSTATS_TYPE_BRIDGE]; rem = RTA_PAYLOAD(list); - ifname = ll_index_to_name(ifindex); - open_vlan_port(ifindex); - - print_color_string(PRINT_FP, COLOR_IFNAME, - NULL, "%-16s", ifname); - - for (i = RTA_DATA(list); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { + for (i = RTA_DATA(list), vlan_idx = 0; RTA_OK(i, rem); + i = RTA_NEXT(i, rem)) { const struct bridge_vlan_xstats *vstats = RTA_DATA(i); if (i->rta_type != BRIDGE_XSTATS_VLAN) @@ -503,9 +503,17 @@ static void print_vlan_stats_attr(struct rtattr *attr, int ifindex) !(vstats->flags & BRIDGE_VLAN_INFO_BRENTRY)) continue; - print_one_vlan_stats(vstats); + /* found vlan stats, print the interface name */ + if (vlan_idx == 0) + open_vlan_port(ifindex, "%-16s"); + + print_one_vlan_stats(vstats, vlan_idx); + vlan_idx++; } - close_vlan_port(); + + /* vlan port is opened only if there are any vlan stats */ + if (vlan_idx > 0) + close_vlan_port(); } static int print_vlan_stats(struct nlmsghdr *n, void *arg) @@ -632,7 +640,7 @@ void print_vlan_info(struct rtattr *tb, int ifindex) int rem = RTA_PAYLOAD(list); __u16 last_vid_start = 0; - open_vlan_port(ifindex); + open_vlan_port(ifindex, "%s"); for (i = RTA_DATA(list); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { struct bridge_vlan_info *vinfo;