* [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu
@ 2013-01-17 6:55 Steffen Klassert
2013-01-17 6:58 ` [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes Steffen Klassert
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Steffen Klassert @ 2013-01-17 6:55 UTC (permalink / raw)
To: David Miller; +Cc: Julian Anastasov, timo.teras, luky-37, pupilla, netdev
The output route check was introduced with git commit 261663b0
(ipv4: Don't use the cached pmtu informations for input routes)
during times when we cached the pmtu informations on the
inetpeer. Now the pmtu informations are back in the routes,
so this check is obsolete. It also had some unwanted side effects,
as reported by Timo Teras and Lukas Tribus.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/ipv4/route.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 844a9ef..6e4a89c 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1120,7 +1120,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst)
if (!mtu || time_after_eq(jiffies, rt->dst.expires))
mtu = dst_metric_raw(dst, RTAX_MTU);
- if (mtu && rt_is_output_route(rt))
+ if (mtu)
return mtu;
mtu = dst->dev->mtu;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes
2013-01-17 6:55 [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu Steffen Klassert
@ 2013-01-17 6:58 ` Steffen Klassert
2013-01-17 8:40 ` David Miller
2013-01-17 8:41 ` Julian Anastasov
2013-01-17 8:35 ` [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu Timo Teras
2013-01-17 8:40 ` David Miller
2 siblings, 2 replies; 6+ messages in thread
From: Steffen Klassert @ 2013-01-17 6:58 UTC (permalink / raw)
To: David Miller; +Cc: Julian Anastasov, timo.teras, luky-37, pupilla, netdev
Routes with locked mtu should not use learned pmtu informations,
so do not update the pmtu on these routes.
Reported-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/ipv4/route.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 6e4a89c..259cbee 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -912,6 +912,9 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
struct dst_entry *dst = &rt->dst;
struct fib_result res;
+ if (dst_metric_locked(dst, RTAX_MTU))
+ return;
+
if (dst->dev->mtu < mtu)
return;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu
2013-01-17 6:55 [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu Steffen Klassert
2013-01-17 6:58 ` [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes Steffen Klassert
@ 2013-01-17 8:35 ` Timo Teras
2013-01-17 8:40 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Timo Teras @ 2013-01-17 8:35 UTC (permalink / raw)
To: Steffen Klassert; +Cc: David Miller, Julian Anastasov, luky-37, pupilla, netdev
On Thu, 17 Jan 2013 07:55:01 +0100 Steffen Klassert
<steffen.klassert@secunet.com> wrote:
> The output route check was introduced with git commit 261663b0
> (ipv4: Don't use the cached pmtu informations for input routes)
> during times when we cached the pmtu informations on the
> inetpeer. Now the pmtu informations are back in the routes,
> so this check is obsolete. It also had some unwanted side effects,
> as reported by Timo Teras and Lukas Tribus.
>
> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
> ---
Acked-by: Timo Teräs <timo.teras@iki.fi>
I think this should also go to stable queues which are applicable, since
the original commit caused CLAMPMSS and XFRM pmtu regressions.
The original thread of this is:
http://marc.info/?t=134208398500001&r=1&w=2
My original revert request is at:
http://marc.info/?l=linux-netdev&m=134242561624266&w=2
and additional reasoning at:
http://marc.info/?l=linux-netdev&m=134243626627716&w=2
Thanks,
Timo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu
2013-01-17 6:55 [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu Steffen Klassert
2013-01-17 6:58 ` [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes Steffen Klassert
2013-01-17 8:35 ` [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu Timo Teras
@ 2013-01-17 8:40 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-01-17 8:40 UTC (permalink / raw)
To: steffen.klassert; +Cc: ja, timo.teras, luky-37, pupilla, netdev
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 17 Jan 2013 07:55:01 +0100
> The output route check was introduced with git commit 261663b0
> (ipv4: Don't use the cached pmtu informations for input routes)
> during times when we cached the pmtu informations on the
> inetpeer. Now the pmtu informations are back in the routes,
> so this check is obsolete. It also had some unwanted side effects,
> as reported by Timo Teras and Lukas Tribus.
>
> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes
2013-01-17 6:58 ` [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes Steffen Klassert
@ 2013-01-17 8:40 ` David Miller
2013-01-17 8:41 ` Julian Anastasov
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2013-01-17 8:40 UTC (permalink / raw)
To: steffen.klassert; +Cc: ja, timo.teras, luky-37, pupilla, netdev
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 17 Jan 2013 07:58:10 +0100
> Routes with locked mtu should not use learned pmtu informations,
> so do not update the pmtu on these routes.
>
> Reported-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes
2013-01-17 6:58 ` [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes Steffen Klassert
2013-01-17 8:40 ` David Miller
@ 2013-01-17 8:41 ` Julian Anastasov
1 sibling, 0 replies; 6+ messages in thread
From: Julian Anastasov @ 2013-01-17 8:41 UTC (permalink / raw)
To: Steffen Klassert; +Cc: David Miller, timo.teras, luky-37, pupilla, netdev
Hello,
On Thu, 17 Jan 2013, Steffen Klassert wrote:
> Routes with locked mtu should not use learned pmtu informations,
> so do not update the pmtu on these routes.
>
> Reported-by: Julian Anastasov <ja@ssi.bg>
> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
> ---
> net/ipv4/route.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> index 6e4a89c..259cbee 100644
> --- a/net/ipv4/route.c
> +++ b/net/ipv4/route.c
> @@ -912,6 +912,9 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
> struct dst_entry *dst = &rt->dst;
> struct fib_result res;
>
> + if (dst_metric_locked(dst, RTAX_MTU))
> + return;
> +
> if (dst->dev->mtu < mtu)
> return;
>
> --
> 1.7.9.5
Thanks
--
Julian Anastasov <ja@ssi.bg>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-17 8:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-17 6:55 [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu Steffen Klassert
2013-01-17 6:58 ` [PATCH 2/2] ipv4: Don't update the pmtu on mtu locked routes Steffen Klassert
2013-01-17 8:40 ` David Miller
2013-01-17 8:41 ` Julian Anastasov
2013-01-17 8:35 ` [PATCH 1/2] ipv4: Remove output route check in ipv4_mtu Timo Teras
2013-01-17 8:40 ` David Miller
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).