Commit 6c26fcd2 authored Jul 14, 2018 by Jiri Kosina Committed by Thomas Gleixner Jul 15, 2018

x86/speculation/l1tf: Unbreak !__HAVE_ARCH_PFN_MODIFY_ALLOWED architectures



pfn_modify_allowed() and arch_has_pfn_modify_check() are outside of the 
!__ASSEMBLY__ section in include/asm-generic/pgtable.h, which confuses 
assembler on archs that don't have __HAVE_ARCH_PFN_MODIFY_ALLOWED (e.g. 
ia64) and breaks build:

    include/asm-generic/pgtable.h: Assembler messages:
    include/asm-generic/pgtable.h:538: Error: Unknown opcode `static inline bool pfn_modify_allowed(unsigned long pfn,pgprot_t prot)'
    include/asm-generic/pgtable.h:540: Error: Unknown opcode `return true'
    include/asm-generic/pgtable.h:543: Error: Unknown opcode `static inline bool arch_has_pfn_modify_check(void)'
    include/asm-generic/pgtable.h:545: Error: Unknown opcode `return false'
    arch/ia64/kernel/entry.S:69: Error: `mov' does not fit into bundle

Move those two static inlines into the !__ASSEMBLY__ section so that they 
don't confuse the asm build pass.

Fixes: 42e4089c ("x86/speculation/l1tf: Disallow non privileged high MMIO PROT_NONE mappings")
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 3ec8ce5d

include/asm-generic/pgtable.h

+12 −12

Original line number	Diff line number	Diff line
		@@ -1083,6 +1083,18 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
		static inline void init_espfix_bsp(void) { }
		#endif

		#ifndef __HAVE_ARCH_PFN_MODIFY_ALLOWED
		static inline bool pfn_modify_allowed(unsigned long pfn, pgprot_t prot)
		{
		return true;
		}

		static inline bool arch_has_pfn_modify_check(void)
		{
		return false;
		}
		#endif /* !_HAVE_ARCH_PFN_MODIFY_ALLOWED */

		#endif /* !__ASSEMBLY__ */

		#ifndef io_remap_pfn_range
		@@ -1097,16 +1109,4 @@ static inline void init_espfix_bsp(void) { }
		#endif
		#endif

		#ifndef __HAVE_ARCH_PFN_MODIFY_ALLOWED
		static inline bool pfn_modify_allowed(unsigned long pfn, pgprot_t prot)
		{
		return true;
		}

		static inline bool arch_has_pfn_modify_check(void)
		{
		return false;
		}
		#endif

		#endif /* _ASM_GENERIC_PGTABLE_H */

Admin message