[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1319360590.6180.75.camel@edumazet-laptop>
Date: Sun, 23 Oct 2011 11:03:10 +0200
From: Eric Dumazet <eric.dumazet@...il.com>
To: "Yan, Zheng" <zheng.z.yan@...el.com>
Cc: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"davem@...emloft.net" <davem@...emloft.net>,
Kim Phillips <kim.phillips@...escale.com>
Subject: Re: [PATCH] ipv4: fix ipsec forward performance regression
Le dimanche 23 octobre 2011 à 15:58 +0800, Yan, Zheng a écrit :
> There is bug in commit 5e2b61f(ipv4: Remove flowi from struct rtable).
> It makes xfrm4_fill_dst() modify wrong data structure.
>
> Signed-off-by: Zheng Yan <zheng.z.yan@...el.com>
> ---
> net/ipv4/xfrm4_policy.c | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
> index fc5368a..a0b4c5d 100644
> --- a/net/ipv4/xfrm4_policy.c
> +++ b/net/ipv4/xfrm4_policy.c
> @@ -79,13 +79,13 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
> struct rtable *rt = (struct rtable *)xdst->route;
> const struct flowi4 *fl4 = &fl->u.ip4;
>
> - rt->rt_key_dst = fl4->daddr;
> - rt->rt_key_src = fl4->saddr;
> - rt->rt_key_tos = fl4->flowi4_tos;
> - rt->rt_route_iif = fl4->flowi4_iif;
> - rt->rt_iif = fl4->flowi4_iif;
> - rt->rt_oif = fl4->flowi4_oif;
> - rt->rt_mark = fl4->flowi4_mark;
> + xdst->u.rt.rt_key_dst = fl4->daddr;
> + xdst->u.rt.rt_key_src = fl4->saddr;
> + xdst->u.rt.rt_key_tos = fl4->flowi4_tos;
> + xdst->u.rt.rt_route_iif = fl4->flowi4_iif;
> + xdst->u.rt.rt_iif = fl4->flowi4_iif;
> + xdst->u.rt.rt_oif = fl4->flowi4_oif;
> + xdst->u.rt.rt_mark = fl4->flowi4_mark;
>
> xdst->u.dst.dev = dev;
> dev_hold(dev);
Good catch, thanks !
Reported-by: Kim Phillips <kim.phillips@...escale.com>
Acked-by: Eric Dumazet <eric.dumazet@...il.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists