| Message ID | ee75faa926b2446b8302ee5fc30e129d2df73b90.1732810228.git.pabeni@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f6d7695b5ae22092fa2cc42529bb7462f7e0c4ad |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ipmr: fix build with clang and DEBUG_NET disabled. | expand |
On 11/28/24 17:18, Paolo Abeni wrote: > Sasha reported a build issue in ipmr:: > > net/ipv4/ipmr.c:320:13: error: function 'ipmr_can_free_table' is not \ > needed and will not be emitted \ > [-Werror,-Wunneeded-internal-declaration] > 320 | static bool ipmr_can_free_table(struct net *net) > > Apparently clang is too smart with BUILD_BUG_ON_INVALID(), let's > fallback to a plain WARN_ON_ONCE(). > > Reported-by: Sasha Levin <sashal@kernel.org> > Closes: https://qa-reports.linaro.org/lkft/sashal-linus-next/build/v6.11-25635-g6813e2326f1e/testrun/26111580/suite/build/test/clang-nightly-lkftconfig/details/ > Fixes: 11b6e701bce9 ("ipmr: add debug check for mr table cleanup") > Signed-off-by: Paolo Abeni <pabeni@redhat.com> Given the issue is blocking today's PR, unless someone screams very loud and very soon, I'm going to apply this fix in matter of minutes. Thanks, Paolo
Hello: This patch was applied to netdev/net.git (main) by Paolo Abeni <pabeni@redhat.com>: On Thu, 28 Nov 2024 17:18:04 +0100 you wrote: > Sasha reported a build issue in ipmr:: > > net/ipv4/ipmr.c:320:13: error: function 'ipmr_can_free_table' is not \ > needed and will not be emitted \ > [-Werror,-Wunneeded-internal-declaration] > 320 | static bool ipmr_can_free_table(struct net *net) > > [...] Here is the summary with links: - [net] ipmr: fix build with clang and DEBUG_NET disabled. https://git.kernel.org/netdev/net/c/f6d7695b5ae2 You are awesome, thank you!
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 383ea8b91cc7..c5b8ec5c0a8c 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -437,7 +437,7 @@ static void ipmr_free_table(struct mr_table *mrt) { struct net *net = read_pnet(&mrt->net); - DEBUG_NET_WARN_ON_ONCE(!ipmr_can_free_table(net)); + WARN_ON_ONCE(!ipmr_can_free_table(net)); timer_shutdown_sync(&mrt->ipmr_expire_timer); mroute_clean_tables(mrt, MRT_FLUSH_VIFS | MRT_FLUSH_VIFS_STATIC | diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 4147890fe98f..7f1902ac3586 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -416,7 +416,7 @@ static void ip6mr_free_table(struct mr_table *mrt) { struct net *net = read_pnet(&mrt->net); - DEBUG_NET_WARN_ON_ONCE(!ip6mr_can_free_table(net)); + WARN_ON_ONCE(!ip6mr_can_free_table(net)); timer_shutdown_sync(&mrt->ipmr_expire_timer); mroute_clean_tables(mrt, MRT6_FLUSH_MIFS | MRT6_FLUSH_MIFS_STATIC |
Sasha reported a build issue in ipmr:: net/ipv4/ipmr.c:320:13: error: function 'ipmr_can_free_table' is not \ needed and will not be emitted \ [-Werror,-Wunneeded-internal-declaration] 320 | static bool ipmr_can_free_table(struct net *net) Apparently clang is too smart with BUILD_BUG_ON_INVALID(), let's fallback to a plain WARN_ON_ONCE(). Reported-by: Sasha Levin <sashal@kernel.org> Closes: https://qa-reports.linaro.org/lkft/sashal-linus-next/build/v6.11-25635-g6813e2326f1e/testrun/26111580/suite/build/test/clang-nightly-lkftconfig/details/ Fixes: 11b6e701bce9 ("ipmr: add debug check for mr table cleanup") Signed-off-by: Paolo Abeni <pabeni@redhat.com> --- net/ipv4/ipmr.c | 2 +- net/ipv6/ip6mr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)