* Re: ip_rt_bug: 10.0.0.52 -> 255.255.255.255, ?
[not found] <4E4898F5.8050605@gmail.com>
@ 2011-08-15 5:45 ` David Miller
2011-08-15 5:55 ` Justin P. Mattock
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2011-08-15 5:45 UTC (permalink / raw)
To: justinmattock; +Cc: linux-kernel, linux-wireless, netdev
First, please contact netdev@vger.kernel.org for networking issues.
Second, this is fixed already:
commit d547f727df86059104af2234804fdd538e112015
Author: Julian Anastasov <ja@ssi.bg>
Date: Sun Aug 7 22:20:20 2011 -0700
ipv4: fix the reusing of routing cache entries
compare_keys and ip_route_input_common rely on
rt_oif for distinguishing of input and output routes
with same keys values. But sometimes the input route has
also same hash chain (keyed by iif != 0) with the output
routes (keyed by orig_oif=0). Problem visible if running
with small number of rhash_entries.
Fix them to use rt_route_iif instead. By this way
input route can not be returned to users that request
output route.
The patch fixes the ip_rt_bug errors that were
reported in ip_local_out context, mostly for 255.255.255.255
destinations.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index e3dec1c..cb7efe0 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -731,6 +731,7 @@ static inline int compare_keys(struct rtable *rt1, struct rtable *rt2)
((__force u32)rt1->rt_key_src ^ (__force u32)rt2->rt_key_src) |
(rt1->rt_mark ^ rt2->rt_mark) |
(rt1->rt_key_tos ^ rt2->rt_key_tos) |
+ (rt1->rt_route_iif ^ rt2->rt_route_iif) |
(rt1->rt_oif ^ rt2->rt_oif) |
(rt1->rt_iif ^ rt2->rt_iif)) == 0;
}
@@ -2321,8 +2322,8 @@ int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
if ((((__force u32)rth->rt_key_dst ^ (__force u32)daddr) |
((__force u32)rth->rt_key_src ^ (__force u32)saddr) |
(rth->rt_iif ^ iif) |
- rth->rt_oif |
(rth->rt_key_tos ^ tos)) == 0 &&
+ rt_is_input_route(rth) &&
rth->rt_mark == skb->mark &&
net_eq(dev_net(rth->dst.dev), net) &&
!rt_is_expired(rth)) {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: ip_rt_bug: 10.0.0.52 -> 255.255.255.255, ?
2011-08-15 5:45 ` ip_rt_bug: 10.0.0.52 -> 255.255.255.255, ? David Miller
@ 2011-08-15 5:55 ` Justin P. Mattock
2011-08-15 5:56 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Justin P. Mattock @ 2011-08-15 5:55 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, linux-wireless, netdev
Oh.. guess I will wait for those to be put into the Mainline then.
Thanks for the info!
>
> First, please contact netdev@vger.kernel.org for networking issues.
>
> Second, this is fixed already:
>
> commit d547f727df86059104af2234804fdd538e112015
> Author: Julian Anastasov<ja@ssi.bg>
> Date: Sun Aug 7 22:20:20 2011 -0700
>
> ipv4: fix the reusing of routing cache entries
>
> compare_keys and ip_route_input_common rely on
> rt_oif for distinguishing of input and output routes
> with same keys values. But sometimes the input route has
> also same hash chain (keyed by iif != 0) with the output
> routes (keyed by orig_oif=0). Problem visible if running
> with small number of rhash_entries.
>
> Fix them to use rt_route_iif instead. By this way
> input route can not be returned to users that request
> output route.
>
> The patch fixes the ip_rt_bug errors that were
> reported in ip_local_out context, mostly for 255.255.255.255
> destinations.
>
> Signed-off-by: Julian Anastasov<ja@ssi.bg>
> Signed-off-by: David S. Miller<davem@davemloft.net>
>
> diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> index e3dec1c..cb7efe0 100644
> --- a/net/ipv4/route.c
> +++ b/net/ipv4/route.c
> @@ -731,6 +731,7 @@ static inline int compare_keys(struct rtable *rt1, struct rtable *rt2)
> ((__force u32)rt1->rt_key_src ^ (__force u32)rt2->rt_key_src) |
> (rt1->rt_mark ^ rt2->rt_mark) |
> (rt1->rt_key_tos ^ rt2->rt_key_tos) |
> + (rt1->rt_route_iif ^ rt2->rt_route_iif) |
> (rt1->rt_oif ^ rt2->rt_oif) |
> (rt1->rt_iif ^ rt2->rt_iif)) == 0;
> }
> @@ -2321,8 +2322,8 @@ int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
> if ((((__force u32)rth->rt_key_dst ^ (__force u32)daddr) |
> ((__force u32)rth->rt_key_src ^ (__force u32)saddr) |
> (rth->rt_iif ^ iif) |
> - rth->rt_oif |
> (rth->rt_key_tos ^ tos)) == 0&&
> + rt_is_input_route(rth)&&
> rth->rt_mark == skb->mark&&
> net_eq(dev_net(rth->dst.dev), net)&&
> !rt_is_expired(rth)) {
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: ip_rt_bug: 10.0.0.52 -> 255.255.255.255, ?
2011-08-15 5:55 ` Justin P. Mattock
@ 2011-08-15 5:56 ` David Miller
2011-08-15 6:09 ` Justin P. Mattock
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2011-08-15 5:56 UTC (permalink / raw)
To: justinmattock; +Cc: linux-kernel, linux-wireless, netdev
From: "Justin P. Mattock" <justinmattock@gmail.com>
Date: Sun, 14 Aug 2011 22:55:02 -0700
> Oh.. guess I will wait for those to be put into the Mainline
> then. Thanks for the info!
It is in mainline.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: ip_rt_bug: 10.0.0.52 -> 255.255.255.255, ?
2011-08-15 5:56 ` David Miller
@ 2011-08-15 6:09 ` Justin P. Mattock
0 siblings, 0 replies; 4+ messages in thread
From: Justin P. Mattock @ 2011-08-15 6:09 UTC (permalink / raw)
To: David Miller; +Cc: linux-kernel, linux-wireless, netdev
On 08/14/2011 10:56 PM, David Miller wrote:
> From: "Justin P. Mattock"<justinmattock@gmail.com>
> Date: Sun, 14 Aug 2011 22:55:02 -0700
>
>> Oh.. guess I will wait for those to be put into the Mainline
>> then. Thanks for the info!
>
> It is in mainline.
>
alright.. I see it now. I pulled on thurs/fri but never went any further
with the build after that. will clean and build when I get a chance and
run it.
Thanks again!
Justin P. Mattock
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-15 6:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <4E4898F5.8050605@gmail.com>
2011-08-15 5:45 ` ip_rt_bug: 10.0.0.52 -> 255.255.255.255, ? David Miller
2011-08-15 5:55 ` Justin P. Mattock
2011-08-15 5:56 ` David Miller
2011-08-15 6:09 ` Justin P. Mattock
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).