Commit 8b5c171b authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

neigh: new unresolved queue limits

Le mercredi 09 novembre 2011 à 16:21 -0500, David Miller a écrit :
> From: David Miller <davem@davemloft.net>
> Date: Wed, 09 Nov 2011 16:16:44 -0500 (EST)
>
> > From: Eric Dumazet <eric.dumazet@gmail.com>
> > Date: Wed, 09 Nov 2011 12:14:09 +0100
> >
> >> unres_qlen is the number of frames we are able to queue per unresolved
> >> neighbour. Its default value (3) was never changed and is responsible
> >> for strange drops, especially if IP fragments are used, or multiple
> >> sessions start in parallel. Even a single tcp flow can hit this limit.
> >  ...
> >
> > Ok, I've applied this, let's see what happens :-)
>
> Early answer, build fails.
>
> Please test build this patch with DECNET enabled and resubmit.  The
> decnet neigh layer still refers to the removed ->queue_len member.
>
> Thanks.

Ouch, this was fixed on one machine yesterday, but not the other one I
used this morning, sorry.

[PATCH V5 net-next] neigh: new unresolved queue limits

unres_qlen is the number of frames we are able to queue per unresolved
neighbour. Its default value (3) was never changed and is responsible
for strange drops, especially if IP fragments are used, or multiple
sessions start in parallel. Even a single tcp flow can hit this limit.

$ arp -d 192.168.20.108 ; ping -c 2 -s 8000 192.168.20.108
PING 192.168.20.108 (192.168.20.108) 8000(8028) bytes of data.
8008 bytes from 192.168.20.108: icmp_seq=2 ttl=64 time=0.322 ms
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 292d1398
...@@ -31,6 +31,16 @@ neigh/default/gc_thresh3 - INTEGER ...@@ -31,6 +31,16 @@ neigh/default/gc_thresh3 - INTEGER
when using large numbers of interfaces and when communicating when using large numbers of interfaces and when communicating
with large numbers of directly-connected peers. with large numbers of directly-connected peers.
neigh/default/unres_qlen_bytes - INTEGER
The maximum number of bytes which may be used by packets
queued for each unresolved address by other network layers.
(added in linux 3.3)
neigh/default/unres_qlen - INTEGER
The maximum number of packets which may be queued for each
unresolved address by other network layers.
(deprecated in linux 3.3) : use unres_qlen_bytes instead.
mtu_expires - INTEGER mtu_expires - INTEGER
Time, in seconds, that cached PMTU information is kept. Time, in seconds, that cached PMTU information is kept.
......
...@@ -116,6 +116,7 @@ enum { ...@@ -116,6 +116,7 @@ enum {
NDTPA_PROXY_DELAY, /* u64, msecs */ NDTPA_PROXY_DELAY, /* u64, msecs */
NDTPA_PROXY_QLEN, /* u32 */ NDTPA_PROXY_QLEN, /* u32 */
NDTPA_LOCKTIME, /* u64, msecs */ NDTPA_LOCKTIME, /* u64, msecs */
NDTPA_QUEUE_LENBYTES, /* u32 */
__NDTPA_MAX __NDTPA_MAX
}; };
#define NDTPA_MAX (__NDTPA_MAX - 1) #define NDTPA_MAX (__NDTPA_MAX - 1)
......
...@@ -59,7 +59,7 @@ struct neigh_parms { ...@@ -59,7 +59,7 @@ struct neigh_parms {
int reachable_time; int reachable_time;
int delay_probe_time; int delay_probe_time;
int queue_len; int queue_len_bytes;
int ucast_probes; int ucast_probes;
int app_probes; int app_probes;
int mcast_probes; int mcast_probes;
...@@ -99,6 +99,7 @@ struct neighbour { ...@@ -99,6 +99,7 @@ struct neighbour {
rwlock_t lock; rwlock_t lock;
atomic_t refcnt; atomic_t refcnt;
struct sk_buff_head arp_queue; struct sk_buff_head arp_queue;
unsigned int arp_queue_len_bytes;
struct timer_list timer; struct timer_list timer;
unsigned long used; unsigned long used;
atomic_t probes; atomic_t probes;
......
...@@ -329,7 +329,7 @@ static struct neigh_table clip_tbl = { ...@@ -329,7 +329,7 @@ static struct neigh_table clip_tbl = {
.gc_staletime = 60 * HZ, .gc_staletime = 60 * HZ,
.reachable_time = 30 * HZ, .reachable_time = 30 * HZ,
.delay_probe_time = 5 * HZ, .delay_probe_time = 5 * HZ,
.queue_len = 3, .queue_len_bytes = 64 * 1024,
.ucast_probes = 3, .ucast_probes = 3,
.mcast_probes = 3, .mcast_probes = 3,
.anycast_delay = 1 * HZ, .anycast_delay = 1 * HZ,
......
This diff is collapsed.
...@@ -107,7 +107,7 @@ struct neigh_table dn_neigh_table = { ...@@ -107,7 +107,7 @@ struct neigh_table dn_neigh_table = {
.gc_staletime = 60 * HZ, .gc_staletime = 60 * HZ,
.reachable_time = 30 * HZ, .reachable_time = 30 * HZ,
.delay_probe_time = 5 * HZ, .delay_probe_time = 5 * HZ,
.queue_len = 3, .queue_len_bytes = 64*1024,
.ucast_probes = 0, .ucast_probes = 0,
.app_probes = 0, .app_probes = 0,
.mcast_probes = 0, .mcast_probes = 0,
......
...@@ -177,7 +177,7 @@ struct neigh_table arp_tbl = { ...@@ -177,7 +177,7 @@ struct neigh_table arp_tbl = {
.gc_staletime = 60 * HZ, .gc_staletime = 60 * HZ,
.reachable_time = 30 * HZ, .reachable_time = 30 * HZ,
.delay_probe_time = 5 * HZ, .delay_probe_time = 5 * HZ,
.queue_len = 3, .queue_len_bytes = 64*1024,
.ucast_probes = 3, .ucast_probes = 3,
.mcast_probes = 3, .mcast_probes = 3,
.anycast_delay = 1 * HZ, .anycast_delay = 1 * HZ,
......
...@@ -141,7 +141,7 @@ struct neigh_table nd_tbl = { ...@@ -141,7 +141,7 @@ struct neigh_table nd_tbl = {
.gc_staletime = 60 * HZ, .gc_staletime = 60 * HZ,
.reachable_time = ND_REACHABLE_TIME, .reachable_time = ND_REACHABLE_TIME,
.delay_probe_time = 5 * HZ, .delay_probe_time = 5 * HZ,
.queue_len = 3, .queue_len_bytes = 64*1024,
.ucast_probes = 3, .ucast_probes = 3,
.mcast_probes = 3, .mcast_probes = 3,
.anycast_delay = 1 * HZ, .anycast_delay = 1 * HZ,
......
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