Commit 9958da05 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: remove time limit in process_backlog()

- There is no point to enforce a time limit in process_backlog(), since
other napi instances dont follow same rule. We can exit after only one
packet processed...
The normal quota of 64 packets per napi instance should be the norm, and
net_rx_action() already has its own time limit.
Note : /proc/net/core/dev_weight can be used to tune this 64 default
value.

- Use DEFINE_PER_CPU_ALIGNED for softnet_data definition.
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8770acf0
...@@ -264,7 +264,7 @@ static RAW_NOTIFIER_HEAD(netdev_chain); ...@@ -264,7 +264,7 @@ static RAW_NOTIFIER_HEAD(netdev_chain);
* queue in the local softnet handler. * queue in the local softnet handler.
*/ */
DEFINE_PER_CPU(struct softnet_data, softnet_data); DEFINE_PER_CPU_ALIGNED(struct softnet_data, softnet_data);
EXPORT_PER_CPU_SYMBOL(softnet_data); EXPORT_PER_CPU_SYMBOL(softnet_data);
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
...@@ -3232,7 +3232,6 @@ static int process_backlog(struct napi_struct *napi, int quota) ...@@ -3232,7 +3232,6 @@ static int process_backlog(struct napi_struct *napi, int quota)
{ {
int work = 0; int work = 0;
struct softnet_data *queue = &__get_cpu_var(softnet_data); struct softnet_data *queue = &__get_cpu_var(softnet_data);
unsigned long start_time = jiffies;
napi->weight = weight_p; napi->weight = weight_p;
do { do {
...@@ -3252,7 +3251,7 @@ static int process_backlog(struct napi_struct *napi, int quota) ...@@ -3252,7 +3251,7 @@ static int process_backlog(struct napi_struct *napi, int quota)
local_irq_enable(); local_irq_enable();
__netif_receive_skb(skb); __netif_receive_skb(skb);
} while (++work < quota && jiffies == start_time); } while (++work < quota);
return work; return work;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment