Skip to content

Commit

Permalink
rtnetlink: rtnl_fill_stats: avoid an unnecssary stats copy
Browse files Browse the repository at this point in the history
This patch passes netlink attr data ptr directly to dev_get_stats
thus elimiating a stats copy.

Suggested-by: David Miller <davem@davemloft.net>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Roopa Prabhu authored and David S. Miller committed Apr 18, 2016
1 parent ccd37cf commit 550bce5
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions net/core/rtnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -808,11 +808,6 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a,
a->rx_nohandler = b->rx_nohandler;
}

static void copy_rtnl_link_stats64(void *v, const struct rtnl_link_stats64 *b)
{
memcpy(v, b, sizeof(*b));
}

/* All VF info */
static inline int rtnl_vfinfo_size(const struct net_device *dev,
u32 ext_filter_mask)
Expand Down Expand Up @@ -1054,25 +1049,23 @@ static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)
static noinline_for_stack int rtnl_fill_stats(struct sk_buff *skb,
struct net_device *dev)
{
const struct rtnl_link_stats64 *stats;
struct rtnl_link_stats64 temp;
struct rtnl_link_stats64 *sp;
struct nlattr *attr;

stats = dev_get_stats(dev, &temp);

attr = nla_reserve(skb, IFLA_STATS,
sizeof(struct rtnl_link_stats));
attr = nla_reserve(skb, IFLA_STATS64,
sizeof(struct rtnl_link_stats64));
if (!attr)
return -EMSGSIZE;

copy_rtnl_link_stats(nla_data(attr), stats);
sp = nla_data(attr);
dev_get_stats(dev, sp);

attr = nla_reserve(skb, IFLA_STATS64,
sizeof(struct rtnl_link_stats64));
attr = nla_reserve(skb, IFLA_STATS,
sizeof(struct rtnl_link_stats));
if (!attr)
return -EMSGSIZE;

copy_rtnl_link_stats64(nla_data(attr), stats);
copy_rtnl_link_stats(nla_data(attr), sp);

return 0;
}
Expand Down

0 comments on commit 550bce5

Please sign in to comment.