| Message ID | 20130117065500.GG18940@secunet.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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(-)