| Message ID | 20190622180035.40245-1-dkirjanov@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [iproute2-next,v3,1/2] ipaddress: correctly print a VF hw address in the IPoIB case | expand |
On 6/22/19 12:00 PM, Denis Kirjanov wrote: > @@ -365,13 +367,45 @@ static void print_vfinfo(FILE *fp, struct rtattr *vfinfo) > parse_rtattr_nested(vf, IFLA_VF_MAX, vfinfo); > > vf_mac = RTA_DATA(vf[IFLA_VF_MAC]); > + vf_broadcast = RTA_DATA(vf[IFLA_VF_BROADCAST]); > vf_tx_rate = RTA_DATA(vf[IFLA_VF_TX_RATE]); > > print_string(PRINT_FP, NULL, "%s ", _SL_); > print_int(PRINT_ANY, "vf", "vf %d ", vf_mac->vf); > - print_string(PRINT_ANY, "mac", "MAC %s", > - ll_addr_n2a((unsigned char *) &vf_mac->mac, > - ETH_ALEN, 0, b1, sizeof(b1))); > + > + print_string(PRINT_ANY, > + "link_type", > + " link/%s ", > + ll_type_n2a(ifi->ifi_type, b1, sizeof(b1))); > + > + print_color_string(PRINT_ANY, > + COLOR_MAC, > + "address", > + "%s", > + ll_addr_n2a((unsigned char *) &vf_mac->mac, > + ifi->ifi_type == ARPHRD_ETHER ? > + ETH_ALEN : INFINIBAND_ALEN, > + ifi->ifi_type, > + b1, sizeof(b1))); you still have a lot of lines that are not lined up column wise. See how the COLOR_MAC is offset to the right from PRINT_ANY? > + > + if (vf[IFLA_VF_BROADCAST]) { > + if (ifi->ifi_flags&IFF_POINTOPOINT) { > + print_string(PRINT_FP, NULL, " peer ", NULL); > + print_bool(PRINT_JSON, > + "link_pointtopoint", NULL, true); > + } else > + print_string(PRINT_FP, NULL, " brd ", NULL); > + > + print_color_string(PRINT_ANY, > + COLOR_MAC, > + "broadcast", > + "%s", > + ll_addr_n2a((unsigned char *) &vf_broadcast->broadcast, > + ifi->ifi_type == ARPHRD_ETHER ? > + ETH_ALEN : INFINIBAND_ALEN, > + ifi->ifi_type, > + b1, sizeof(b1))); And then these lines are offset to the left.
On 6/24/19, David Ahern <dsahern@gmail.com> wrote: > On 6/22/19 12:00 PM, Denis Kirjanov wrote: >> @@ -365,13 +367,45 @@ static void print_vfinfo(FILE *fp, struct rtattr >> *vfinfo) >> parse_rtattr_nested(vf, IFLA_VF_MAX, vfinfo); >> >> vf_mac = RTA_DATA(vf[IFLA_VF_MAC]); >> + vf_broadcast = RTA_DATA(vf[IFLA_VF_BROADCAST]); >> vf_tx_rate = RTA_DATA(vf[IFLA_VF_TX_RATE]); >> >> print_string(PRINT_FP, NULL, "%s ", _SL_); >> print_int(PRINT_ANY, "vf", "vf %d ", vf_mac->vf); >> - print_string(PRINT_ANY, "mac", "MAC %s", >> - ll_addr_n2a((unsigned char *) &vf_mac->mac, >> - ETH_ALEN, 0, b1, sizeof(b1))); >> + >> + print_string(PRINT_ANY, >> + "link_type", >> + " link/%s ", >> + ll_type_n2a(ifi->ifi_type, b1, sizeof(b1))); >> + >> + print_color_string(PRINT_ANY, >> + COLOR_MAC, >> + "address", >> + "%s", >> + ll_addr_n2a((unsigned char *) &vf_mac->mac, >> + ifi->ifi_type == ARPHRD_ETHER ? >> + ETH_ALEN : INFINIBAND_ALEN, >> + ifi->ifi_type, >> + b1, sizeof(b1))); > > you still have a lot of lines that are not lined up column wise. See how > the COLOR_MAC is offset to the right from PRINT_ANY? > >> + >> + if (vf[IFLA_VF_BROADCAST]) { >> + if (ifi->ifi_flags&IFF_POINTOPOINT) { >> + print_string(PRINT_FP, NULL, " peer ", NULL); >> + print_bool(PRINT_JSON, >> + "link_pointtopoint", NULL, true); >> + } else >> + print_string(PRINT_FP, NULL, " brd ", NULL); >> + >> + print_color_string(PRINT_ANY, >> + COLOR_MAC, >> + "broadcast", >> + "%s", >> + ll_addr_n2a((unsigned char *) &vf_broadcast->broadcast, >> + ifi->ifi_type == ARPHRD_ETHER ? >> + ETH_ALEN : INFINIBAND_ALEN, >> + ifi->ifi_type, >> + b1, sizeof(b1))); > > And then these lines are offset to the left. Hi David, I've just sent a new version and I've formatted strings in the similar way as it used through the source. Thank you. >
diff --git a/ip/ipaddress.c b/ip/ipaddress.c index b504200b..52078675 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -26,6 +26,7 @@ #include <linux/netdevice.h> #include <linux/if_arp.h> +#include <linux/if_infiniband.h> #include <linux/sockios.h> #include <linux/net_namespace.h> @@ -349,9 +350,10 @@ static void print_af_spec(FILE *fp, struct rtattr *af_spec_attr) static void print_vf_stats64(FILE *fp, struct rtattr *vfstats); -static void print_vfinfo(FILE *fp, struct rtattr *vfinfo) +static void print_vfinfo(struct ifinfomsg *ifi, FILE *fp, struct rtattr *vfinfo) { struct ifla_vf_mac *vf_mac; + struct ifla_vf_broadcast *vf_broadcast; struct ifla_vf_tx_rate *vf_tx_rate; struct rtattr *vf[IFLA_VF_MAX + 1] = {}; @@ -365,13 +367,45 @@ static void print_vfinfo(FILE *fp, struct rtattr *vfinfo) parse_rtattr_nested(vf, IFLA_VF_MAX, vfinfo); vf_mac = RTA_DATA(vf[IFLA_VF_MAC]); + vf_broadcast = RTA_DATA(vf[IFLA_VF_BROADCAST]); vf_tx_rate = RTA_DATA(vf[IFLA_VF_TX_RATE]); print_string(PRINT_FP, NULL, "%s ", _SL_); print_int(PRINT_ANY, "vf", "vf %d ", vf_mac->vf); - print_string(PRINT_ANY, "mac", "MAC %s", - ll_addr_n2a((unsigned char *) &vf_mac->mac, - ETH_ALEN, 0, b1, sizeof(b1))); + + print_string(PRINT_ANY, + "link_type", + " link/%s ", + ll_type_n2a(ifi->ifi_type, b1, sizeof(b1))); + + print_color_string(PRINT_ANY, + COLOR_MAC, + "address", + "%s", + ll_addr_n2a((unsigned char *) &vf_mac->mac, + ifi->ifi_type == ARPHRD_ETHER ? + ETH_ALEN : INFINIBAND_ALEN, + ifi->ifi_type, + b1, sizeof(b1))); + + if (vf[IFLA_VF_BROADCAST]) { + if (ifi->ifi_flags&IFF_POINTOPOINT) { + print_string(PRINT_FP, NULL, " peer ", NULL); + print_bool(PRINT_JSON, + "link_pointtopoint", NULL, true); + } else + print_string(PRINT_FP, NULL, " brd ", NULL); + + print_color_string(PRINT_ANY, + COLOR_MAC, + "broadcast", + "%s", + ll_addr_n2a((unsigned char *) &vf_broadcast->broadcast, + ifi->ifi_type == ARPHRD_ETHER ? + ETH_ALEN : INFINIBAND_ALEN, + ifi->ifi_type, + b1, sizeof(b1))); + } if (vf[IFLA_VF_VLAN_LIST]) { struct rtattr *i, *vfvlanlist = vf[IFLA_VF_VLAN_LIST]; @@ -1102,7 +1136,7 @@ int print_linkinfo(struct nlmsghdr *n, void *arg) open_json_array(PRINT_JSON, "vfinfo_list"); for (i = RTA_DATA(vflist); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) { open_json_object(NULL); - print_vfinfo(fp, i); + print_vfinfo(ifi, fp, i); close_json_object(); } close_json_array(PRINT_JSON, NULL);
Current code assumes that we print ethernet mac and that doesn't work in the IPoIB case with SRIOV-enabled hardware Before: 11: ib1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 2044 qdisc pfifo_fast state UP mode DEFAULT group default qlen 256 link/infiniband 80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff vf 0 MAC 14:80:00:00:66:fe, spoof checking off, link-state disable, trust off, query_rss off ... After: 11: ib1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 2044 qdisc pfifo_fast state UP mode DEFAULT group default qlen 256 link/infiniband 80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff vf 0 link/infiniband 80:00:00:66:fe:80:00:00:00:00:00:00:24:8a:07:03:00:a4:3e:7c brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff, spoof checking off, link-state disable, trust off, query_rss off v1->v2: updated kernel headers to uapi commit v2->v3: fixed alignment Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org> --- ip/ipaddress.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-)