Re: [PATCH 6.1] x86/its: Fix build errors when CONFIG_MODULES=n

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Fri, May 16, 2025 at 01:42:37PM -0700, Pawan Gupta wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> commit 9f35e33144ae5377d6a8de86dd3bd4d995c6ac65 upstream.
> 
> Fix several build errors when CONFIG_MODULES=n, including the following:
> 
> ../arch/x86/kernel/alternative.c:195:25: error: incomplete definition of type 'struct module'
>   195 |         for (int i = 0; i < mod->its_num_pages; i++) {
> 
>   [ pawan: backport: Bring ITS dynamic thunk code under CONFIG_MODULES ]
> 
> Fixes: 872df34d7c51 ("x86/its: Use dynamic thunks for indirect branches")
> Cc: stable@vger.kernel.org
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> Acked-by: Dave Hansen <dave.hansen@intel.com>
> Tested-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
> ---
>  arch/x86/kernel/alternative.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
> index 44bff34f7d10cb6868ad079ca1cb87e458d3f91b..acf6fce287dc0804cfea0377f6f8714a68d10452 100644
> --- a/arch/x86/kernel/alternative.c
> +++ b/arch/x86/kernel/alternative.c
> @@ -402,6 +402,7 @@ static int emit_indirect(int op, int reg, u8 *bytes)
>  
>  #ifdef CONFIG_MITIGATION_ITS
>  
> +#ifdef CONFIG_MODULES
>  static struct module *its_mod;
>  static void *its_page;
>  static unsigned int its_offset;
> @@ -518,6 +519,14 @@ static void *its_allocate_thunk(int reg)
>  
>  	return thunk;
>  }
> +#else /* CONFIG_MODULES */
> +
> +static void *its_allocate_thunk(int reg)
> +{
> +	return NULL;
> +}
> +
> +#endif /* CONFIG_MODULES */
>  
>  static int __emit_trampoline(void *addr, struct insn *insn, u8 *bytes,
>  			     void *call_dest, void *jmp_dest)
> 
> ---
> change-id: 20250516-its-module-alloc-fix-6-1-abb11f2e3829
> 
> 

THanks, now queued up.

greg k-h