mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 22:51:35 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
320 lines
8.4 KiB
C
320 lines
8.4 KiB
C
/*
|
|
* net/sched/gen_estimator.c Simple rate estimator.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
|
|
*
|
|
* Changes:
|
|
* Jamal Hadi Salim - moved it to net/core and reshulfed
|
|
* names to make it usable in general net subsystem.
|
|
*/
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <asm/system.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/module.h>
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/string.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/sockios.h>
|
|
#include <linux/in.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/netdevice.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/init.h>
|
|
#include <linux/rbtree.h>
|
|
#include <linux/slab.h>
|
|
#include <net/sock.h>
|
|
#include <net/gen_stats.h>
|
|
|
|
/*
|
|
This code is NOT intended to be used for statistics collection,
|
|
its purpose is to provide a base for statistical multiplexing
|
|
for controlled load service.
|
|
If you need only statistics, run a user level daemon which
|
|
periodically reads byte counters.
|
|
|
|
Unfortunately, rate estimation is not a very easy task.
|
|
F.e. I did not find a simple way to estimate the current peak rate
|
|
and even failed to formulate the problem 8)8)
|
|
|
|
So I preferred not to built an estimator into the scheduler,
|
|
but run this task separately.
|
|
Ideally, it should be kernel thread(s), but for now it runs
|
|
from timers, which puts apparent top bounds on the number of rated
|
|
flows, has minimal overhead on small, but is enough
|
|
to handle controlled load service, sets of aggregates.
|
|
|
|
We measure rate over A=(1<<interval) seconds and evaluate EWMA:
|
|
|
|
avrate = avrate*(1-W) + rate*W
|
|
|
|
where W is chosen as negative power of 2: W = 2^(-ewma_log)
|
|
|
|
The resulting time constant is:
|
|
|
|
T = A/(-ln(1-W))
|
|
|
|
|
|
NOTES.
|
|
|
|
* avbps is scaled by 2^5, avpps is scaled by 2^10.
|
|
* both values are reported as 32 bit unsigned values. bps can
|
|
overflow for fast links : max speed being 34360Mbit/sec
|
|
* Minimal interval is HZ/4=250msec (it is the greatest common divisor
|
|
for HZ=100 and HZ=1024 8)), maximal interval
|
|
is (HZ*2^EST_MAX_INTERVAL)/4 = 8sec. Shorter intervals
|
|
are too expensive, longer ones can be implemented
|
|
at user level painlessly.
|
|
*/
|
|
|
|
#define EST_MAX_INTERVAL 5
|
|
|
|
struct gen_estimator
|
|
{
|
|
struct list_head list;
|
|
struct gnet_stats_basic_packed *bstats;
|
|
struct gnet_stats_rate_est *rate_est;
|
|
spinlock_t *stats_lock;
|
|
int ewma_log;
|
|
u64 last_bytes;
|
|
u64 avbps;
|
|
u32 last_packets;
|
|
u32 avpps;
|
|
struct rcu_head e_rcu;
|
|
struct rb_node node;
|
|
};
|
|
|
|
struct gen_estimator_head
|
|
{
|
|
struct timer_list timer;
|
|
struct list_head list;
|
|
};
|
|
|
|
static struct gen_estimator_head elist[EST_MAX_INTERVAL+1];
|
|
|
|
/* Protects against NULL dereference */
|
|
static DEFINE_RWLOCK(est_lock);
|
|
|
|
/* Protects against soft lockup during large deletion */
|
|
static struct rb_root est_root = RB_ROOT;
|
|
|
|
static void est_timer(unsigned long arg)
|
|
{
|
|
int idx = (int)arg;
|
|
struct gen_estimator *e;
|
|
|
|
rcu_read_lock();
|
|
list_for_each_entry_rcu(e, &elist[idx].list, list) {
|
|
u64 nbytes;
|
|
u64 brate;
|
|
u32 npackets;
|
|
u32 rate;
|
|
|
|
spin_lock(e->stats_lock);
|
|
read_lock(&est_lock);
|
|
if (e->bstats == NULL)
|
|
goto skip;
|
|
|
|
nbytes = e->bstats->bytes;
|
|
npackets = e->bstats->packets;
|
|
brate = (nbytes - e->last_bytes)<<(7 - idx);
|
|
e->last_bytes = nbytes;
|
|
e->avbps += (brate >> e->ewma_log) - (e->avbps >> e->ewma_log);
|
|
e->rate_est->bps = (e->avbps+0xF)>>5;
|
|
|
|
rate = (npackets - e->last_packets)<<(12 - idx);
|
|
e->last_packets = npackets;
|
|
e->avpps += (rate >> e->ewma_log) - (e->avpps >> e->ewma_log);
|
|
e->rate_est->pps = (e->avpps+0x1FF)>>10;
|
|
skip:
|
|
read_unlock(&est_lock);
|
|
spin_unlock(e->stats_lock);
|
|
}
|
|
|
|
if (!list_empty(&elist[idx].list))
|
|
mod_timer(&elist[idx].timer, jiffies + ((HZ/4) << idx));
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
static void gen_add_node(struct gen_estimator *est)
|
|
{
|
|
struct rb_node **p = &est_root.rb_node, *parent = NULL;
|
|
|
|
while (*p) {
|
|
struct gen_estimator *e;
|
|
|
|
parent = *p;
|
|
e = rb_entry(parent, struct gen_estimator, node);
|
|
|
|
if (est->bstats > e->bstats)
|
|
p = &parent->rb_right;
|
|
else
|
|
p = &parent->rb_left;
|
|
}
|
|
rb_link_node(&est->node, parent, p);
|
|
rb_insert_color(&est->node, &est_root);
|
|
}
|
|
|
|
static
|
|
struct gen_estimator *gen_find_node(const struct gnet_stats_basic_packed *bstats,
|
|
const struct gnet_stats_rate_est *rate_est)
|
|
{
|
|
struct rb_node *p = est_root.rb_node;
|
|
|
|
while (p) {
|
|
struct gen_estimator *e;
|
|
|
|
e = rb_entry(p, struct gen_estimator, node);
|
|
|
|
if (bstats > e->bstats)
|
|
p = p->rb_right;
|
|
else if (bstats < e->bstats || rate_est != e->rate_est)
|
|
p = p->rb_left;
|
|
else
|
|
return e;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/**
|
|
* gen_new_estimator - create a new rate estimator
|
|
* @bstats: basic statistics
|
|
* @rate_est: rate estimator statistics
|
|
* @stats_lock: statistics lock
|
|
* @opt: rate estimator configuration TLV
|
|
*
|
|
* Creates a new rate estimator with &bstats as source and &rate_est
|
|
* as destination. A new timer with the interval specified in the
|
|
* configuration TLV is created. Upon each interval, the latest statistics
|
|
* will be read from &bstats and the estimated rate will be stored in
|
|
* &rate_est with the statistics lock grabed during this period.
|
|
*
|
|
* Returns 0 on success or a negative error code.
|
|
*
|
|
* NOTE: Called under rtnl_mutex
|
|
*/
|
|
int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
|
|
struct gnet_stats_rate_est *rate_est,
|
|
spinlock_t *stats_lock,
|
|
struct nlattr *opt)
|
|
{
|
|
struct gen_estimator *est;
|
|
struct gnet_estimator *parm = nla_data(opt);
|
|
int idx;
|
|
|
|
if (nla_len(opt) < sizeof(*parm))
|
|
return -EINVAL;
|
|
|
|
if (parm->interval < -2 || parm->interval > 3)
|
|
return -EINVAL;
|
|
|
|
est = kzalloc(sizeof(*est), GFP_KERNEL);
|
|
if (est == NULL)
|
|
return -ENOBUFS;
|
|
|
|
idx = parm->interval + 2;
|
|
est->bstats = bstats;
|
|
est->rate_est = rate_est;
|
|
est->stats_lock = stats_lock;
|
|
est->ewma_log = parm->ewma_log;
|
|
est->last_bytes = bstats->bytes;
|
|
est->avbps = rate_est->bps<<5;
|
|
est->last_packets = bstats->packets;
|
|
est->avpps = rate_est->pps<<10;
|
|
|
|
if (!elist[idx].timer.function) {
|
|
INIT_LIST_HEAD(&elist[idx].list);
|
|
setup_timer(&elist[idx].timer, est_timer, idx);
|
|
}
|
|
|
|
if (list_empty(&elist[idx].list))
|
|
mod_timer(&elist[idx].timer, jiffies + ((HZ/4) << idx));
|
|
|
|
list_add_rcu(&est->list, &elist[idx].list);
|
|
gen_add_node(est);
|
|
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(gen_new_estimator);
|
|
|
|
static void __gen_kill_estimator(struct rcu_head *head)
|
|
{
|
|
struct gen_estimator *e = container_of(head,
|
|
struct gen_estimator, e_rcu);
|
|
kfree(e);
|
|
}
|
|
|
|
/**
|
|
* gen_kill_estimator - remove a rate estimator
|
|
* @bstats: basic statistics
|
|
* @rate_est: rate estimator statistics
|
|
*
|
|
* Removes the rate estimator specified by &bstats and &rate_est.
|
|
*
|
|
* NOTE: Called under rtnl_mutex
|
|
*/
|
|
void gen_kill_estimator(struct gnet_stats_basic_packed *bstats,
|
|
struct gnet_stats_rate_est *rate_est)
|
|
{
|
|
struct gen_estimator *e;
|
|
|
|
while ((e = gen_find_node(bstats, rate_est))) {
|
|
rb_erase(&e->node, &est_root);
|
|
|
|
write_lock_bh(&est_lock);
|
|
e->bstats = NULL;
|
|
write_unlock_bh(&est_lock);
|
|
|
|
list_del_rcu(&e->list);
|
|
call_rcu(&e->e_rcu, __gen_kill_estimator);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(gen_kill_estimator);
|
|
|
|
/**
|
|
* gen_replace_estimator - replace rate estimator configuration
|
|
* @bstats: basic statistics
|
|
* @rate_est: rate estimator statistics
|
|
* @stats_lock: statistics lock
|
|
* @opt: rate estimator configuration TLV
|
|
*
|
|
* Replaces the configuration of a rate estimator by calling
|
|
* gen_kill_estimator() and gen_new_estimator().
|
|
*
|
|
* Returns 0 on success or a negative error code.
|
|
*/
|
|
int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
|
|
struct gnet_stats_rate_est *rate_est,
|
|
spinlock_t *stats_lock, struct nlattr *opt)
|
|
{
|
|
gen_kill_estimator(bstats, rate_est);
|
|
return gen_new_estimator(bstats, rate_est, stats_lock, opt);
|
|
}
|
|
EXPORT_SYMBOL(gen_replace_estimator);
|
|
|
|
/**
|
|
* gen_estimator_active - test if estimator is currently in use
|
|
* @bstats: basic statistics
|
|
* @rate_est: rate estimator statistics
|
|
*
|
|
* Returns true if estimator is active, and false if not.
|
|
*/
|
|
bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats,
|
|
const struct gnet_stats_rate_est *rate_est)
|
|
{
|
|
ASSERT_RTNL();
|
|
|
|
return gen_find_node(bstats, rate_est) != NULL;
|
|
}
|
|
EXPORT_SYMBOL(gen_estimator_active);
|