| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20210324170436.31843-28-brijesh.singh@amd.com>
Date: Wed, 24 Mar 2021 12:04:33 -0500
From: Brijesh Singh <brijesh.singh@....com>
To: linux-kernel@...r.kernel.org, x86@...nel.org, kvm@...r.kernel.org,
linux-crypto@...r.kernel.org
Cc: ak@...ux.intel.com, herbert@...dor.apana.org.au,
Brijesh Singh <brijesh.singh@....com>,
Thomas Gleixner <tglx@...utronix.de>,
Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
Joerg Roedel <jroedel@...e.de>,
"H. Peter Anvin" <hpa@...or.com>, Tony Luck <tony.luck@...el.com>,
Dave Hansen <dave.hansen@...el.com>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
Paolo Bonzini <pbonzini@...hat.com>,
Tom Lendacky <thomas.lendacky@....com>,
David Rientjes <rientjes@...gle.com>,
Sean Christopherson <seanjc@...gle.com>,
Vitaly Kuznetsov <vkuznets@...hat.com>,
Wanpeng Li <wanpengli@...cent.com>,
Jim Mattson <jmattson@...gle.com>
Subject: [RFC Part2 PATCH 27/30] KVM: SVM: add support to handle MSR based Page State Change VMGEXIT
SEV-SNP VMs can ask the hypervisor to change the page state in the RMP
table to be private or shared using the Page State Change MSR protocol
as defined in the GHCB specification section 2.5.1.
Before changing the page state in the RMP entry, we lookup the page in
the TDP to make sure that there is a valid mapping for it. If the mapping
exist then try to find a workable page level between the TDP and RMP for
the page. If the page is not mapped in the TDP, then create a fault such
that it gets mapped before we change the page state in the RMP entry.
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Joerg Roedel <jroedel@...e.de>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Tony Luck <tony.luck@...el.com>
Cc: Dave Hansen <dave.hansen@...el.com>
Cc: "Peter Zijlstra (Intel)" <peterz@...radead.org>
Cc: Paolo Bonzini <pbonzini@...hat.com>
Cc: Tom Lendacky <thomas.lendacky@....com>
Cc: David Rientjes <rientjes@...gle.com>
Cc: Sean Christopherson <seanjc@...gle.com>
Cc: Vitaly Kuznetsov <vkuznets@...hat.com>
Cc: Wanpeng Li <wanpengli@...cent.com>
Cc: Jim Mattson <jmattson@...gle.com>
Cc: x86@...nel.org
Cc: kvm@...r.kernel.org
Signed-off-by: Brijesh Singh <brijesh.singh@....com>
---
arch/x86/kvm/svm/sev.c | 148 +++++++++++++++++++++++++++++++++++++++++
arch/x86/kvm/svm/svm.h | 11 +++
2 files changed, 159 insertions(+)
diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 7c242c470eba..8f046b45c424 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -25,6 +25,7 @@
#include "svm.h"
#include "cpuid.h"
#include "trace.h"
+#include "mmu.h"
#define __ex(x) __kvm_handle_fault_on_reboot(x)
@@ -2322,6 +2323,128 @@ static void set_ghcb_msr(struct vcpu_svm *svm, u64 value)
svm->vmcb->control.ghcb_gpa = value;
}
+static int snp_rmptable_psmash(struct kvm_vcpu *vcpu, kvm_pfn_t pfn)
+{
+ pfn = pfn & ~(KVM_PAGES_PER_HPAGE(PG_LEVEL_2M) - 1);
+
+ /* Split the 2MB-page RMP entry into a corresponding set of contiguous 4KB-page RMP entry */
+ return rmptable_psmash(pfn_to_page(pfn));
+}
+
+static int snp_make_page_shared(struct kvm_vcpu *vcpu, gpa_t gpa, kvm_pfn_t pfn, int level)
+{
+ struct rmpupdate val;
+ int rc, rmp_level;
+ rmpentry_t *e;
+
+ e = lookup_page_in_rmptable(pfn_to_page(pfn), &rmp_level);
+ if (!e)
+ return -EINVAL;
+
+ if (!rmpentry_assigned(e))
+ return 0;
+
+ /* Log if the entry is validated */
+ if (rmpentry_validated(e))
+ pr_debug_ratelimited("Remove RMP entry for a validated gpa 0x%llx\n", gpa);
+
+ /*
+ * Is the page part of an existing 2M RMP entry ? Split the 2MB into multiple of 4K-page
+ * before making the memory shared.
+ */
+ if ((level == PG_LEVEL_4K) && (rmp_level == PG_LEVEL_2M)) {
+ rc = snp_rmptable_psmash(vcpu, pfn);
+ if (rc)
+ return rc;
+ }
+
+ memset(&val, 0, sizeof(val));
+ val.pagesize = X86_RMP_PG_LEVEL(level);
+ return rmptable_rmpupdate(pfn_to_page(pfn), &val);
+}
+
+static int snp_make_page_private(struct kvm_vcpu *vcpu, gpa_t gpa, kvm_pfn_t pfn, int level)
+{
+ struct kvm_sev_info *sev = &to_kvm_svm(vcpu->kvm)->sev_info;
+ struct rmpupdate val;
+ int rmp_level;
+ rmpentry_t *e;
+
+ e = lookup_page_in_rmptable(pfn_to_page(pfn), &rmp_level);
+ if (!e)
+ return -EINVAL;
+
+ /* Log if the entry is validated */
+ if (rmpentry_validated(e))
+ pr_err_ratelimited("Asked to make a pre-validated gpa %llx private\n", gpa);
+
+ memset(&val, 0, sizeof(val));
+ val.gpa = gpa;
+ val.asid = sev->asid;
+ val.pagesize = X86_RMP_PG_LEVEL(level);
+ val.assigned = true;
+
+ return rmptable_rmpupdate(pfn_to_page(pfn), &val);
+}
+
+static int __snp_handle_page_state_change(struct kvm_vcpu *vcpu, int op, gpa_t gpa, int level)
+{
+ struct kvm *kvm = vcpu->kvm;
+ gpa_t end, next_gpa;
+ int rc, tdp_level;
+ kvm_pfn_t pfn;
+
+ end = gpa + page_level_size(level);
+
+ for (; end > gpa; gpa = next_gpa) {
+ /*
+ * Get the pfn and level for the gpa from the nested page table.
+ *
+ * If the TDP walk failed, then its safe to say that we don't have a valid
+ * mapping for the gpa in the nested page table. Create a fault to map the
+ * page is nested page table.
+ */
+ if (!kvm_mmu_get_tdp_walk(vcpu, gpa, &pfn, &tdp_level)) {
+ pfn = kvm_mmu_map_tdp_page(vcpu, gpa, PFERR_USER_MASK, level);
+ if (is_error_noslot_pfn(pfn))
+ goto out;
+
+ if (!kvm_mmu_get_tdp_walk(vcpu, gpa, &pfn, &tdp_level))
+ goto out;
+ }
+
+ /* Adjust the level so that we don't go higher than the backing page level */
+ level = min_t(size_t, level, tdp_level);
+
+ spin_lock(&kvm->mmu_lock);
+
+ switch (op) {
+ case SNP_PAGE_STATE_SHARED:
+ rc = snp_make_page_shared(vcpu, gpa, pfn, level);
+ break;
+ case SNP_PAGE_STATE_PRIVATE:
+ rc = snp_make_page_private(vcpu, gpa, pfn, level);
+ break;
+ default:
+ rc = -EINVAL;
+ break;
+ }
+
+ spin_unlock(&kvm->mmu_lock);
+
+ if (rc) {
+ pr_err_ratelimited("Error op %d gpa %llx pfn %llx level %d rc %d\n",
+ op, gpa, pfn, level, rc);
+ goto out;
+ }
+
+ next_gpa = gpa + page_level_size(level);
+ }
+
+out:
+ return rc;
+}
+
static int sev_handle_vmgexit_msr_protocol(struct vcpu_svm *svm)
{
struct vmcb_control_area *control = &svm->vmcb->control;
@@ -2400,6 +2523,31 @@ static int sev_handle_vmgexit_msr_protocol(struct vcpu_svm *svm)
GHCB_MSR_INFO_POS);
break;
}
+ case GHCB_MSR_PAGE_STATE_CHANGE_REQ: {
+ gfn_t gfn;
+ int ret;
+ u8 op;
+
+ gfn = get_ghcb_msr_bits(svm,
+ GHCB_MSR_PAGE_STATE_CHANGE_GFN_MASK,
+ GHCB_MSR_PAGE_STATE_CHANGE_GFN_POS);
+ op = get_ghcb_msr_bits(svm,
+ GHCB_MSR_PAGE_STATE_CHANGE_OP_MASK,
+ GHCB_MSR_PAGE_STATE_CHANGE_OP_POS);
+
+ ret = __snp_handle_page_state_change(vcpu, op, gfn_to_gpa(gfn), PG_LEVEL_4K);
+
+ set_ghcb_msr_bits(svm, ret,
+ GHCB_MSR_PAGE_STATE_CHANGE_ERROR_MASK,
+ GHCB_MSR_PAGE_STATE_CHANGE_ERROR_POS);
+ set_ghcb_msr_bits(svm, 0,
+ GHCB_MSR_PAGE_STATE_CHANGE_RSVD_MASK,
+ GHCB_MSR_PAGE_STATE_CHANGE_RSVD_POS);
+ set_ghcb_msr_bits(svm, GHCB_MSR_PAGE_STATE_CHANGE_RESP,
+ GHCB_MSR_INFO_MASK,
+ GHCB_MSR_INFO_POS);
+ break;
+ }
case GHCB_MSR_TERM_REQ: {
u64 reason_set, reason_code;
diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index 0de7c77b0d59..31bc9cc12c44 100644
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -589,6 +589,17 @@ void svm_vcpu_unblocking(struct kvm_vcpu *vcpu);
#define GHCB_MSR_GHCB_GPA_REGISTER_RESP 0x013
#define GHCB_MSR_GHCB_GPA_REGISTER_ERROR 0xfffffffffffff
+#define GHCB_MSR_PAGE_STATE_CHANGE_REQ 0x014
+#define GHCB_MSR_PAGE_STATE_CHANGE_GFN_POS 12
+#define GHCB_MSR_PAGE_STATE_CHANGE_GFN_MASK 0xffffffffff
+#define GHCB_MSR_PAGE_STATE_CHANGE_OP_POS 52
+#define GHCB_MSR_PAGE_STATE_CHANGE_OP_MASK 0xf
+#define GHCB_MSR_PAGE_STATE_CHANGE_RESP 0x015
+#define GHCB_MSR_PAGE_STATE_CHANGE_ERROR_POS 32
+#define GHCB_MSR_PAGE_STATE_CHANGE_ERROR_MASK 0xffffffff
+#define GHCB_MSR_PAGE_STATE_CHANGE_RSVD_POS 12
+#define GHCB_MSR_PAGE_STATE_CHANGE_RSVD_MASK 0xfffff
+
#define GHCB_MSR_TERM_REQ 0x100
#define GHCB_MSR_TERM_REASON_SET_POS 12
#define GHCB_MSR_TERM_REASON_SET_MASK 0xf
--
2.17.1
Powered by blists - more mailing lists