mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mohammed Gamal <mgamal@redhat.com>
To: kvm@vger.kernel.org, pbonzini@redhat.com
Cc: linux-kernel@vger.kernel.org, vkuznets@redhat.com,
	sean.j.christopherson@intel.com, wanpengli@tencent.com,
	jmattson@google.com, joro@8bytes.org, thomas.lendacky@amd.com,
	babu.moger@amd.com, Mohammed Gamal <mgamal@redhat.com>
Subject: [PATCH v2 09/11] KVM: SVM: introduce svm_need_pf_intercept
Date: Fri, 19 Jun 2020 17:39:23 +0200	[thread overview]
Message-ID: <20200619153925.79106-10-mgamal@redhat.com> (raw)
In-Reply-To: <20200619153925.79106-1-mgamal@redhat.com>

CC: Tom Lendacky <thomas.lendacky@amd.com>
CC: Babu Moger <babu.moger@amd.com>
Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
---
 arch/x86/kvm/svm/svm.c | 8 ++++++++
 arch/x86/kvm/svm/svm.h | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 94108e6cc6da..05412818027d 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -1087,6 +1087,9 @@ static void init_vmcb(struct vcpu_svm *svm)
 	}
 	svm->asid_generation = 0;
 
+	if (svm_need_pf_intercept(svm))
+		set_exception_intercept(svm, PF_VECTOR);
+
 	svm->nested.vmcb = 0;
 	svm->vcpu.arch.hflags = 0;
 
@@ -1633,6 +1636,11 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)
 
 	clr_exception_intercept(svm, BP_VECTOR);
 
+	if (svm_need_pf_intercept(svm))
+		set_exception_intercept(svm, PF_VECTOR);
+	else
+		clr_exception_intercept(svm, PF_VECTOR);
+
 	if (vcpu->guest_debug & KVM_GUESTDBG_ENABLE) {
 		if (vcpu->guest_debug & KVM_GUESTDBG_USE_SW_BP)
 			set_exception_intercept(svm, BP_VECTOR);
diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index 6ac4c00a5d82..2b7469f3db0e 100644
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -19,6 +19,7 @@
 #include <linux/kvm_host.h>
 
 #include <asm/svm.h>
+#include "cpuid.h"
 
 static const u32 host_save_user_msrs[] = {
 #ifdef CONFIG_X86_64
@@ -345,6 +346,11 @@ static inline bool gif_set(struct vcpu_svm *svm)
 		return !!(svm->vcpu.arch.hflags & HF_GIF_MASK);
 }
 
+static inline bool svm_need_pf_intercept(struct vcpu_svm *svm)
+{
+        return !npt_enabled;
+}
+
 /* svm.c */
 #define MSR_INVALID			0xffffffffU
 
-- 
2.26.2


  parent reply	other threads:[~2020-06-19 15:40 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-19 15:39 [PATCH v2 00/11] KVM: Support guest MAXPHYADDR < host MAXPHYADDR Mohammed Gamal
2020-06-19 15:39 ` [PATCH v2 01/11] KVM: x86: Add helper functions for illegal GPA checking and page fault injection Mohammed Gamal
2020-06-22  4:44   ` Yuan Yao
2020-06-22 12:21     ` Mohammed Gamal
2020-06-19 15:39 ` [PATCH v2 02/11] KVM: x86: mmu: Move translate_gpa() to mmu.c Mohammed Gamal
2020-06-19 15:39 ` [PATCH v2 03/11] KVM: x86: mmu: Add guest physical address check in translate_gpa() Mohammed Gamal
2020-06-19 15:39 ` [PATCH v2 04/11] KVM: x86: rename update_bp_intercept to update_exception_bitmap Mohammed Gamal
2020-06-19 15:39 ` [PATCH v2 05/11] KVM: x86: update exception bitmap on CPUID changes Mohammed Gamal
2020-06-19 15:39 ` [PATCH v2 06/11] KVM: VMX: introduce vmx_need_pf_intercept Mohammed Gamal
2020-06-19 22:45   ` Jim Mattson
2020-06-22 13:57     ` Paolo Bonzini
2020-06-19 15:39 ` [PATCH v2 07/11] KVM: VMX: Add guest physical address check in EPT violation and misconfig Mohammed Gamal
2020-06-19 15:39 ` [PATCH v2 08/11] KVM: VMX: optimize #PF injection when MAXPHYADDR does not match Mohammed Gamal
2020-06-19 15:39 ` Mohammed Gamal [this message]
2020-06-19 15:39 ` [PATCH v2 10/11] KVM: SVM: Add guest physical address check in NPF/PF interception Mohammed Gamal
2020-06-19 15:39 ` [PATCH v2 11/11] KVM: x86: SVM: VMX: Make GUEST_MAXPHYADDR < HOST_MAXPHYADDR support configurable Mohammed Gamal
2020-06-19 15:43 ` [PATCH v2 00/11] KVM: Support guest MAXPHYADDR < host MAXPHYADDR Paolo Bonzini
2020-06-19 21:52 ` Tom Lendacky
2020-06-19 23:07   ` Paolo Bonzini
2020-06-22 16:33     ` Tom Lendacky
2020-06-22 17:03       ` Paolo Bonzini
2020-06-22 17:57         ` Tom Lendacky
2020-06-22 18:01           ` Paolo Bonzini
2020-06-22 19:14             ` Tom Lendacky
2020-06-22 22:20               ` Paolo Bonzini
2020-06-22 23:47     ` Andy Lutomirski
2020-06-23  0:52       ` Paolo Bonzini
2020-06-22 15:08   ` Mohammed Gamal
2020-06-22 15:23     ` Paolo Bonzini
2020-06-22 16:35       ` Tom Lendacky
2020-06-22  4:32 ` Yuan Yao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200619153925.79106-10-mgamal@redhat.com \
    --to=mgamal@redhat.com \
    --cc=babu.moger@amd.com \
    --cc=jmattson@google.com \
    --cc=joro@8bytes.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=sean.j.christopherson@intel.com \
    --cc=thomas.lendacky@amd.com \
    --cc=vkuznets@redhat.com \
    --cc=wanpengli@tencent.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®