public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse source 
Pull x86 fixes from Ingo Molnar:
 "Two fixes: dead code removal, plus a SME memory encryption fix on
  32-bit kernels that crashed Xen guests"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu: Remove unused and undefined __generic_processor_info() declaration
  x86/mm: Make the SME mask a u64
This commit is contained in:
Linus Torvalds 2017-09-12 11:34:39 -07:00
commit 680352bda5
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/include/asm/mem_encrypt.h
View file

@ -21,7 +21,7 @@
#ifdef CONFIG_AMD_MEM_ENCRYPT #ifdef CONFIG_AMD_MEM_ENCRYPT
extern unsigned long sme_me_mask; extern u64 sme_me_mask;
void sme_encrypt_execute(unsigned long encrypted_kernel_vaddr, void sme_encrypt_execute(unsigned long encrypted_kernel_vaddr,
unsigned long decrypted_kernel_vaddr, unsigned long decrypted_kernel_vaddr,
@ -49,7 +49,7 @@ void swiotlb_set_mem_attributes(void *vaddr, unsigned long size);
#else /* !CONFIG_AMD_MEM_ENCRYPT */ #else /* !CONFIG_AMD_MEM_ENCRYPT */
#define sme_me_mask 0UL #define sme_me_mask 0ULL
static inline void __init sme_early_encrypt(resource_size_t paddr, static inline void __init sme_early_encrypt(resource_size_t paddr,
unsigned long size) { } unsigned long size) { }

1
arch/x86/include/asm/mpspec.h
View file

@ -86,7 +86,6 @@ static inline void e820__memblock_alloc_reserved_mpc_new(void) { }
#endif #endif
int generic_processor_info(int apicid, int version); int generic_processor_info(int apicid, int version);
int __generic_processor_info(int apicid, int version, bool enabled);
#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_LOCAL_APIC) #define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_LOCAL_APIC)

2
arch/x86/kernel/apic/apic.c
View file

@ -2130,7 +2130,7 @@ int generic_processor_info(int apicid, int version)
* Since fixing handling of boot_cpu_physical_apicid requires * Since fixing handling of boot_cpu_physical_apicid requires
* another discussion and tests on each platform, we leave it * another discussion and tests on each platform, we leave it
* for now and here we use read_apic_id() directly in this * for now and here we use read_apic_id() directly in this
* function, __generic_processor_info(). * function, generic_processor_info().
*/ */
if (disabled_cpu_apicid != BAD_APICID && if (disabled_cpu_apicid != BAD_APICID &&
disabled_cpu_apicid != read_apic_id() && disabled_cpu_apicid != read_apic_id() &&

2
arch/x86/mm/mem_encrypt.c
View file

@ -37,7 +37,7 @@ static char sme_cmdline_off[] __initdata = "off";
* reside in the .data section so as not to be zeroed out when the .bss * reside in the .data section so as not to be zeroed out when the .bss
* section is later cleared. * section is later cleared.
*/ */
unsigned long sme_me_mask __section(.data) = 0; u64 sme_me_mask __section(.data) = 0;
EXPORT_SYMBOL_GPL(sme_me_mask); EXPORT_SYMBOL_GPL(sme_me_mask);
/* Buffer used for early in-place encryption by BSP, no locking needed */ /* Buffer used for early in-place encryption by BSP, no locking needed */

13
include/linux/mem_encrypt.h
View file

@ -21,7 +21,7 @@
#else /* !CONFIG_ARCH_HAS_MEM_ENCRYPT */ #else /* !CONFIG_ARCH_HAS_MEM_ENCRYPT */
#define sme_me_mask 0UL #define sme_me_mask 0ULL
#endif /* CONFIG_ARCH_HAS_MEM_ENCRYPT */ #endif /* CONFIG_ARCH_HAS_MEM_ENCRYPT */
@ -30,18 +30,23 @@ static inline bool sme_active(void)
return !!sme_me_mask; return !!sme_me_mask;
} }
static inline unsigned long sme_get_me_mask(void) static inline u64 sme_get_me_mask(void)
{ {
return sme_me_mask; return sme_me_mask;
} }
#ifdef CONFIG_AMD_MEM_ENCRYPT
/* /*
* The __sme_set() and __sme_clr() macros are useful for adding or removing * The __sme_set() and __sme_clr() macros are useful for adding or removing
* the encryption mask from a value (e.g. when dealing with pagetable * the encryption mask from a value (e.g. when dealing with pagetable
* entries). * entries).
*/ */
#define __sme_set(x) ((unsigned long)(x) | sme_me_mask) #define __sme_set(x) ((x) | sme_me_mask)
#define __sme_clr(x) ((unsigned long)(x) & ~sme_me_mask) #define __sme_clr(x) ((x) & ~sme_me_mask)
#else
#define __sme_set(x) (x)
#define __sme_clr(x) (x)
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */