* [PATCH] net: bridge: fix static key check
@ 2026-01-27 10:19 Martin Kaiser
2026-01-27 11:29 ` Florian Westphal
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Martin Kaiser @ 2026-01-27 10:19 UTC (permalink / raw)
To: Nikolay Aleksandrov, Ido Schimmel
Cc: bridge, netdev, linux-kernel, Martin Kaiser
Fix the check if netfilter's static keys are available. netfilter defines
and exports static keys if CONFIG_JUMP_LABEL is enabled. (HAVE_JUMP_LABEL
is never defined.)
Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path")
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
net/bridge/br_input.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index e355a15bf5ab..1405f1061a54 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -274,7 +274,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb)
int ret;
net = dev_net(skb->dev);
-#ifdef HAVE_JUMP_LABEL
+#ifdef CONFIG_JUMP_LABEL
if (!static_key_false(&nf_hooks_needed[NFPROTO_BRIDGE][NF_BR_PRE_ROUTING]))
goto frame_finish;
#endif
--
2.43.7
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] net: bridge: fix static key check
2026-01-27 10:19 [PATCH] net: bridge: fix static key check Martin Kaiser
@ 2026-01-27 11:29 ` Florian Westphal
2026-01-28 16:08 ` Nikolay Aleksandrov
2026-01-29 3:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Florian Westphal @ 2026-01-27 11:29 UTC (permalink / raw)
To: Martin Kaiser
Cc: Nikolay Aleksandrov, Ido Schimmel, bridge, netdev, linux-kernel
Martin Kaiser <martin@kaiser.cx> wrote:
> Fix the check if netfilter's static keys are available. netfilter defines
> and exports static keys if CONFIG_JUMP_LABEL is enabled. (HAVE_JUMP_LABEL
> is never defined.)
>
> Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path")
Reviewed-by: Florian Westphal <fw@strlen.de>
@net maintainers: feel free to take this directly.
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] net: bridge: fix static key check
2026-01-27 10:19 [PATCH] net: bridge: fix static key check Martin Kaiser
2026-01-27 11:29 ` Florian Westphal
@ 2026-01-28 16:08 ` Nikolay Aleksandrov
2026-01-29 3:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Nikolay Aleksandrov @ 2026-01-28 16:08 UTC (permalink / raw)
To: Martin Kaiser, Ido Schimmel; +Cc: bridge, netdev, linux-kernel
On 27/01/2026 12:19, Martin Kaiser wrote:
> Fix the check if netfilter's static keys are available. netfilter defines
> and exports static keys if CONFIG_JUMP_LABEL is enabled. (HAVE_JUMP_LABEL
> is never defined.)
>
> Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path")
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> net/bridge/br_input.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
> index e355a15bf5ab..1405f1061a54 100644
> --- a/net/bridge/br_input.c
> +++ b/net/bridge/br_input.c
> @@ -274,7 +274,7 @@ static int nf_hook_bridge_pre(struct sk_buff *skb, struct sk_buff **pskb)
> int ret;
>
> net = dev_net(skb->dev);
> -#ifdef HAVE_JUMP_LABEL
> +#ifdef CONFIG_JUMP_LABEL
> if (!static_key_false(&nf_hooks_needed[NFPROTO_BRIDGE][NF_BR_PRE_ROUTING]))
> goto frame_finish;
> #endif
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] net: bridge: fix static key check
2026-01-27 10:19 [PATCH] net: bridge: fix static key check Martin Kaiser
2026-01-27 11:29 ` Florian Westphal
2026-01-28 16:08 ` Nikolay Aleksandrov
@ 2026-01-29 3:40 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2026-01-29 3:40 UTC (permalink / raw)
To: Martin Kaiser; +Cc: razor, idosch, bridge, netdev, linux-kernel
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 27 Jan 2026 11:19:23 +0100 you wrote:
> Fix the check if netfilter's static keys are available. netfilter defines
> and exports static keys if CONFIG_JUMP_LABEL is enabled. (HAVE_JUMP_LABEL
> is never defined.)
>
> Fixes: 971502d77faa ("bridge: netfilter: unroll NF_HOOK helper in bridge input path")
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
>
> [...]
Here is the summary with links:
- net: bridge: fix static key check
https://git.kernel.org/netdev/net/c/cc0cf10fdaea
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-01-29 3:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-27 10:19 [PATCH] net: bridge: fix static key check Martin Kaiser
2026-01-27 11:29 ` Florian Westphal
2026-01-28 16:08 ` Nikolay Aleksandrov
2026-01-29 3:40 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox