Re: [PATCH] x86/cfi: mark cfi_debug as __maybe_unused

From: Peter Zijlstra

Date: Thu Nov 19 2026 - 04:11:09 EST


On Thu, Nov 19, 2026 at 09:35:30AM +0330, Ali Nasrollahi wrote:
> On 26/11/17 07:35PM, Peter Zijlstra wrote:
> > On Mon, Nov 16, 2026 at 09:00:27PM +0330, Ali Nasrollahi wrote:
> > > When CONFIG_FINEIBT is disabled, cfi_debug is never read, but
> > > alternative_instructions() still resets it after calling
> > > __apply_fineibt(). Clang 23 diagnoses this as -Wunused-but-set-global
> > > with W=1, causing a build failure when CONFIG_WERROR=y. Mark cfi_debug
> > > as __maybe_unused to account for configurations without FineIBT.
> > >
> > > Signed-off-by: Ali Nasrollahi <A.Nasrolahi01@xxxxxxxxx>
> >
> > Does something like so also work?
> >
> > ---
> > diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
> > index efbc11f8c336..9bfc36566e17 100644
> > --- a/arch/x86/kernel/alternative.c
> > +++ b/arch/x86/kernel/alternative.c
> > @@ -1195,9 +1195,9 @@ void __init_or_module apply_seal_endbr(s32 *start, s32 *end) { }
> > #endif
> >
> > enum cfi_mode cfi_mode __ro_after_init = __CFI_DEFAULT;
> > -static bool cfi_debug __ro_after_init;
> >
> > #ifdef CONFIG_FINEIBT_BHI
> > +static bool cfi_debug __ro_after_init;
> > bool cfi_bhi __ro_after_init = false;
> > #endif
> >
> > @@ -1894,6 +1894,7 @@ static void __init_or_module __apply_fineibt(s32 *start_retpoline, s32 *end_retp
> > break;
> > }
> >
> > + cfi_debug = false;
> > err:
> > pr_err("Something went horribly wrong trying to rewrite the CFI implementation.\n");
> > }
> > @@ -2281,7 +2282,6 @@ void __init alternative_instructions(void)
> >
> > __apply_fineibt(__retpoline_sites, __retpoline_sites_end,
> > __cfi_sites, __cfi_sites_end, true);
> > - cfi_debug = false;
> >
> > /*
> > * Rewrite the retpolines, must be done before alternatives since
>
> Thank you for your review.
>
> Regarding this:
>
> > #ifdef CONFIG_FINEIBT_BHI
> > +static bool cfi_debug __ro_after_init;
> > bool cfi_bhi __ro_after_init = false;
> > #endif
>
> FINEIBT can be enabled while FINEIBT_BHI is disabled, for example when

Yeah, no, that's me not being able to read. I mean to stick that under
CONFIG_FINEIBT.