c1a8f1f1c8
In 5e140dfc1f "net: reorder struct Qdisc
for better SMP performance" the definition of struct gnet_stats_basic
changed incompatibly, as copies of this struct are shipped to
userland via netlink.
Restoring old behavior is not welcome, for performance reason.
Fix is to use a private structure for kernel, and
teach gnet_stats_copy_basic() to convert from kernel to user land,
using legacy structure (struct gnet_stats_basic)
Based on a report and initial patch from Michael Spang.
Reported-by: Michael Spang <mspang@csclub.uwaterloo.ca>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
50 lines
1.7 KiB
C
50 lines
1.7 KiB
C
#ifndef __NET_GEN_STATS_H
|
|
#define __NET_GEN_STATS_H
|
|
|
|
#include <linux/gen_stats.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/pkt_sched.h>
|
|
|
|
struct gnet_dump
|
|
{
|
|
spinlock_t * lock;
|
|
struct sk_buff * skb;
|
|
struct nlattr * tail;
|
|
|
|
/* Backward compatability */
|
|
int compat_tc_stats;
|
|
int compat_xstats;
|
|
void * xstats;
|
|
int xstats_len;
|
|
struct tc_stats tc_stats;
|
|
};
|
|
|
|
extern int gnet_stats_start_copy(struct sk_buff *skb, int type,
|
|
spinlock_t *lock, struct gnet_dump *d);
|
|
|
|
extern int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
|
|
int tc_stats_type,int xstats_type,
|
|
spinlock_t *lock, struct gnet_dump *d);
|
|
|
|
extern int gnet_stats_copy_basic(struct gnet_dump *d,
|
|
struct gnet_stats_basic_packed *b);
|
|
extern int gnet_stats_copy_rate_est(struct gnet_dump *d,
|
|
struct gnet_stats_rate_est *r);
|
|
extern int gnet_stats_copy_queue(struct gnet_dump *d,
|
|
struct gnet_stats_queue *q);
|
|
extern int gnet_stats_copy_app(struct gnet_dump *d, void *st, int len);
|
|
|
|
extern int gnet_stats_finish_copy(struct gnet_dump *d);
|
|
|
|
extern int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
|
|
struct gnet_stats_rate_est *rate_est,
|
|
spinlock_t *stats_lock, struct nlattr *opt);
|
|
extern void gen_kill_estimator(struct gnet_stats_basic_packed *bstats,
|
|
struct gnet_stats_rate_est *rate_est);
|
|
extern int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
|
|
struct gnet_stats_rate_est *rate_est,
|
|
spinlock_t *stats_lock, struct nlattr *opt);
|
|
extern bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats,
|
|
const struct gnet_stats_rate_est *rate_est);
|
|
#endif
|