| Message ID | 013c220c347b63c0458332898709edc0b469361d.1508261949.git.pabeni@redhat.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | ipv6: fixes for RTF_CACHE entries | expand |
On Tue, Oct 17, 2017 at 10:40 AM, Paolo Abeni <pabeni@redhat.com> wrote: > After the commit Fixes: 2b760fcf5cfb ("ipv6: hook up exception > table to store dst cache"), the fib6 gc is not started after > the creation of a RTF_CACHE via a redirect or pmtu update, since > fib6_add() isn't invoked anymore for such dsts. > > We need the fib6 gc to run periodically to clean the RTF_CACHE, > or the dst will stay there forever. > > Fix it by explicitly calling fib6_force_start_gc() on successful > exception creation. gc_args->more accounting will ensure that > the gc timer will run for whatever time needed to properly > clean the table. > > Fixes: 2b760fcf5cfb ("ipv6: hook up exception table to store dst cache") > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > --- Acked-by: Wei Wang <weiwan@google.com> Totally true. Thanks for catching this. > net/ipv6/route.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > index 5bb53dbd4fd3..8b25a31b6b03 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -1340,8 +1340,10 @@ static int rt6_insert_exception(struct rt6_info *nrt, > spin_unlock_bh(&rt6_exception_lock); > > /* Update fn->fn_sernum to invalidate all cached dst */ > - if (!err) > + if (!err) { > fib6_update_sernum(ort); > + fib6_force_start_gc(net); > + } > > return err; > } > -- > 2.13.6 >
On Tue, Oct 17, 2017 at 06:35:13PM +0000, Wei Wang wrote: > On Tue, Oct 17, 2017 at 10:40 AM, Paolo Abeni <pabeni@redhat.com> wrote: > > After the commit Fixes: 2b760fcf5cfb ("ipv6: hook up exception > > table to store dst cache"), the fib6 gc is not started after > > the creation of a RTF_CACHE via a redirect or pmtu update, since > > fib6_add() isn't invoked anymore for such dsts. Nice catch! Acked-by: Martin KaFai Lau <kafai@fb.com> > > > > We need the fib6 gc to run periodically to clean the RTF_CACHE, > > or the dst will stay there forever. > > > > Fix it by explicitly calling fib6_force_start_gc() on successful > > exception creation. gc_args->more accounting will ensure that > > the gc timer will run for whatever time needed to properly > > clean the table. > > > > Fixes: 2b760fcf5cfb ("ipv6: hook up exception table to store dst cache") > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > > --- > Acked-by: Wei Wang <weiwan@google.com> > > Totally true. Thanks for catching this. > > > net/ipv6/route.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/net/ipv6/route.c b/net/ipv6/route.c > > index 5bb53dbd4fd3..8b25a31b6b03 100644 > > --- a/net/ipv6/route.c > > +++ b/net/ipv6/route.c > > @@ -1340,8 +1340,10 @@ static int rt6_insert_exception(struct rt6_info *nrt, > > spin_unlock_bh(&rt6_exception_lock); > > > > /* Update fn->fn_sernum to invalidate all cached dst */ > > - if (!err) > > + if (!err) { > > fib6_update_sernum(ort); > > + fib6_force_start_gc(net); > > + } > > > > return err; > > } > > -- > > 2.13.6 > >
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 5bb53dbd4fd3..8b25a31b6b03 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1340,8 +1340,10 @@ static int rt6_insert_exception(struct rt6_info *nrt, spin_unlock_bh(&rt6_exception_lock); /* Update fn->fn_sernum to invalidate all cached dst */ - if (!err) + if (!err) { fib6_update_sernum(ort); + fib6_force_start_gc(net); + } return err; }
After the commit Fixes: 2b760fcf5cfb ("ipv6: hook up exception table to store dst cache"), the fib6 gc is not started after the creation of a RTF_CACHE via a redirect or pmtu update, since fib6_add() isn't invoked anymore for such dsts. We need the fib6 gc to run periodically to clean the RTF_CACHE, or the dst will stay there forever. Fix it by explicitly calling fib6_force_start_gc() on successful exception creation. gc_args->more accounting will ensure that the gc timer will run for whatever time needed to properly clean the table. Fixes: 2b760fcf5cfb ("ipv6: hook up exception table to store dst cache") Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/ipv6/route.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)