From: Liam Smith Currently, fib_lookup() returns -ENETUNREACH for both a routing lookup miss and an unreachable rule. These two cases must be distinguishable to facilitate a fallback that only occurs when there's a miss. Add a new FIB_LOOKUP flag that instructs lookups to return -ESRCH when there's a miss. Signed-off-by: Liam Smith --- include/net/fib_rules.h | 1 + include/net/ip_fib.h | 6 +++--- net/ipv4/fib_rules.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index c6b94790fa81..df1cb39ddf92 100644 --- a/include/net/fib_rules.h +++ b/include/net/fib_rules.h @@ -59,6 +59,7 @@ struct fib_lookup_arg { int flags; #define FIB_LOOKUP_NOREF 1 #define FIB_LOOKUP_IGNORE_LINKSTATE 2 +#define FIB_LOOKUP_REPORT_MISS 4 }; struct fib_rules_ops { diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 92f4eb8b86d7..d0b4f261585a 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -318,7 +318,7 @@ static inline int fib_lookup(struct net *net, const struct flowi4 *flp, struct fib_result *res, unsigned int flags) { struct fib_table *tb; - int err = -ENETUNREACH; + int err = -EAGAIN; rcu_read_lock(); @@ -327,7 +327,7 @@ static inline int fib_lookup(struct net *net, const struct flowi4 *flp, err = fib_table_lookup(tb, flp, res, flags | FIB_LOOKUP_NOREF); if (err == -EAGAIN) - err = -ENETUNREACH; + err = (flags & FIB_LOOKUP_REPORT_MISS) ? -ESRCH : -ENETUNREACH; rcu_read_unlock(); @@ -398,7 +398,7 @@ static inline int fib_lookup(struct net *net, struct flowi4 *flp, err = fib_table_lookup(tb, flp, res, flags); if (err == -EAGAIN) - err = -ENETUNREACH; + err = (flags & FIB_LOOKUP_REPORT_MISS) ? -ESRCH : -ENETUNREACH; out: rcu_read_unlock(); diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index 060501b376a8..3d7dcb8d0865 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -101,7 +101,7 @@ int __fib_lookup(struct net *net, struct flowi4 *flp, res->tclassid = 0; #endif - if (err == -ESRCH) + if (err == -ESRCH && !(flags & FIB_LOOKUP_REPORT_MISS)) err = -ENETUNREACH; return err; -- 2.47.3