Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e794df7b authored by Tom Lendacky's avatar Tom Lendacky Committed by Greg Kroah-Hartman
Browse files

KVM: SVM: Add a dedicated INVD intercept routine 



[ Upstream commit 4bb05f30483fd21ea5413eaf1182768f251cf625 ]

The INVD instruction intercept performs emulation. Emulation can't be done
on an SEV guest because the guest memory is encrypted.

Provide a dedicated intercept routine for the INVD intercept. And since
the instruction is emulated as a NOP, just skip it instead.

Fixes: 1654efcb ("KVM: SVM: Add KVM_SEV_INIT command")
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Message-Id: <a0b9a19ffa7fef86a3cc700c7ea01cb2731e04e5.1600972918.git.thomas.lendacky@amd.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cc868976

arch/x86/kvm/svm.c

+7 −1
Original line number Diff line number Diff line
@@ -3942,6 +3942,12 @@ static int iret_interception(struct vcpu_svm *svm) 
	return 1;

}



static int invd_interception(struct vcpu_svm *svm)

{

	/* Treat an INVD instruction as a NOP and just skip it. */

	return kvm_skip_emulated_instruction(&svm->vcpu);

}



static int invlpg_interception(struct vcpu_svm *svm)

{

	if (!static_cpu_has(X86_FEATURE_DECODEASSISTS))
@@ -4831,7 +4837,7 @@ static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = { 
	[SVM_EXIT_RDPMC]			= rdpmc_interception,

	[SVM_EXIT_CPUID]			= cpuid_interception,

	[SVM_EXIT_IRET]                         = iret_interception,

	[SVM_EXIT_INVD]                         = emulate_on_interception,

	[SVM_EXIT_INVD]                         = invd_interception,

	[SVM_EXIT_PAUSE]			= pause_interception,

	[SVM_EXIT_HLT]				= halt_interception,

	[SVM_EXIT_INVLPG]			= invlpg_interception,