2007-10-19 15:22:11 -06:00
|
|
|
/* (C) 1999 Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr>
|
|
|
|
* (C) 1999 Hervé Eychenne <eychenne@info.enserb.u-bordeaux.fr>
|
2005-04-16 16:20:36 -06:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*/
|
|
|
|
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
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>
2010-03-24 02:04:11 -06:00
|
|
|
#include <linux/slab.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
|
[NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables
This monster-patch tries to do the best job for unifying the data
structures and backend interfaces for the three evil clones ip_tables,
ip6_tables and arp_tables. In an ideal world we would never have
allowed this kind of copy+paste programming... but well, our world
isn't (yet?) ideal.
o introduce a new x_tables module
o {ip,arp,ip6}_tables depend on this x_tables module
o registration functions for tables, matches and targets are only
wrappers around x_tables provided functions
o all matches/targets that are used from ip_tables and ip6_tables
are now implemented as xt_FOOBAR.c files and provide module aliases
to ipt_FOOBAR and ip6t_FOOBAR
o header files for xt_matches are in include/linux/netfilter/,
include/linux/netfilter_{ipv4,ipv6} contains compatibility wrappers
around the xt_FOOBAR.h headers
Based on this patchset we're going to further unify the code,
gradually getting rid of all the layer 3 specific assumptions.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-12 14:30:04 -07:00
|
|
|
#include <linux/netfilter/x_tables.h>
|
|
|
|
#include <linux/netfilter/xt_limit.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-03-16 08:35:29 -06:00
|
|
|
struct xt_limit_priv {
|
|
|
|
unsigned long prev;
|
|
|
|
uint32_t credit;
|
|
|
|
};
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_AUTHOR("Herve Eychenne <rv@wallfire.org>");
|
2008-01-15 00:42:28 -07:00
|
|
|
MODULE_DESCRIPTION("Xtables: rate-limit match");
|
[NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables
This monster-patch tries to do the best job for unifying the data
structures and backend interfaces for the three evil clones ip_tables,
ip6_tables and arp_tables. In an ideal world we would never have
allowed this kind of copy+paste programming... but well, our world
isn't (yet?) ideal.
o introduce a new x_tables module
o {ip,arp,ip6}_tables depend on this x_tables module
o registration functions for tables, matches and targets are only
wrappers around x_tables provided functions
o all matches/targets that are used from ip_tables and ip6_tables
are now implemented as xt_FOOBAR.c files and provide module aliases
to ipt_FOOBAR and ip6t_FOOBAR
o header files for xt_matches are in include/linux/netfilter/,
include/linux/netfilter_{ipv4,ipv6} contains compatibility wrappers
around the xt_FOOBAR.h headers
Based on this patchset we're going to further unify the code,
gradually getting rid of all the layer 3 specific assumptions.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-12 14:30:04 -07:00
|
|
|
MODULE_ALIAS("ipt_limit");
|
|
|
|
MODULE_ALIAS("ip6t_limit");
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* The algorithm used is the Simple Token Bucket Filter (TBF)
|
|
|
|
* see net/sched/sch_tbf.c in the linux source tree
|
|
|
|
*/
|
|
|
|
|
|
|
|
static DEFINE_SPINLOCK(limit_lock);
|
|
|
|
|
|
|
|
/* Rusty: This is my (non-mathematically-inclined) understanding of
|
|
|
|
this algorithm. The `average rate' in jiffies becomes your initial
|
|
|
|
amount of credit `credit' and the most credit you can ever have
|
|
|
|
`credit_cap'. The `peak rate' becomes the cost of passing the
|
|
|
|
test, `cost'.
|
|
|
|
|
|
|
|
`prev' tracks the last packet hit: you gain one credit per jiffy.
|
|
|
|
If you get credit balance more than this, the extra credit is
|
|
|
|
discarded. Every time the match passes, you lose `cost' credits;
|
|
|
|
if you don't have that many, the test fails.
|
|
|
|
|
|
|
|
See Alexey's formal explanation in net/sched/sch_tbf.c.
|
|
|
|
|
|
|
|
To get the maxmum range, we multiply by this factor (ie. you get N
|
|
|
|
credits per jiffy). We want to allow a rate as low as 1 per day
|
|
|
|
(slowest userspace tool allows), which means
|
|
|
|
CREDITS_PER_JIFFY*HZ*60*60*24 < 2^32. ie. */
|
|
|
|
#define MAX_CPJ (0xFFFFFFFF / (HZ*60*60*24))
|
|
|
|
|
|
|
|
/* Repeated shift and or gives us all 1s, final shift and add 1 gives
|
|
|
|
* us the power of 2 below the theoretical max, so GCC simply does a
|
|
|
|
* shift. */
|
|
|
|
#define _POW2_BELOW2(x) ((x)|((x)>>1))
|
|
|
|
#define _POW2_BELOW4(x) (_POW2_BELOW2(x)|_POW2_BELOW2((x)>>2))
|
|
|
|
#define _POW2_BELOW8(x) (_POW2_BELOW4(x)|_POW2_BELOW4((x)>>4))
|
|
|
|
#define _POW2_BELOW16(x) (_POW2_BELOW8(x)|_POW2_BELOW8((x)>>8))
|
|
|
|
#define _POW2_BELOW32(x) (_POW2_BELOW16(x)|_POW2_BELOW16((x)>>16))
|
|
|
|
#define POW2_BELOW32(x) ((_POW2_BELOW32(x)>>1) + 1)
|
|
|
|
|
|
|
|
#define CREDITS_PER_JIFFY POW2_BELOW32(MAX_CPJ)
|
|
|
|
|
2007-07-07 23:15:35 -06:00
|
|
|
static bool
|
2008-10-08 03:35:18 -06:00
|
|
|
limit_mt(const struct sk_buff *skb, const struct xt_match_param *par)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2009-03-16 08:35:29 -06:00
|
|
|
const struct xt_rateinfo *r = par->matchinfo;
|
|
|
|
struct xt_limit_priv *priv = r->master;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned long now = jiffies;
|
|
|
|
|
|
|
|
spin_lock_bh(&limit_lock);
|
2009-03-16 08:35:29 -06:00
|
|
|
priv->credit += (now - xchg(&priv->prev, now)) * CREDITS_PER_JIFFY;
|
|
|
|
if (priv->credit > r->credit_cap)
|
|
|
|
priv->credit = r->credit_cap;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-03-16 08:35:29 -06:00
|
|
|
if (priv->credit >= r->cost) {
|
2005-04-16 16:20:36 -06:00
|
|
|
/* We're not limited. */
|
2009-03-16 08:35:29 -06:00
|
|
|
priv->credit -= r->cost;
|
2005-04-16 16:20:36 -06:00
|
|
|
spin_unlock_bh(&limit_lock);
|
2007-07-07 23:15:35 -06:00
|
|
|
return true;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2007-02-12 12:15:49 -07:00
|
|
|
spin_unlock_bh(&limit_lock);
|
2007-07-07 23:15:35 -06:00
|
|
|
return false;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Precision saver. */
|
|
|
|
static u_int32_t
|
|
|
|
user2credits(u_int32_t user)
|
|
|
|
{
|
|
|
|
/* If multiplying would overflow... */
|
|
|
|
if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY))
|
|
|
|
/* Divide first. */
|
[NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables
This monster-patch tries to do the best job for unifying the data
structures and backend interfaces for the three evil clones ip_tables,
ip6_tables and arp_tables. In an ideal world we would never have
allowed this kind of copy+paste programming... but well, our world
isn't (yet?) ideal.
o introduce a new x_tables module
o {ip,arp,ip6}_tables depend on this x_tables module
o registration functions for tables, matches and targets are only
wrappers around x_tables provided functions
o all matches/targets that are used from ip_tables and ip6_tables
are now implemented as xt_FOOBAR.c files and provide module aliases
to ipt_FOOBAR and ip6t_FOOBAR
o header files for xt_matches are in include/linux/netfilter/,
include/linux/netfilter_{ipv4,ipv6} contains compatibility wrappers
around the xt_FOOBAR.h headers
Based on this patchset we're going to further unify the code,
gradually getting rid of all the layer 3 specific assumptions.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-12 14:30:04 -07:00
|
|
|
return (user / XT_LIMIT_SCALE) * HZ * CREDITS_PER_JIFFY;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
[NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables
This monster-patch tries to do the best job for unifying the data
structures and backend interfaces for the three evil clones ip_tables,
ip6_tables and arp_tables. In an ideal world we would never have
allowed this kind of copy+paste programming... but well, our world
isn't (yet?) ideal.
o introduce a new x_tables module
o {ip,arp,ip6}_tables depend on this x_tables module
o registration functions for tables, matches and targets are only
wrappers around x_tables provided functions
o all matches/targets that are used from ip_tables and ip6_tables
are now implemented as xt_FOOBAR.c files and provide module aliases
to ipt_FOOBAR and ip6t_FOOBAR
o header files for xt_matches are in include/linux/netfilter/,
include/linux/netfilter_{ipv4,ipv6} contains compatibility wrappers
around the xt_FOOBAR.h headers
Based on this patchset we're going to further unify the code,
gradually getting rid of all the layer 3 specific assumptions.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-12 14:30:04 -07:00
|
|
|
return (user * HZ * CREDITS_PER_JIFFY) / XT_LIMIT_SCALE;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2008-10-08 03:35:18 -06:00
|
|
|
static bool limit_mt_check(const struct xt_mtchk_param *par)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2008-10-08 03:35:18 -06:00
|
|
|
struct xt_rateinfo *r = par->matchinfo;
|
2009-03-16 08:35:29 -06:00
|
|
|
struct xt_limit_priv *priv;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* Check for overflow. */
|
|
|
|
if (r->burst == 0
|
|
|
|
|| user2credits(r->avg * r->burst) < user2credits(r->avg)) {
|
[NETFILTER] x_tables: Abstraction layer for {ip,ip6,arp}_tables
This monster-patch tries to do the best job for unifying the data
structures and backend interfaces for the three evil clones ip_tables,
ip6_tables and arp_tables. In an ideal world we would never have
allowed this kind of copy+paste programming... but well, our world
isn't (yet?) ideal.
o introduce a new x_tables module
o {ip,arp,ip6}_tables depend on this x_tables module
o registration functions for tables, matches and targets are only
wrappers around x_tables provided functions
o all matches/targets that are used from ip_tables and ip6_tables
are now implemented as xt_FOOBAR.c files and provide module aliases
to ipt_FOOBAR and ip6t_FOOBAR
o header files for xt_matches are in include/linux/netfilter/,
include/linux/netfilter_{ipv4,ipv6} contains compatibility wrappers
around the xt_FOOBAR.h headers
Based on this patchset we're going to further unify the code,
gradually getting rid of all the layer 3 specific assumptions.
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-12 14:30:04 -07:00
|
|
|
printk("Overflow in xt_limit, try lower: %u/%u\n",
|
2005-04-16 16:20:36 -06:00
|
|
|
r->avg, r->burst);
|
2007-07-07 23:16:00 -06:00
|
|
|
return false;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2009-03-16 08:35:29 -06:00
|
|
|
priv = kmalloc(sizeof(*priv), GFP_KERNEL);
|
|
|
|
if (priv == NULL)
|
2009-11-23 05:37:23 -07:00
|
|
|
return false;
|
2009-03-16 08:35:29 -06:00
|
|
|
|
|
|
|
/* For SMP, we only want to use one set of state. */
|
|
|
|
r->master = priv;
|
2006-09-20 12:59:25 -06:00
|
|
|
if (r->cost == 0) {
|
|
|
|
/* User avg in seconds * XT_LIMIT_SCALE: convert to jiffies *
|
|
|
|
128. */
|
2009-03-16 08:35:29 -06:00
|
|
|
priv->prev = jiffies;
|
|
|
|
priv->credit = user2credits(r->avg * r->burst); /* Credits full. */
|
2006-09-20 12:59:25 -06:00
|
|
|
r->credit_cap = user2credits(r->avg * r->burst); /* Credits full. */
|
|
|
|
r->cost = user2credits(r->avg);
|
|
|
|
}
|
2007-07-07 23:16:00 -06:00
|
|
|
return true;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2009-03-16 08:35:29 -06:00
|
|
|
static void limit_mt_destroy(const struct xt_mtdtor_param *par)
|
|
|
|
{
|
|
|
|
const struct xt_rateinfo *info = par->matchinfo;
|
|
|
|
|
|
|
|
kfree(info->master);
|
|
|
|
}
|
|
|
|
|
2006-09-20 13:07:06 -06:00
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
struct compat_xt_rateinfo {
|
|
|
|
u_int32_t avg;
|
|
|
|
u_int32_t burst;
|
|
|
|
|
|
|
|
compat_ulong_t prev;
|
|
|
|
u_int32_t credit;
|
|
|
|
u_int32_t credit_cap, cost;
|
|
|
|
|
|
|
|
u_int32_t master;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* To keep the full "prev" timestamp, the upper 32 bits are stored in the
|
|
|
|
* master pointer, which does not need to be preserved. */
|
2009-06-26 00:23:19 -06:00
|
|
|
static void limit_mt_compat_from_user(void *dst, const void *src)
|
2006-09-20 13:07:06 -06:00
|
|
|
{
|
2007-07-07 23:16:55 -06:00
|
|
|
const struct compat_xt_rateinfo *cm = src;
|
2006-09-20 13:07:06 -06:00
|
|
|
struct xt_rateinfo m = {
|
|
|
|
.avg = cm->avg,
|
|
|
|
.burst = cm->burst,
|
|
|
|
.prev = cm->prev | (unsigned long)cm->master << 32,
|
|
|
|
.credit = cm->credit,
|
|
|
|
.credit_cap = cm->credit_cap,
|
|
|
|
.cost = cm->cost,
|
|
|
|
};
|
|
|
|
memcpy(dst, &m, sizeof(m));
|
|
|
|
}
|
|
|
|
|
2009-06-26 00:23:19 -06:00
|
|
|
static int limit_mt_compat_to_user(void __user *dst, const void *src)
|
2006-09-20 13:07:06 -06:00
|
|
|
{
|
2007-07-07 23:16:55 -06:00
|
|
|
const struct xt_rateinfo *m = src;
|
2006-09-20 13:07:06 -06:00
|
|
|
struct compat_xt_rateinfo cm = {
|
|
|
|
.avg = m->avg,
|
|
|
|
.burst = m->burst,
|
|
|
|
.prev = m->prev,
|
|
|
|
.credit = m->credit,
|
|
|
|
.credit_cap = m->credit_cap,
|
|
|
|
.cost = m->cost,
|
|
|
|
.master = m->prev >> 32,
|
|
|
|
};
|
|
|
|
return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_COMPAT */
|
|
|
|
|
2008-10-08 03:35:01 -06:00
|
|
|
static struct xt_match limit_mt_reg __read_mostly = {
|
|
|
|
.name = "limit",
|
|
|
|
.revision = 0,
|
|
|
|
.family = NFPROTO_UNSPEC,
|
|
|
|
.match = limit_mt,
|
|
|
|
.checkentry = limit_mt_check,
|
2009-03-16 08:35:29 -06:00
|
|
|
.destroy = limit_mt_destroy,
|
2008-10-08 03:35:01 -06:00
|
|
|
.matchsize = sizeof(struct xt_rateinfo),
|
2006-09-20 13:07:06 -06:00
|
|
|
#ifdef CONFIG_COMPAT
|
2008-10-08 03:35:01 -06:00
|
|
|
.compatsize = sizeof(struct compat_xt_rateinfo),
|
|
|
|
.compat_from_user = limit_mt_compat_from_user,
|
|
|
|
.compat_to_user = limit_mt_compat_to_user,
|
2006-09-20 13:07:06 -06:00
|
|
|
#endif
|
2008-10-08 03:35:01 -06:00
|
|
|
.me = THIS_MODULE,
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2007-12-05 00:24:03 -07:00
|
|
|
static int __init limit_mt_init(void)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2008-10-08 03:35:01 -06:00
|
|
|
return xt_register_match(&limit_mt_reg);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2007-12-05 00:24:03 -07:00
|
|
|
static void __exit limit_mt_exit(void)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2008-10-08 03:35:01 -06:00
|
|
|
xt_unregister_match(&limit_mt_reg);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2007-12-05 00:24:03 -07:00
|
|
|
module_init(limit_mt_init);
|
|
|
|
module_exit(limit_mt_exit);
|