Commit a4837980 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by David S. Miller

net: revert default NAPI poll timeout to 2 jiffies

For HZ < 1000 timeout 2000us rounds up to 1 jiffy but expires randomly
because next timer interrupt could come shortly after starting softirq.

For commonly used CONFIG_HZ=1000 nothing changes.

Fixes: 7acf8a1e ("Replace 2 jiffies with sysctl netdev_budget_usecs to enable softirq tuning")
Reported-by: default avatarDmitry Yakunin <zeil@yandex-team.ru>
Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5d75538
...@@ -4140,7 +4140,8 @@ EXPORT_SYMBOL(netdev_max_backlog); ...@@ -4140,7 +4140,8 @@ EXPORT_SYMBOL(netdev_max_backlog);
int netdev_tstamp_prequeue __read_mostly = 1; int netdev_tstamp_prequeue __read_mostly = 1;
int netdev_budget __read_mostly = 300; int netdev_budget __read_mostly = 300;
unsigned int __read_mostly netdev_budget_usecs = 2000; /* Must be at least 2 jiffes to guarantee 1 jiffy timeout */
unsigned int __read_mostly netdev_budget_usecs = 2 * USEC_PER_SEC / HZ;
int weight_p __read_mostly = 64; /* old backlog weight */ int weight_p __read_mostly = 64; /* old backlog weight */
int dev_weight_rx_bias __read_mostly = 1; /* bias for backlog weight */ int dev_weight_rx_bias __read_mostly = 1; /* bias for backlog weight */
int dev_weight_tx_bias __read_mostly = 1; /* bias for output_queue quota */ int dev_weight_tx_bias __read_mostly = 1; /* bias for output_queue quota */
......
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