On Fri, 2025-02-07 at 17:03 +0100, Brendan Jackman wrote: > On Thu, 6 Feb 2025 at 05:45, Rik van Riel <riel@xxxxxxxxxxx> wrote: > > diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c > > index 36939b104561..227e972b6fbc 100644 > > --- a/arch/x86/mm/tlb.c > > +++ b/arch/x86/mm/tlb.c > > @@ -1086,6 +1086,30 @@ void flush_tlb_all(void) > > on_each_cpu(do_flush_tlb_all, NULL, 1); > > } > > > > +static bool broadcast_kernel_range_flush(struct flush_tlb_info > > *info) > > +{ > > + unsigned long addr; > > + unsigned long nr; > > + > > + if (!IS_ENABLED(CONFIG_X86_BROADCAST_TLB_FLUSH)) > > + return false; > > + > > + if (!cpu_feature_enabled(X86_FEATURE_INVLPGB)) > > + return false; > > I think that first conditional can be shunted off into the header > > diff --git a/arch/x86/include/asm/disabled-features.h > b/arch/x86/include/asm/disabled-features.h > index c492bdc97b05..61376b4e4fa7 100644 > --- a/arch/x86/include/asm/disabled-features.h > +++ b/arch/x86/include/asm/disabled-features.h > @@ -129,6 +129,12 @@ > #define DISABLE_SEV_SNP (1 << (X86_FEATURE_SEV_SNP & > 31)) > #endif > > +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH > +#define DISABLE_INVLPGB 0 > +#else > +#define DISABLE_INVLPGB (1 << (X86_FEATURE_INVLPGB & 31)) > +#endif > + I'm adding this for v10, with the disabled-features.h stuff in patch 5, and removing the no longer needed tests from each subsequent patch. -- All Rights Reversed.