reduce the total cpu usage of ipt_do_table under high network load from 3.1% down...

SVN-Revision: 15822

diff --git a/target/linux/generic-2.6/patches-2.6.28/110-netfilter_match_speedup.patch b/target/linux/generic-2.6/patches-2.6.28/110-netfilter_match_speedup.patch
index 2bdbe0703d65119cbddc7b048d6d3e50831df34f..ff0352883015d0f325dab7829263579daaab74bb 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/110-netfilter_match_speedup.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/110-netfilter_match_speedup.patch
@@ -75,3 +75,46 @@
  }
  
  #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \
  }
  
  #if defined(CONFIG_NETFILTER_XT_TARGET_TRACE) || \

+@@ -332,8 +358,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;
+@@ -351,12 +396,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]);
+ 
+

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 5bb51bad03b47c82fe057853e9bba1e28dc28ca0..91261d8c10114f7911a4594739983c9ac80a250c 100644 (file)
--- 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) || \
  }
  
  #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]);
+ 

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 be15d349cfc423fb54e96419d13b5abac23dcbe5..cf7890ea096a9c144e25444e751de991e7db5ed1 100644 (file)
--- 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) || \
  }
  
  #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]);
+