diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-05-13 12:42:55 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-05-13 12:42:55 +0000 |
| commit | 251a81b192537a46620e8e00893e14386328f40a (patch) | |
| tree | 1662196ab2eb08fbacc99620dab1c65fa3002623 /target/linux/generic-2.6/patches-2.6.30 | |
| parent | 4ab19ddbd58b0e09abfd3c168016332e554ea7c8 (diff) | |
| download | upstream-251a81b192537a46620e8e00893e14386328f40a.tar.gz upstream-251a81b192537a46620e8e00893e14386328f40a.tar.bz2 upstream-251a81b192537a46620e8e00893e14386328f40a.zip | |
reduce the total cpu usage of ipt_do_table under high network load from 3.1% down to 1.6% (tested with oprofile)
SVN-Revision: 15822
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch index be15d349cf..cf7890ea09 100644 --- a/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch +++ b/target/linux/generic-2.6/patches-2.6.30/110-netfilter_match_speedup.patch @@ -75,3 +75,47 @@ } #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \ +@@ -318,8 +344,28 @@ ipt_do_table(struct sk_buff *skb, + struct xt_match_param mtpar; + struct xt_target_param tgpar; + +- /* Initialization */ + ip = ip_hdr(skb); ++ ++ IP_NF_ASSERT(table->valid_hooks & (1 << hook)); ++ xt_info_rdlock_bh(); ++ private = table->private; ++ table_base = private->entries[smp_processor_id()]; ++ e = get_entry(table_base, private->hook_entry[hook]); ++ ++ if (e->target_offset <= sizeof(struct ipt_entry) && ++ (e->ip.flags & IPT_F_NO_DEF_MATCH)) { ++ struct ipt_entry_target *t = ipt_get_target(e); ++ if (!t->u.kernel.target->target) { ++ int v = ((struct ipt_standard_target *)t)->verdict; ++ if ((v < 0) && (v != IPT_RETURN)) { ++ ADD_COUNTER(e->counters, ntohs(ip->tot_len), 1); ++ read_unlock_bh(&table->lock); ++ return (unsigned)(-v) - 1; ++ } ++ } ++ } ++ ++ /* Initialization */ + datalen = skb->len - ip->ihl * 4; + indev = in ? in->name : nulldevname; + outdev = out ? out->name : nulldevname; +@@ -337,13 +383,6 @@ ipt_do_table(struct sk_buff *skb, + mtpar.family = tgpar.family = NFPROTO_IPV4; + tgpar.hooknum = hook; + +- IP_NF_ASSERT(table->valid_hooks & (1 << hook)); +- xt_info_rdlock_bh(); +- private = table->private; +- table_base = private->entries[smp_processor_id()]; +- +- e = get_entry(table_base, private->hook_entry[hook]); +- + /* For return from builtin chain */ + back = get_entry(table_base, private->underflow[hook]); + |