Commit 3b08f56f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-urgent-2025-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fix from Ingo Molnar:
 "Fix a SEV-SNP regression when CONFIG_KVM_AMD_SEV is disabled"

* tag 'x86-urgent-2025-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/sev: Guard sev_evict_cache() with CONFIG_AMD_MEM_ENCRYPT
parents cd89d487 7f830e12

arch/x86/include/asm/sev.h

+19 −19
Original line number Diff line number Diff line
@@ -562,6 +562,24 @@ enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb, 


extern struct ghcb *boot_ghcb;



static inline void sev_evict_cache(void *va, int npages)

{

	volatile u8 val __always_unused;

	u8 *bytes = va;

	int page_idx;



	/*

	 * For SEV guests, a read from the first/last cache-lines of a 4K page

	 * using the guest key is sufficient to cause a flush of all cache-lines

	 * associated with that 4K page without incurring all the overhead of a

	 * full CLFLUSH sequence.

	 */

	for (page_idx = 0; page_idx < npages; page_idx++) {

		val = bytes[page_idx * PAGE_SIZE];

		val = bytes[page_idx * PAGE_SIZE + PAGE_SIZE - 1];

	}

}



#else	/* !CONFIG_AMD_MEM_ENCRYPT */



#define snp_vmpl 0
@@ -605,6 +623,7 @@ static inline int snp_send_guest_request(struct snp_msg_desc *mdesc, 
static inline int snp_svsm_vtpm_send_command(u8 *buffer) { return -ENODEV; }

static inline void __init snp_secure_tsc_prepare(void) { }

static inline void __init snp_secure_tsc_init(void) { }

static inline void sev_evict_cache(void *va, int npages) {}



#endif	/* CONFIG_AMD_MEM_ENCRYPT */
@@ -619,24 +638,6 @@ int rmp_make_shared(u64 pfn, enum pg_level level); 
void snp_leak_pages(u64 pfn, unsigned int npages);

void kdump_sev_callback(void);

void snp_fixup_e820_tables(void);



static inline void sev_evict_cache(void *va, int npages)

{

	volatile u8 val __always_unused;

	u8 *bytes = va;

	int page_idx;



	/*

	 * For SEV guests, a read from the first/last cache-lines of a 4K page

	 * using the guest key is sufficient to cause a flush of all cache-lines

	 * associated with that 4K page without incurring all the overhead of a

	 * full CLFLUSH sequence.

	 */

	for (page_idx = 0; page_idx < npages; page_idx++) {

		val = bytes[page_idx * PAGE_SIZE];

		val = bytes[page_idx * PAGE_SIZE + PAGE_SIZE - 1];

	}

}

#else

static inline bool snp_probe_rmptable_info(void) { return false; }

static inline int snp_rmptable_init(void) { return -ENOSYS; }
@@ -652,7 +653,6 @@ static inline int rmp_make_shared(u64 pfn, enum pg_level level) { return -ENODEV 
static inline void snp_leak_pages(u64 pfn, unsigned int npages) {}

static inline void kdump_sev_callback(void) { }

static inline void snp_fixup_e820_tables(void) {}

static inline void sev_evict_cache(void *va, int npages) {}

#endif



#endif