Skip to contentSkip to conversation

BUG: 32 bit net stats

PATCH Jamal Hadi Salim 2 participants 4 messages Sep 23, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Something broke in sending of 32 bit version of netstat around the time 64 bit version was improved. I went back as far as 3.8.0 to recent kernels. Could have been earlier.
The work around in user space is when you see 64 bit stats just ignore the 32 bit version (which iproute2 does and so am i;->).

But assumming there are tools out there that know only of 32 bit variant they will get bad stats. Here's a compile tested only patch. Wont have to test anything for at least another day.

cheers,
jamal

net/core/rtnetlink.c +7 -3
index 2a0e21d..005be70 100644
@@ -659,7 +659,7 @@ static unsigned int rtnl_dev_combine_flags(const struct net_device *dev,
 }
 
 static void copy_rtnl_link_stats(struct rtnl_link_stats *a,
-				 const struct rtnl_link_stats64 *b)
+				 const struct net_device_stats *b)
 {
 	a->rx_packets = b->rx_packets;
 	a->tx_packets = b->tx_packets;
@@ -876,6 +876,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
 	struct nlattr *attr, *af_spec;
 	struct rtnl_af_ops *af_ops;
 	struct net_device *upper_dev = netdev_master_upper_dev_get(dev);
+	const struct net_device_stats *stats32 = &dev->stats;
+	const struct net_device_ops *ops = dev->netdev_ops;
 
 	ASSERT_RTNL();
 	nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ifm), flags);
@@ -940,9 +942,11 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
 	if (attr == NULL)
 		goto nla_put_failure;
 
-	stats = dev_get_stats(dev, &temp);
-	copy_rtnl_link_stats(nla_data(attr), stats);
+	if (ops->ndo_get_stats)
+		stats32 = ops->ndo_get_stats(dev);
+	copy_rtnl_link_stats(nla_data(attr), stats32);
 
+	stats = dev_get_stats(dev, &temp);
 	attr = nla_reserve(skb, IFLA_STATS64,
 			sizeof(struct rtnl_link_stats64));
 	if (attr == NULL)
#1 lore raw
Quoted 6 lines · Jamal Hadi Salim

Something broke in sending of 32 bit version of netstat around the time 64 bit version was improved. I went back as far as 3.8.0 to recent kernels. Could have been earlier.
The work around in user space is when you see 64 bit stats just ignore the 32 bit version (which iproute2 does and so am i;->).

Quoted 7 lines

But assumming there are tools out there that know only of 32 bit variant they will get bad stats. Here's a compile tested only patch. Wont have to test anything for at least another day.

cheers,
jamal

Hi Jamal

Sorry, this doesnt make sense to me.

Existing code seems to be fine.

Which driver do you use ?

#2 lore raw
Quoted 6 lines · Eric Dumazet

Sorry, this doesnt make sense to me.

Existing code seems to be fine.

Which driver do you use ?

Sorry - let me take a closer look and get back
to you. I think the bug maybe in user space.

cheers,
jamal

#3 lore raw
Quoted 2 lines · Jamal Hadi Salim

Sorry - let me take a closer look and get back
to you. I think the bug maybe in user space.

Sigh - long standing bug on my (user space) side
got aggrevated by last changes.
Ignore the noise. Kernel works fine.

cheers,
jamal