[PATCH iproute2-next v2 1/2] iplink: print warning for missing VF data

[PATCH iproute2-next v2 1/2] iplink: print warning for missing VF data

[Edwin Peer]

[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]

The kernel might truncate VF info in IFLA_VFINFO_LIST. Compare the
expected number of VFs in IFLA_NUM_VF to how many were found in the
list and warn accordingly.

Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
---
 ip/ipaddress.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 571346b15cc3..0bbcee2b3bb2 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -922,6 +922,7 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
 	const char *name;
 	unsigned int m_flag = 0;
 	SPRINT_BUF(b1);
+	bool truncated_vfs = false;
 
 	if (n->nlmsg_type != RTM_NEWLINK && n->nlmsg_type != RTM_DELLINK)
 		return 0;
@@ -1199,15 +1200,18 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
 
 	if ((do_link || show_details) && tb[IFLA_VFINFO_LIST] && tb[IFLA_NUM_VF]) {
 		struct rtattr *i, *vflist = tb[IFLA_VFINFO_LIST];
-		int rem = RTA_PAYLOAD(vflist);
+		int rem = RTA_PAYLOAD(vflist), count = 0;
 
 		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, ifi, i);
 			close_json_object();
+			count++;
 		}
 		close_json_array(PRINT_JSON, NULL);
+		if (count != rta_getattr_u32(tb[IFLA_NUM_VF]))
+			truncated_vfs = true;
 	}
 
 	if (tb[IFLA_PROP_LIST]) {
@@ -1228,6 +1232,9 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
 
 	print_string(PRINT_FP, NULL, "%s", "\n");
 	fflush(fp);
+	/* prettier here if stderr and stdout go to the same place */
+	if (truncated_vfs)
+		fprintf(stderr, "Truncated VF list: %s\n", name);
 	return 1;
 }
 
-- 
2.30.0


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4160 bytes --]

[PATCH iproute2-next v2 2/2] iplink: filter stats using RTEXT_FILTER_SKIP_STATS

[Edwin Peer]

[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]

Don't request statistics we do not intend to render. This avoids the
possibility of a truncated IFLA_VFINFO_LIST when statistics are not
requested as well as the fetching of unnecessary data.

Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
---
 ip/ipaddress.c | 6 +++++-
 ip/iplink.c    | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 0bbcee2b3bb2..75511881050d 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -1882,9 +1882,13 @@ static int ipaddr_flush(void)
 
 static int iplink_filter_req(struct nlmsghdr *nlh, int reqlen)
 {
+	__u32 filt_mask;
 	int err;
 
-	err = addattr32(nlh, reqlen, IFLA_EXT_MASK, RTEXT_FILTER_VF);
+	filt_mask = RTEXT_FILTER_VF;
+	if (!show_stats)
+		filt_mask |= RTEXT_FILTER_SKIP_STATS;
+	err = addattr32(nlh, reqlen, IFLA_EXT_MASK, filt_mask);
 	if (err)
 		return err;
 
diff --git a/ip/iplink.c b/ip/iplink.c
index 27c9be442a7a..6a973213dc11 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -1116,6 +1116,9 @@ int iplink_get(char *name, __u32 filt_mask)
 			  !check_ifname(name) ? IFLA_IFNAME : IFLA_ALT_IFNAME,
 			  name, strlen(name) + 1);
 	}
+
+	if (!show_stats)
+		filt_mask |= RTEXT_FILTER_SKIP_STATS;
 	addattr32(&req.n, sizeof(req), IFLA_EXT_MASK, filt_mask);
 
 	if (rtnl_talk(&rth, &req.n, &answer) < 0)
-- 
2.30.0


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4160 bytes --]

Re: [PATCH iproute2-next v2 1/2] iplink: print warning for missing VF data

[David Ahern]

On 1/26/21 10:40 AM, Edwin Peer wrote:
> The kernel might truncate VF info in IFLA_VFINFO_LIST. Compare the
> expected number of VFs in IFLA_NUM_VF to how many were found in the
> list and warn accordingly.
> 
> Signed-off-by: Edwin Peer <edwin.peer@broadcom.com>
> ---
>  ip/ipaddress.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/ip/ipaddress.c b/ip/ipaddress.c
> index 571346b15cc3..0bbcee2b3bb2 100644
> --- a/ip/ipaddress.c
> +++ b/ip/ipaddress.c
> @@ -922,6 +922,7 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
>  	const char *name;
>  	unsigned int m_flag = 0;
>  	SPRINT_BUF(b1);
> +	bool truncated_vfs = false;
>  
>  	if (n->nlmsg_type != RTM_NEWLINK && n->nlmsg_type != RTM_DELLINK)
>  		return 0;
> @@ -1199,15 +1200,18 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
>  
>  	if ((do_link || show_details) && tb[IFLA_VFINFO_LIST] && tb[IFLA_NUM_VF]) {
>  		struct rtattr *i, *vflist = tb[IFLA_VFINFO_LIST];
> -		int rem = RTA_PAYLOAD(vflist);
> +		int rem = RTA_PAYLOAD(vflist), count = 0;
>  
>  		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, ifi, i);
>  			close_json_object();
> +			count++;
>  		}
>  		close_json_array(PRINT_JSON, NULL);
> +		if (count != rta_getattr_u32(tb[IFLA_NUM_VF]))
> +			truncated_vfs = true;
>  	}
>  
>  	if (tb[IFLA_PROP_LIST]) {
> @@ -1228,6 +1232,9 @@ int print_linkinfo(struct nlmsghdr *n, void *arg)
>  
>  	print_string(PRINT_FP, NULL, "%s", "\n");
>  	fflush(fp);
> +	/* prettier here if stderr and stdout go to the same place */
> +	if (truncated_vfs)
> +		fprintf(stderr, "Truncated VF list: %s\n", name);
>  	return 1;
>  }
>  
> 

LGTM. I think it should go to the main branch versus -next.