[patch net-next v4 2/4] rtnetlink: add HW/SW stats distinction in rtnl_fill_stats
From: Jiri Pirko <jiri@resnulli.us>
Date: 2016-06-16 08:37:27
Subsystem:
networking drivers, networking [general], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Nogah Frankel <redacted> Since hardware stats are now returned by default, add a way to query only software stats. They are saved in IFLA_SW_STATS64. (This option is valid only if the driver returns HW stats in the default ndo stats) Signed-off-by: Nogah Frankel <redacted> Reviewed-by: Ido Schimmel <redacted> Signed-off-by: Jiri Pirko <redacted> --- include/uapi/linux/if_link.h | 1 + net/core/rtnetlink.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index bb36bd5..98175e7 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h@@ -156,6 +156,7 @@ enum { IFLA_GSO_MAX_SEGS, IFLA_GSO_MAX_SIZE, IFLA_PAD, + IFLA_SW_STATS64, __IFLA_MAX };
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index eb49ca2..7958cde 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c@@ -901,6 +901,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, + nla_total_size_64bit(sizeof(struct rtnl_link_ifmap)) + nla_total_size(sizeof(struct rtnl_link_stats)) + nla_total_size_64bit(sizeof(struct rtnl_link_stats64)) + + nla_total_size_64bit(sizeof(struct rtnl_link_stats64)) /* IFLA_SW_STATS64 */ + nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */ + nla_total_size(MAX_ADDR_LEN) /* IFLA_BROADCAST */ + nla_total_size(4) /* IFLA_TXQLEN */
@@ -928,7 +929,6 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, + nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_SWITCH_ID */ + nla_total_size(IFNAMSIZ) /* IFLA_PHYS_PORT_NAME */ + nla_total_size(1); /* IFLA_PROTO_DOWN */ - } static int rtnl_vf_ports_fill(struct sk_buff *skb, struct net_device *dev)
@@ -1082,6 +1082,17 @@ static noinline_for_stack int rtnl_fill_stats(struct sk_buff *skb, sp = nla_data(attr); dev_get_stats(dev, sp); + if (dev_have_sw_stats(dev)) { + attr = nla_reserve_64bit(skb, IFLA_SW_STATS64, + sizeof(struct rtnl_link_stats64), + IFLA_PAD); + if (!attr) + return -EMSGSIZE; + + sp = nla_data(attr); + dev_get_sw_stats(dev, sp); + } + attr = nla_reserve(skb, IFLA_STATS, sizeof(struct rtnl_link_stats)); if (!attr)
--
2.5.5