• Ingo Molnar's avatar
    x86/iopl: Make 'struct tss_struct' constant size again · 0bcd7762
    Ingo Molnar authored
    After the following commit:
    
      05b042a1: ("x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise")
    
    'struct cpu_entry_area' has to be Kconfig invariant, so that we always
    have a matching CPU_ENTRY_AREA_PAGES size.
    
    This commit added a CONFIG_X86_IOPL_IOPERM dependency to tss_struct:
    
      111e7b15: ("x86/ioperm: Extend IOPL config to control ioperm() as well")
    
    Which, if CONFIG_X86_IOPL_IOPERM is turned off, reduces the size of
    cpu_entry_area by two pages, triggering the assert:
    
      ./include/linux/compiler.h:391:38: error: call to ‘__compiletime_assert_202’ declared with attribute error: BUILD_BUG_ON failed: (CPU_ENTRY_AREA_PAGES+1)*PAGE_SIZE != CPU_ENTRY_AREA_MAP_SIZE
    
    Simplify the Kconfig dependencies and make cpu_entry_area constant
    size on 32-bit kernels again.
    
    Fixes: 05b042a1: ("x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise")
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Andy Lutomirski <luto@kernel.org>
    Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
    0bcd7762
processor.h 26.1 KB