aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.29
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-05-13 12:42:55 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-05-13 12:42:55 +0000
commitf9b8d9ebad984eabc42c059c08b77e3cf0ac8307 (patch)
treed82da853b8392e9654c7a41c393f36b7960d4d22 /target/linux/generic-2.6/patches-2.6.29
parentfce86ebce5d8078c292c1e7e253e20207f9b0f77 (diff)
downloadupstream-f9b8d9ebad984eabc42c059c08b77e3cf0ac8307.tar.gz
upstream-f9b8d9ebad984eabc42c059c08b77e3cf0ac8307.tar.bz2
upstream-f9b8d9ebad984eabc42c059c08b77e3cf0ac8307.zip
reduce the total cpu usage of ipt_do_table under high network load from 3.1% down to 1.6% (tested with oprofile)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15822 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29')
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/110-netfilter_match_speedup.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.29/110-netfilter_match_speedup.patch
index 5bb51bad03..91261d8c10 100644
--- a/target/linux/generic-2.6/patches-2.6.29/110-netfilter_match_speedup.patch
+++ b/target/linux/generic-2.6/patches-2.6.29/110-netfilter_match_speedup.patch
@@ -75,3 +75,45 @@
}
#if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
+@@ -328,8 +354,27 @@ ipt_do_table(struct sk_buff *skb,
+ struct xt_match_param mtpar;
+ struct xt_target_param tgpar;
+
+- /* Initialization */
+ ip = ip_hdr(skb);
++
++ read_lock_bh(&table->lock);
++ IP_NF_ASSERT(table->valid_hooks & (1 << hook));
++ private = table->private;
++ table_base = (void *)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;
+@@ -347,12 +392,6 @@ ipt_do_table(struct sk_buff *skb,
+ mtpar.family = tgpar.family = NFPROTO_IPV4;
+ tgpar.hooknum = hook;
+
+- read_lock_bh(&table->lock);
+- IP_NF_ASSERT(table->valid_hooks & (1 << hook));
+- private = table->private;
+- table_base = (void *)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]);
+