forked from luck/tmp_suning_uos_patched
d250a5f90e
Jarek Poplawski a écrit : > > > Hmm... So you made me to do some "real" work here, and guess what?: > there is one serious checkpatch warning! ;-) Plus, this new parameter > should be added to the function description. Otherwise: > Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> > > Thanks, > Jarek P. > > PS: I guess full "Don't" would show we really mean it... Okay :) Here is the last round, before the night ! Thanks again [RFC] pkt_sched: gen_estimator: Don't report fake rate estimators We currently send TCA_STATS_RATE_EST elements to netlink users, even if no estimator is running. # tc -s -d qdisc qdisc pfifo_fast 0: dev eth0 root bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1 Sent 112833764978 bytes 1495081739 pkt (dropped 0, overlimits 0 requeues 0) rate 0bit 0pps backlog 0b 0p requeues 0 User has no way to tell if the "rate 0bit 0pps" is a real estimation, or a fake one (because no estimator is active) After this patch, tc command output is : $ tc -s -d qdisc qdisc pfifo_fast 0: dev eth0 root bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1 Sent 561075 bytes 1196 pkt (dropped 0, overlimits 0 requeues 0) backlog 0b 0p requeues 0 We add a parameter to gnet_stats_copy_rate_est() function so that it can use gen_estimator_active(bstats, r), as suggested by Jarek. This parameter can be NULL if check is not necessary, (htb for example has a mandatory rate estimator) Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
52 lines
1.7 KiB
C
52 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,
|
|
const struct gnet_stats_basic_packed *b,
|
|
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
|