Commit 0d391319 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

Merge 'x86/seves' into x86/core 



Pick up dependent changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parents aa7680f6 22916417

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1515,6 +1515,7 @@ config AMD_MEM_ENCRYPT 
	select ARCH_USE_MEMREMAP_PROT

	select ARCH_HAS_FORCE_DMA_UNENCRYPTED

	select INSTRUCTION_DECODER

	select ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS

	help

	  Say yes to enable support for the encryption of system memory.

	  This requires an AMD processor that supports Secure Memory

arch/x86/kernel/sev-es.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static enum es_result vc_decode_insn(struct es_em_ctxt *ctxt) 
			return ES_EXCEPTION;

		}



		insn_init(&ctxt->insn, buffer, MAX_INSN_SIZE - res, 1);

		insn_init(&ctxt->insn, buffer, MAX_INSN_SIZE, 1);

		insn_get_length(&ctxt->insn);

	}

arch/x86/mm/mem_encrypt.c

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/kernel.h>

#include <linux/bitops.h>

#include <linux/dma-mapping.h>

#include <linux/virtio_config.h>



#include <asm/tlbflush.h>

#include <asm/fixmap.h>
@@ -484,3 +485,8 @@ void __init mem_encrypt_init(void) 
	print_mem_encrypt_feature_info();

}



int arch_has_restricted_virtio_memory_access(void)

{

	return sev_active();

}

EXPORT_SYMBOL_GPL(arch_has_restricted_virtio_memory_access);