diff mbox series

[iproute2-next,09/10] ipstats: Expose bond stats in ipstats

Message ID 5c0de4f4844bd23a3c7035826ec93d6bf71ae666.1652104101.git.petrm@nvidia.com (mailing list archive)
State Accepted
Commit d9976d671c37373c91bc56a92706dfe446d131b3
Delegated to: David Ahern
Headers show
Series ip stats: Support for xstats and afstats | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Petr Machata May 9, 2022, 2 p.m. UTC 
Describe xstats and xstats_slave subgroups for bond netdevices.

For example:

 # ip stats show dev swp1 group xstats_slave subgroup bond
 56: swp1: group xstats_slave subgroup bond suite 802.3ad
                     LACPDU Rx 0
                     LACPDU Tx 0
                     LACPDU Unknown type Rx 0
                     LACPDU Illegal Rx 0
                     Marker Rx 0
                     Marker Tx 0
                     Marker response Rx 0
                     Marker response Tx 0
                     Marker unknown type Rx 0

 # ip -j stats show dev swp1 group xstats_slave subgroup bond | jq
 [
   {
     "ifindex": 56,
     "ifname": "swp1",
     "group": "xstats_slave",
     "subgroup": "bond",
     "suite": "802.3ad",
     "802.3ad": {
       "lacpdu_rx": 0,
       "lacpdu_tx": 0,
       "lacpdu_unknown_rx": 0,
       "lacpdu_illegal_rx": 0,
       "marker_rx": 0,
       "marker_tx": 0,
       "marker_response_rx": 0,
       "marker_response_tx": 0,
       "marker_unknown_rx": 0
     }
   }
 ]

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
---
 ip/ip_common.h   |  3 +++
 ip/iplink_bond.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++--
 ip/ipstats.c     |  2 ++
 3 files changed, 58 insertions(+), 2 deletions(-)

Comments

Stephen Hemminger May 27, 2022, 12:13 a.m. UTC | #1 
On Mon, 9 May 2022 16:00:02 +0200
Petr Machata <petrm@nvidia.com> wrote:

> Describe xstats and xstats_slave subgroups for bond netdevices.
> 
> For example:
> 
>  # ip stats show dev swp1 group xstats_slave subgroup bond
>  56: swp1: group xstats_slave subgroup bond suite 802.3ad
>                      LACPDU Rx 0
>                      LACPDU Tx 0
>                      LACPDU Unknown type Rx 0
>                      LACPDU Illegal Rx 0
>                      Marker Rx 0
>                      Marker Tx 0
>                      Marker response Rx 0
>                      Marker response Tx 0
>                      Marker unknown type Rx 0
> 
>  # ip -j stats show dev swp1 group xstats_slave subgroup bond | jq
>  [
>    {
>      "ifindex": 56,
>      "ifname": "swp1",
>      "group": "xstats_slave",
>      "subgroup": "bond",
>      "suite": "802.3ad",
>      "802.3ad": {
>        "lacpdu_rx": 0,
>        "lacpdu_tx": 0,
>        "lacpdu_unknown_rx": 0,
>        "lacpdu_illegal_rx": 0,
>        "marker_rx": 0,
>        "marker_tx": 0,
>        "marker_response_rx": 0,
>        "marker_response_tx": 0,
>        "marker_unknown_rx": 0
>      }
>    }
>  ]
> 
> Signed-off-by: Petr Machata <petrm@nvidia.com>
> Reviewed-by: Ido Schimmel <idosch@nvidia.com>
> ---
>  ip/ip_common.h   |  3 +++
>  ip/iplink_bond.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++--
>  ip/ipstats.c     |  2 ++
>  3 files changed, 58 insertions(+), 2 deletions(-)

This change won't build if clang is used to build iproute2.
It has valid warning:

    CC       iplink_bond.o
iplink_bond.c:935:10: error: initializer element is not a compile-time constant
        .desc = ipstats_stat_desc_bond_tmpl_lacp,
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
iplink_bond.c:957:10: error: initializer element is not a compile-time constant
        .desc = ipstats_stat_desc_bond_tmpl_lacp,
                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.

Since desc is a structure, you can't just assign an existing data structure
to the new initializer.  It needs to be a pointer or macro.
Petr Machata May 27, 2022, 2:50 p.m. UTC | #2 
Stephen Hemminger <stephen@networkplumber.org> writes:

> This change won't build if clang is used to build iproute2.
> It has valid warning:
>
>     CC       iplink_bond.o
> iplink_bond.c:935:10: error: initializer element is not a compile-time constant
>         .desc = ipstats_stat_desc_bond_tmpl_lacp,
>                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> iplink_bond.c:957:10: error: initializer element is not a compile-time constant
>         .desc = ipstats_stat_desc_bond_tmpl_lacp,
>                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 2 errors generated.
>
> Since desc is a structure, you can't just assign an existing data structure
> to the new initializer.  It needs to be a pointer or macro.

Yeah, it has to be a macro. I'll send a patch probably next week.
diff mbox series

Patch

diff --git a/ip/ip_common.h b/ip/ip_common.h
index c58f2090..ffa633e0 100644
--- a/ip/ip_common.h
+++ b/ip/ip_common.h
@@ -145,8 +145,11 @@  int bridge_print_xstats(struct nlmsghdr *n, void *arg);
 extern const struct ipstats_stat_desc ipstats_stat_desc_xstats_bridge_group;
 extern const struct ipstats_stat_desc ipstats_stat_desc_xstats_slave_bridge_group;
 
+/* iplink_bond.c */
 int bond_parse_xstats(struct link_util *lu, int argc, char **argv);
 int bond_print_xstats(struct nlmsghdr *n, void *arg);
+extern const struct ipstats_stat_desc ipstats_stat_desc_xstats_bond_group;
+extern const struct ipstats_stat_desc ipstats_stat_desc_xstats_slave_bond_group;
 
 /* iproute_lwtunnel.c */
 int lwt_parse_encap(struct rtattr *rta, size_t len, int *argcp, char ***argvp,
diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c
index 650411fc..15db19a3 100644
--- a/ip/iplink_bond.c
+++ b/ip/iplink_bond.c
@@ -15,6 +15,7 @@ 
 #include <string.h>
 #include <linux/if_bonding.h>
 
+#include "list.h"
 #include "rt_names.h"
 #include "utils.h"
 #include "ip_common.h"
@@ -761,7 +762,7 @@  static void bond_print_xstats_help(struct link_util *lu, FILE *f)
 	fprintf(f, "Usage: ... %s [ 802.3ad ] [ dev DEVICE ]\n", lu->id);
 }
 
-static void bond_print_3ad_stats(struct rtattr *lacpattr)
+static void bond_print_3ad_stats(const struct rtattr *lacpattr)
 {
 	struct rtattr *lacptb[BOND_3AD_STAT_MAX+1];
 	__u64 val;
@@ -912,7 +913,6 @@  int bond_parse_xstats(struct link_util *lu, int argc, char **argv)
 	return 0;
 }
 
-
 struct link_util bond_link_util = {
 	.id		= "bond",
 	.maxattr	= IFLA_BOND_MAX,
@@ -922,3 +922,54 @@  struct link_util bond_link_util = {
 	.parse_ifla_xstats = bond_parse_xstats,
 	.print_ifla_xstats = bond_print_xstats,
 };
+
+static const struct ipstats_stat_desc ipstats_stat_desc_bond_tmpl_lacp = {
+	.name = "802.3ad",
+	.kind = IPSTATS_STAT_DESC_KIND_LEAF,
+	.show = &ipstats_stat_desc_show_xstats,
+	.pack = &ipstats_stat_desc_pack_xstats,
+};
+
+static const struct ipstats_stat_desc_xstats
+ipstats_stat_desc_xstats_bond_lacp = {
+	.desc = ipstats_stat_desc_bond_tmpl_lacp,
+	.xstats_at = IFLA_STATS_LINK_XSTATS,
+	.link_type_at = LINK_XSTATS_TYPE_BOND,
+	.inner_max = BOND_XSTATS_MAX,
+	.inner_at = BOND_XSTATS_3AD,
+	.show_cb = &bond_print_3ad_stats,
+};
+
+static const struct ipstats_stat_desc *
+ipstats_stat_desc_xstats_bond_subs[] = {
+	&ipstats_stat_desc_xstats_bond_lacp.desc,
+};
+
+const struct ipstats_stat_desc ipstats_stat_desc_xstats_bond_group = {
+	.name = "bond",
+	.kind = IPSTATS_STAT_DESC_KIND_GROUP,
+	.subs = ipstats_stat_desc_xstats_bond_subs,
+	.nsubs = ARRAY_SIZE(ipstats_stat_desc_xstats_bond_subs),
+};
+
+static const struct ipstats_stat_desc_xstats
+ipstats_stat_desc_xstats_slave_bond_lacp = {
+	.desc = ipstats_stat_desc_bond_tmpl_lacp,
+	.xstats_at = IFLA_STATS_LINK_XSTATS_SLAVE,
+	.link_type_at = LINK_XSTATS_TYPE_BOND,
+	.inner_max = BOND_XSTATS_MAX,
+	.inner_at = BOND_XSTATS_3AD,
+	.show_cb = &bond_print_3ad_stats,
+};
+
+static const struct ipstats_stat_desc *
+ipstats_stat_desc_xstats_slave_bond_subs[] = {
+	&ipstats_stat_desc_xstats_slave_bond_lacp.desc,
+};
+
+const struct ipstats_stat_desc ipstats_stat_desc_xstats_slave_bond_group = {
+	.name = "bond",
+	.kind = IPSTATS_STAT_DESC_KIND_GROUP,
+	.subs = ipstats_stat_desc_xstats_slave_bond_subs,
+	.nsubs = ARRAY_SIZE(ipstats_stat_desc_xstats_slave_bond_subs),
+};
diff --git a/ip/ipstats.c b/ip/ipstats.c
index 1051976d..5cdd15ae 100644
--- a/ip/ipstats.c
+++ b/ip/ipstats.c
@@ -606,6 +606,7 @@  int ipstats_stat_desc_show_xstats(struct ipstats_stat_show_attrs *attrs,
 
 static const struct ipstats_stat_desc *ipstats_stat_desc_xstats_subs[] = {
 	&ipstats_stat_desc_xstats_bridge_group,
+	&ipstats_stat_desc_xstats_bond_group,
 };
 
 static const struct ipstats_stat_desc ipstats_stat_desc_xstats_group = {
@@ -617,6 +618,7 @@  static const struct ipstats_stat_desc ipstats_stat_desc_xstats_group = {
 
 static const struct ipstats_stat_desc *ipstats_stat_desc_xstats_slave_subs[] = {
 	&ipstats_stat_desc_xstats_slave_bridge_group,
+	&ipstats_stat_desc_xstats_slave_bond_group,
 };
 
 static const struct ipstats_stat_desc ipstats_stat_desc_xstats_slave_group = {