From patchwork Tue Dec 10 21:20:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Didelot X-Patchwork-Id: 1207291 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 (no SPF record) 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=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="h8KmEzd6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47XXzk0SCxz9sT4 for ; Wed, 11 Dec 2019 08:21:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729139AbfLJVVD (ORCPT ); Tue, 10 Dec 2019 16:21:03 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:36530 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729291AbfLJVVC (ORCPT ); Tue, 10 Dec 2019 16:21:02 -0500 Received: by mail-qt1-f194.google.com with SMTP id k11so4202144qtm.3 for ; Tue, 10 Dec 2019 13:21:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HALsy1SsRzqboEILgEkyfVYlqeD8DKr+cao6rYYBxRU=; b=h8KmEzd6aYcu5L1jPwn+xhW3YL9g1YfC2E/rrg7Ni3VVQsOVCcSTsVBjPmW+tbRFjj 0XLKbxozgAfBZPNBwOPq3f3RPGKoo08owZ3SMJwbHusB7MDQYbgMBBLgCXeIzgectv0l 2m/MrWurpPhSvFsluQVjrbyXTPadOlkXN5WE1df2hzYgQKbfa54M/9nxB/BEc2q9/LSp fNeOj25nnv54dr4iqjAlroP13Oor8zRLr1S8CzUdi+iLy+P7CVhXe8dRHlTU1FWbuZtN luGwK3gjwgukY/FgzLfJ+gxXGsDH6UGsfTHIipae58yxrWa0A804cxLerG2i8vjcOUcz DdCA== 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=HALsy1SsRzqboEILgEkyfVYlqeD8DKr+cao6rYYBxRU=; b=pSVyxPUIvB/vvVM4pXqh/8udBSzWg1wzcEkHBF9nNgpeD1b6I/mPRnTzhWAnchakuN FNMWblVERaw1DhSAVmqu+IFgz7Wk93oKhz/ayh1Ss5IOAFsewfdQPwNFqrw5e2LsHPgN yo7nqUC25V/RqJ0mMR69VPr7ohWZwRlYYvMMbI7MAjsRJ7tW0iV0jKmDTHks02L1ai3L jf+slKuijARsQxXSm8Y4R5g4GYcNcNJ1GexAZdJdZ8gmm3NweHLFrwlcnjHzAedCVGBf 8F1VMeHApcNbbXBzELBoIp+b4MWnfWZmx10qSId94Ex6YZhbx2jXq8J1LM0TuqoWBOmA PwuA== X-Gm-Message-State: APjAAAXdT1enH1YULepWcjKYrP64MVuJk4ZReKHKj7wMlYIlS2BfvTxP Gl2vt2UT8OFaRY/OAa/cHbc= X-Google-Smtp-Source: APXvYqxqitMcpdWFtvTfohucnCIEIENz0SWcPrCNmg3Mnxk3wY6wS78EyN7uNQF0xqRuFc6F29+3VQ== X-Received: by 2002:ac8:538d:: with SMTP id x13mr32812154qtp.375.1576012861243; Tue, 10 Dec 2019 13:21:01 -0800 (PST) Received: from localhost (modemcable249.105-163-184.mc.videotron.ca. [184.163.105.249]) by smtp.gmail.com with ESMTPSA id l31sm2862qte.30.2019.12.10.13.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2019 13:21:00 -0800 (PST) From: Vivien Didelot To: "David S. Miller" Cc: Roopa Prabhu , Nikolay Aleksandrov , netdev@vger.kernel.org, bridge@lists.linux-foundation.org, Stephen Hemminger , Vivien Didelot Subject: [PATCH iproute2 v3] iplink: add support for STP xstats Date: Tue, 10 Dec 2019 16:20:50 -0500 Message-Id: <20191210212050.1470909-2-vivien.didelot@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191210212050.1470909-1-vivien.didelot@gmail.com> References: <20191210212050.1470909-1-vivien.didelot@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support for the BRIDGE_XSTATS_STP xstats, as follow: # ip link xstats type bridge_slave dev lan4 stp lan4 STP BPDU: RX: 0 TX: 61 STP TCN: RX: 0 TX: 0 STP Transitions: Blocked: 2 Forwarding: 1 Or below as JSON: # ip -j -p link xstats type bridge_slave dev lan0 stp [ { "ifname": "lan0", "stp": { "rx_bpdu": 0, "tx_bpdu": 500, "rx_tcn": 0, "tx_tcn": 0, "transition_blk": 0, "transition_fwd": 0 } } ] Signed-off-by: Vivien Didelot --- include/uapi/linux/if_bridge.h | 10 ++++++++++ ip/iplink_bridge.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h index 31fc51bd..42f76697 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -156,6 +156,15 @@ struct bridge_vlan_xstats { __u32 pad2; }; +struct bridge_stp_xstats { + __u64 transition_blk; + __u64 transition_fwd; + __u64 rx_bpdu; + __u64 tx_bpdu; + __u64 rx_tcn; + __u64 tx_tcn; +}; + /* Bridge multicast database attributes * [MDBA_MDB] = { * [MDBA_MDB_ENTRY] = { @@ -261,6 +270,7 @@ enum { BRIDGE_XSTATS_UNSPEC, BRIDGE_XSTATS_VLAN, BRIDGE_XSTATS_MCAST, + BRIDGE_XSTATS_STP, BRIDGE_XSTATS_PAD, __BRIDGE_XSTATS_MAX }; diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index 06f736d4..bbd6f3a8 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -688,6 +688,7 @@ static void bridge_print_xstats_help(struct link_util *lu, FILE *f) static void bridge_print_stats_attr(struct rtattr *attr, int ifindex) { struct rtattr *brtb[LINK_XSTATS_TYPE_MAX+1]; + struct bridge_stp_xstats *sstats; struct br_mcast_stats *mstats; struct rtattr *i, *list; const char *ifname = ""; @@ -807,6 +808,29 @@ static void bridge_print_stats_attr(struct rtattr *attr, int ifindex) mstats->mld_parse_errors); close_json_object(); break; + case BRIDGE_XSTATS_STP: + sstats = RTA_DATA(i); + open_json_object("stp"); + print_string(PRINT_FP, NULL, + "%-16s STP BPDU: ", ""); + print_u64(PRINT_ANY, "rx_bpdu", "RX: %llu ", + sstats->rx_bpdu); + print_u64(PRINT_ANY, "tx_bpdu", "TX: %llu\n", + sstats->tx_bpdu); + print_string(PRINT_FP, NULL, + "%-16s STP TCN: ", ""); + print_u64(PRINT_ANY, "rx_tcn", "RX: %llu ", + sstats->rx_tcn); + print_u64(PRINT_ANY, "tx_tcn", "TX: %llu\n", + sstats->tx_tcn); + print_string(PRINT_FP, NULL, + "%-16s STP Transitions: ", ""); + print_u64(PRINT_ANY, "transition_blk", "Blocked: %llu ", + sstats->transition_blk); + print_u64(PRINT_ANY, "transition_fwd", "Forwarding: %llu\n", + sstats->transition_fwd); + close_json_object(); + break; } } close_json_object(); @@ -843,6 +867,8 @@ int bridge_parse_xstats(struct link_util *lu, int argc, char **argv) while (argc > 0) { if (strcmp(*argv, "igmp") == 0 || strcmp(*argv, "mcast") == 0) { xstats_print_attr = BRIDGE_XSTATS_MCAST; + } else if (strcmp(*argv, "stp") == 0) { + xstats_print_attr = BRIDGE_XSTATS_STP; } else if (strcmp(*argv, "dev") == 0) { NEXT_ARG(); filter_index = ll_name_to_index(*argv);