[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4A87FCAC.5070705@gmail.com>
Date: Sun, 16 Aug 2009 14:33:48 +0200
From: Eric Dumazet <eric.dumazet@...il.com>
To: Michael Spang <mspang@...lub.uwaterloo.ca>
CC: "David S. Miller" <davem@...emloft.net>,
LKML <linux-kernel@...r.kernel.org>,
Linux Netdev List <netdev@...r.kernel.org>
Subject: Re: [PATCH] Revert netlink ABI change to gnet_stats_basic
Michael Spang a écrit :
> In 5e140dfc1fe87eae27846f193086724806b33c7d "net: reorder struct Qdisc
> for better SMP performance" the definition of struct gnet_stats_basic
> changed incompatibly, and as copies of this struct may be shipped to
> userland via netlink. This reverts back to the old ABI.
So userland expects to get exactly 16 bytes instead of 12 ?
iproute2 has no problem :
void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtattr **xstats)
{
SPRINT_BUF(b1);
struct rtattr *tbs[TCA_STATS_MAX + 1];
parse_rtattr_nested(tbs, TCA_STATS_MAX, rta);
if (tbs[TCA_STATS_BASIC]) {
struct gnet_stats_basic bs = {0};
memcpy(&bs, RTA_DATA(tbs[TCA_STATS_BASIC]), MIN(RTA_PAYLOAD(tbs[TCA_STATS_BASIC]), sizeof(bs)));
fprintf(fp, "%sSent %llu bytes %u pkt",
prefix, (unsigned long long) bs.bytes, bs.packets);
}
What exactly broke after patch was pushed ?
It would be better to fix gnet_stats_copy_basic() if necessary...
>
> Signed-off-by: Michael Spang <mspang@...lub.uwaterloo.ca>
> ---
> include/linux/gen_stats.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h
> index 0ffa41d..13f4e74 100644
> --- a/include/linux/gen_stats.h
> +++ b/include/linux/gen_stats.h
> @@ -22,7 +22,7 @@ struct gnet_stats_basic
> {
> __u64 bytes;
> __u32 packets;
> -} __attribute__ ((packed));
> +};
>
> /**
> * struct gnet_stats_rate_est - rate estimator
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists