lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <1410116703.11872.55.camel@edumazet-glaptop2.roam.corp.google.com> Date: Sun, 07 Sep 2014 12:05:03 -0700 From: Eric Dumazet <eric.dumazet@...il.com> To: David Miller <davem@...emloft.net> Cc: Nicolas Dichtel <nicolas.dichtel@...nd.com>, therbert@...gle.com, alexander.h.duyck@...el.com, netdev@...r.kernel.org Subject: [PATCH net] ipv6: refresh rt6i_genid in ip6_pol_route() From: Eric Dumazet <edumazet@...gle.com> While tracking IPv6 poor performance, I found that IPv6 early demux was broken in recent kernels. perf profiles show inet6_sk_rx_dst_set() being called for every incoming TCP segment : 20.95% netserver [kernel.kallsyms] [k] dst_release 19.33% netserver [kernel.kallsyms] [k] ip6_pol_route 11.75% netserver [kernel.kallsyms] [k] inet6_sk_rx_dst_set 3.72% netserver [kernel.kallsyms] [k] ip6_input_finish Regression came in linux-3.6 with commit 6f3118b571b8 ("ipv6: use net->rt_genid to check dst validity") When a route found in ip6_pol_route() is cloned (either using rt6_alloc_cow() or rt6_alloc_clone()), copy gets an updated rt6i_genid. But when original route is selected, we need to refresh its rt6i_genid that could be obsolete. If we do not refresh rt6i_genid, ip6_dst_check() will fail. Signed-off-by: Eric Dumazet <edumazet@...gle.com> Fixes: 6f3118b571b8 ("ipv6: use net->rt_genid to check dst validity") Cc: Nicolas Dichtel <nicolas.dichtel@...nd.com> --- net/ipv6/route.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index f23fbd28a501..1e76c3c5b87b 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -944,13 +944,20 @@ restart: dst_hold(&rt->dst); read_unlock_bh(&table->tb6_lock); - if (!(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY))) + if (!(rt->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY))) { nrt = rt6_alloc_cow(rt, &fl6->daddr, &fl6->saddr); - else if (!(rt->dst.flags & DST_HOST)) + } else if (!(rt->dst.flags & DST_HOST)) { nrt = rt6_alloc_clone(rt, &fl6->daddr); - else - goto out2; + } else { + u32 genid = rt_genid_ipv6(net); + /* We must refresh rt6i_genid, but only if needed + * to avoid false sharing. + */ + if (rt->rt6i_genid != genid) + rt->rt6i_genid = genid; + goto out2; + } ip6_rt_put(rt); rt = nrt ? : net->ipv6.ip6_null_entry; -- 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