ipv4: fix counter in_slow_tot
Subsystems (3)
PATCH 1/1 ipv4: fix counter in_slow_tot
since commit 89aef8921bf("ipv4: Delete routing cache."), the counter in_slow_tot can't work correctly.
The counter in_slow_tot increase by one when fib_lookup() return successfully in ip_route_input_slow(), but actually the dst struct maybe not be created and cached, so we can increase in_slow_tot after the dst struct is created.
--- net/ipv4/route.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/route.c +2 -2
@@ -1597,6 +1597,7 @@ static int __mkroute_input(struct sk_buff *skb, rth->rt_gateway =0 ; rth->rt_uses_gateway =0 ;INIT_LIST_HEAD (&rth->rt_uncached); +RT_CACHE_STAT_INC (in_slow_tot); rth->dst.input = ip_forward; rth->dst.output = ip_output;
@@ -1698,8 +1699,6 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,if (err !=0 ) goto no_route; -RT_CACHE_STAT_INC (in_slow_tot); -if (res.type ==RTN_BROADCAST ) goto brd_input;
@@ -1768,6 +1767,7 @@ local_input: rth->rt_gateway =0 ; rth->rt_uses_gateway =0 ;INIT_LIST_HEAD (&rth->rt_uncached); +RT_CACHE_STAT_INC (in_slow_tot);if (res.type ==RTN_UNREACHABLE ) { rth->dst.input= ip_error; rth->dst.error= -err;
Signature · 1 line
1.8.3.1
David Miller
maintainerFrom: Duan Jiong <[email protected]>
Date: Mon, 17 Feb 2014 15:23:43 +0800
Quoted 8 lines
since commit 89aef8921bf("ipv4: Delete routing cache."), the counter
in_slow_totcan't work correctly.The counter
in_slow_totincrease by one whenfib_lookup()return successfully inip_route_input_slow(), but actually the dst struct maybe not be created and cached, so we can increasein_slow_totafter the dst struct is created.Signed-off-by Duan Jiong <[email protected]>
Applied and queued up for -stable, thanks.
From: Duan Jiong <[email protected]>
Date: Mon, 17 Feb 2014 15:23:43 +0800
Quoted 8 lines
since commit 89aef8921bf("ipv4: Delete routing cache."), the counter
in_slow_totcan't work correctly.The counter
in_slow_totincrease by one whenfib_lookup()return successfully inip_route_input_slow(), but actually the dst struct maybe not be created and cached, so we can increasein_slow_totafter the dst struct is created.Signed-off-by Duan Jiong <[email protected]>
Applied, thanks.