From: Steffen Klassert <steffen.klassert@secunet•com>
To: Yang Yingliang <yangyingliang@huawei•com>
Cc: netdev <netdev@vger•kernel.org>, "David S. Miller" <davem@davemloft•net>
Subject: [PATCH RFC 2/2] ipv6: Extend the route lookups to low priority metrics.
Date: Wed, 28 Jan 2015 13:12:57 +0100 [thread overview]
Message-ID: <20150128121256.GO13046@secunet.com> (raw)
In-Reply-To: <20150128121026.GM13046@secunet.com>
We search only for routes with highest prioriy metric in
find_rr_leaf(). However if one of these routes is marked
as invalid, we may fail to find a route even if there is
a appropriate route with lower priority. Then we loose
connectivity until the garbage collector deletes the
invalid route. This typically happens if a host route
expires afer a pmtu event. Fix this by searching also
for routes with a lower priority metric.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet•com>
---
net/ipv6/route.c | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 3e864e7..ce354c9 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -654,15 +654,33 @@ static struct rt6_info *find_rr_leaf(struct fib6_node *fn,
u32 metric, int oif, int strict,
bool *do_rr)
{
- struct rt6_info *rt, *match;
+ struct rt6_info *rt, *match, *cont;
int mpri = -1;
match = NULL;
- for (rt = rr_head; rt && rt->rt6i_metric == metric;
- rt = rt->dst.rt6_next)
+ cont = NULL;
+ for (rt = rr_head; rt; rt = rt->dst.rt6_next) {
+ if (rt->rt6i_metric != metric) {
+ cont = rt;
+ break;
+ }
+
+ match = find_match(rt, oif, strict, &mpri, match, do_rr);
+ }
+
+ for (rt = fn->leaf; rt && rt != rr_head; rt = rt->dst.rt6_next) {
+ if (rt->rt6i_metric != metric) {
+ cont = rt;
+ break;
+ }
+
match = find_match(rt, oif, strict, &mpri, match, do_rr);
- for (rt = fn->leaf; rt && rt != rr_head && rt->rt6i_metric == metric;
- rt = rt->dst.rt6_next)
+ }
+
+ if (match || !cont)
+ return match;
+
+ for (rt = cont; rt; rt = rt->dst.rt6_next)
match = find_match(rt, oif, strict, &mpri, match, do_rr);
return match;
--
1.9.1
next prev parent reply other threads:[~2015-01-28 20:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 12:58 A problem about ICMP packet-too-big message handler Yang Yingliang
2015-01-28 5:19 ` Martin Lau
2015-01-28 6:46 ` Yang Yingliang
2015-01-28 12:45 ` Eric Dumazet
2015-01-29 1:04 ` Yang Yingliang
2015-01-28 8:42 ` Hannes Frederic Sowa
2015-01-28 10:07 ` Yang Yingliang
2015-01-28 12:10 ` Steffen Klassert
2015-01-28 12:11 ` [PATCH RFC 1/2] ipv6: Fix after pmtu events dissapearing host routes Steffen Klassert
2015-01-29 10:26 ` Hannes Frederic Sowa
2015-01-29 10:44 ` Steffen Klassert
2015-02-05 23:56 ` Martin Lau
2015-02-09 10:26 ` Steffen Klassert
2015-03-09 9:00 ` Steffen Klassert
2015-01-28 12:12 ` Steffen Klassert [this message]
2015-01-29 3:16 ` A problem about ICMP packet-too-big message handler Yang Yingliang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150128121256.GO13046@secunet.com \
--to=steffen.klassert@secunet$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=yangyingliang@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox