Re: [PATCH net-next v3 2/3] ipv6: add ip6_dst_lookup_flow_cookie
From: Ralf Lici
Date: Fri Nov 20 2026 - 03:24:24 EST
Hi David,
On Thu, 19 Nov 2026 19:13:14 -0700, David Ahern <dsahern@xxxxxxxxxx> wrote:
> On 11/17/26 2:21 AM, Ralf Lici wrote:
> > @@ -1300,6 +1299,54 @@ struct dst_entry *ip6_dst_lookup_flow(struct net *net, const struct sock *sk, st
> > }
> > EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow);
> >
> > +/**
> > + * ip6_dst_lookup_flow_cookie - perform route lookup on flow with ipsec
>
> what makes this an ipsec lookup?
>
Like ip6_dst_lookup_flow, which it wraps, it calls xfrm_lookup_route
after the route lookup, so the returned dst can be an xfrm bundle, and
the generation check also covers xfrm policy insertion, which advances
the IPv6 generation through rt_genid_bump_ipv6.
The summary line was inherited from ip6_dst_lookup_flow but I'll reword
it in v4 to say route and xfrm policy lookup.
> > + * and return the matching dst cookie
> > + * @net: Network namespace to perform lookup in
> > + * @sk: socket which provides route info
> > + * @fl6: flow to lookup
> > + * @final_dst: final destination address for ipsec lookup
> > + * @cookie: where to store the cookie for the returned dst
> > + *
> > + * Same as ip6_dst_lookup_flow, but also returns the cookie describing
> > + * the routing state the dst was obtained from. A caller caching the dst
> > + * should use this cookie when validating it with dst_check. If the
> > + * IPv6 FIB changed during the lookup, a route dst no longer validates
> > + * with it. An xfrm bundle is validated by xfrm and ignores the cookie.
> > + *
> > + * Return: a valid dst pointer on success or a pointer encoded error code.
> > + */
> > +struct dst_entry *ip6_dst_lookup_flow_cookie(struct net *net,
> > + const struct sock *sk,
> > + struct flowi6 *fl6,
> > + const struct in6_addr *final_dst,
> > + u32 *cookie)
> > +{
> > + const struct rt6_info *rt;
> > + struct dst_entry *dst;
> > + int gen0, gen1;
> > +
> > + gen0 = rt_genid_ipv6(net);
> > + /* read the generation before looking at the FIB or xfrm policies */
> > + smp_rmb();
> > +
> > + dst = ip6_dst_lookup_flow(net, sk, fl6, final_dst);
> > + if (IS_ERR(dst))
> > + return dst;
> > +
> > + rt = dst_rt6_info(dst);
> > + *cookie = rt->sernum ? gen0 : rt6_get_cookie(rt);
> > +
> > + /* keep the FIB and cookie reads before the final generation read */
> > + smp_rmb();
> > + gen1 = rt_genid_ipv6(net);
> > + if (unlikely(gen0 != gen1))
> > + *cookie = 0;
> > +
> > + return dst;
> > +}
> > +EXPORT_SYMBOL_GPL(ip6_dst_lookup_flow_cookie);
>
> I think this can be a standalone patch introducing a new API
>
Ok.
> > +
> > /**
> > * ip6_sk_dst_lookup_flow - perform socket cached route lookup on flow
> > * @sk: socket which provides the dst cache and route info
> > diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> > index cc505817399b..c54844b83828 100644
> > --- a/net/ipv6/route.c
> > +++ b/net/ipv6/route.c
> > @@ -2817,7 +2817,7 @@ INDIRECT_CALLABLE_SCOPE struct dst_entry *ip6_dst_check(struct dst_entry *dst,
> > rt = dst_rt6_info(dst);
> >
> > if (rt->sernum)
> > - return rt6_is_valid(rt) ? dst : NULL;
> > + return (rt6_is_valid(rt) && cookie == rt->sernum) ? dst : NULL;
>
> unrelated change to both the new API and the ordering changes below. It
> deserves to be a separate patch with its own clear explanation of why.
>
It is the validation side of the new API for nexthop-object dsts: the
helper returns the generation sampled before the lookup as their cookie,
and ip6_dst_check currently ignores the cookie when rt->sernum is set.
Existing callers pass rt6_get_cookie, which returns rt->sernum for these
dsts, so their behavior does not change. I'll move it to its own patch
with that explanation.
> >
> > rcu_read_lock();
> >
> > @@ -4911,8 +4911,8 @@ static int fib6_ifup(struct fib6_info *rt, void *p_arg)
> > if (rt != net->ipv6.fib6_null_entry && !rt->nh &&
> > rt->fib6_nh->fib_nh_dev == arg->dev) {
> > rt->fib6_nh->fib_nh_flags &= ~arg->nh_flags;
> > - fib6_update_sernum_upto_root(net, rt);
> > rt6_multipath_rebalance(rt);
> > + fib6_update_sernum_upto_root(net, rt);
> > }
> >
> > return 0;
> > @@ -5015,8 +5015,8 @@ static int fib6_ifdown(struct fib6_info *rt, void *p_arg)
> > }
> > rt6_multipath_nh_flags_set(rt, dev, RTNH_F_DEAD |
> > RTNH_F_LINKDOWN);
> > - fib6_update_sernum(net, rt);
> > rt6_multipath_rebalance(rt);
> > + fib6_update_sernum(net, rt);
> > }
> > return -2;
> > case NETDEV_CHANGE:
> > @@ -5024,8 +5024,8 @@ static int fib6_ifdown(struct fib6_info *rt, void *p_arg)
> > rt->fib6_flags & (RTF_LOCAL | RTF_ANYCAST))
> > break;
> > rt->fib6_nh->fib_nh_flags |= RTNH_F_LINKDOWN;
> > - fib6_update_sernum(net, rt);
> > rt6_multipath_rebalance(rt);
> > + fib6_update_sernum(net, rt);
> > break;
> > }
> >
>
> And then these ordering changes need to be separate patch with an
> explanation.
>
>
Ok. v4 will be:
1. ipv6: stamp the default route node with a fresh serial on link
failure
2. ipv6: advance the serial after rebalancing in fib6_ifup and
fib6_ifdown
3. ipv6: validate the cookie of nexthop-object dsts in ip6_dst_check
4. ipv6: add ip6_dst_lookup_flow_cookie
5. ipv6: use lookup cookies in selected socket dst cache paths
so that the requirements are in place before the API and its users.
Thanks for the review.
--
Ralf Lici
Mandelbit Srl