| Message ID | 20231219030742.25715-1-dsahern@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5a78a8121c4d8e37035274c094e3af15fb79f004 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net/ipv6: Remove gc_link warn on in fib6_info_release | expand |
On Tue, Dec 19, 2023 at 4:07 AM David Ahern <dsahern@kernel.org> wrote: > > A revert of > 3dec89b14d37 ("net/ipv6: Remove expired routes with a separated list of routes") > was sent for net-next. Revert the remainder of 5a08d0065a915 > which added a warn on if a fib entry is still on the gc_link list > to avoid compile failures when net is merged to net-next > > Signed-off-by: David Ahern <dsahern@kernel.org> Reviewed-by: Eric Dumazet <edumazet@google.com> Thanks !
On Tue, 2023-12-19 at 09:34 +0100, Eric Dumazet wrote: > On Tue, Dec 19, 2023 at 4:07 AM David Ahern <dsahern@kernel.org> wrote: > > > > A revert of > > 3dec89b14d37 ("net/ipv6: Remove expired routes with a separated list of routes") > > was sent for net-next. Revert the remainder of 5a08d0065a915 > > which added a warn on if a fib entry is still on the gc_link list > > to avoid compile failures when net is merged to net-next > > > > Signed-off-by: David Ahern <dsahern@kernel.org> > > Reviewed-by: Eric Dumazet <edumazet@google.com> Oops, I notice a bit too late I should have processed this one before merging back net into net-next. I'll squash this change into the merge commit to preserve bisectability. Cheers, Paolo
On Thu, 2023-12-21 at 22:11 +0100, Paolo Abeni wrote: > On Tue, 2023-12-19 at 09:34 +0100, Eric Dumazet wrote: > > On Tue, Dec 19, 2023 at 4:07 AM David Ahern <dsahern@kernel.org> wrote: > > > > > > A revert of > > > 3dec89b14d37 ("net/ipv6: Remove expired routes with a separated list of routes") > > > was sent for net-next. Revert the remainder of 5a08d0065a915 > > > which added a warn on if a fib entry is still on the gc_link list > > > to avoid compile failures when net is merged to net-next > > > > > > Signed-off-by: David Ahern <dsahern@kernel.org> > > > > Reviewed-by: Eric Dumazet <edumazet@google.com> > > Oops, I notice a bit too late I should have processed this one before > merging back net into net-next. Actually is not too late. I'll apply this commit just before merging back net. Sorry for the noise. /P
Hello: This patch was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Mon, 18 Dec 2023 20:07:42 -0700 you wrote: > A revert of > 3dec89b14d37 ("net/ipv6: Remove expired routes with a separated list of routes") > was sent for net-next. Revert the remainder of 5a08d0065a915 > which added a warn on if a fib entry is still on the gc_link list > to avoid compile failures when net is merged to net-next > > Signed-off-by: David Ahern <dsahern@kernel.org> > > [...] Here is the summary with links: - [net-next] net/ipv6: Remove gc_link warn on in fib6_info_release https://git.kernel.org/netdev/net-next/c/5a78a8121c4d You are awesome, thank you!
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 95ed495c3a40..1ba9f4ddf2f6 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -328,10 +328,8 @@ static inline bool fib6_info_hold_safe(struct fib6_info *f6i) static inline void fib6_info_release(struct fib6_info *f6i) { - if (f6i && refcount_dec_and_test(&f6i->fib6_ref)) { - DEBUG_NET_WARN_ON_ONCE(!hlist_unhashed(&f6i->gc_link)); + if (f6i && refcount_dec_and_test(&f6i->fib6_ref)) call_rcu(&f6i->rcu, fib6_info_destroy_rcu); - } } enum fib6_walk_state {
A revert of 3dec89b14d37 ("net/ipv6: Remove expired routes with a separated list of routes") was sent for net-next. Revert the remainder of 5a08d0065a915 which added a warn on if a fib entry is still on the gc_link list to avoid compile failures when net is merged to net-next Signed-off-by: David Ahern <dsahern@kernel.org> --- include/net/ip6_fib.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)