From: Brijesh Singh <brijesh.singh@amd.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: bp@alien8.de, "Brijesh Singh" <brijesh.singh@amd.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Joerg Roedel" <joro@8bytes.org>, "Borislav Petkov" <bp@suse.de>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
x86@kernel.org
Subject: [Part2 PATCH v7 23/38] KVM: SVM: Reserve ASID range for SEV guest
Date: Wed, 1 Nov 2017 16:16:08 -0500 [thread overview]
Message-ID: <20171101211623.71496-24-brijesh.singh@amd.com> (raw)
In-Reply-To: <20171101211623.71496-1-brijesh.singh@amd.com>
A SEV-enabled guest must use ASIDs from the defined subset, while non-SEV
guests can use the remaining ASID range. The range of allowed SEV guest
ASIDs is [1 - CPUID_8000_001F[ECX][31:0]].
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Borislav Petkov <bp@suse.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: x86@kernel.org
Cc: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Improvements-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Reviewed-by: Borislav Petkov <bp@suse.de>
---
arch/x86/kvm/svm.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index be2e98c01b22..d4b62536e305 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -323,6 +323,8 @@ enum {
#define VMCB_AVIC_APIC_BAR_MASK 0xFFFFFFFFFF000ULL
+static unsigned int max_sev_asid;
+
static inline void mark_all_dirty(struct vmcb *vmcb)
{
vmcb->control.clean = 0;
@@ -787,7 +789,7 @@ static int svm_hardware_enable(void)
sd->asid_generation = 1;
sd->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1;
sd->next_asid = sd->max_asid + 1;
- sd->min_asid = 1;
+ sd->min_asid = max_sev_asid + 1;
gdt = get_current_gdt_rw();
sd->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS);
@@ -1054,6 +1056,15 @@ static int avic_ga_log_notifier(u32 ga_tag)
return 0;
}
+/*
+ * Get the maximum number of encrypted guests:
+ * Fn8001_001F[ECX][31:0]: Number of supported guests.
+ */
+static __init void sev_hardware_setup(void)
+{
+ max_sev_asid = cpuid_ecx(0x8000001F);
+}
+
static __init int svm_hardware_setup(void)
{
int cpu;
@@ -1084,6 +1095,16 @@ static __init int svm_hardware_setup(void)
kvm_tsc_scaling_ratio_frac_bits = 32;
}
+ if (sev) {
+ if (boot_cpu_has(X86_FEATURE_SEV) &&
+ IS_ENABLED(CONFIG_KVM_AMD_SEV)) {
+ sev_hardware_setup();
+ pr_info("SEV supported\n");
+ } else {
+ sev = false;
+ }
+ }
+
if (nested) {
printk(KERN_INFO "kvm: Nested Virtualization enabled\n");
kvm_enable_efer_bits(EFER_SVME | EFER_LMSLE);
--
2.9.5
next prev parent reply other threads:[~2017-11-01 22:04 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-01 21:15 [Part2 PATCH v7 00/38] x86: Secure Encrypted Virtualization (AMD) Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 01/38] Documentation/virtual/kvm: Add AMD Secure Encrypted Virtualization (SEV) Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 02/38] x86/CPU/AMD: Add the Secure Encrypted Virtualization CPU feature Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 03/38] kvm: svm: prepare for new bit definition in nested_ctl Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 04/38] kvm: svm: Add SEV feature definitions to KVM Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 05/38] KVM: SVM: Prepare to reserve asid for SEV guest Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 06/38] KVM: X86: Extend CPUID range to include new leaf Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 07/38] KVM: Introduce KVM_MEMORY_ENCRYPT_OP ioctl Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 08/38] KVM: Introduce KVM_MEMORY_ENCRYPT_{UN,}REG_REGION ioctl Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 09/38] crypto: ccp: Build the AMD secure processor driver only with AMD CPU support Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 10/38] crypto: ccp: Define SEV userspace ioctl and command id Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 11/38] crypto: ccp: Define SEV key management " Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 12/38] crypto: ccp: Add Platform Security Processor (PSP) device support Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 13/38] crypto: ccp: Add Secure Encrypted Virtualization (SEV) command support Brijesh Singh
2017-11-02 17:10 ` Borislav Petkov
2017-11-02 17:32 ` Brijesh Singh
2017-11-01 21:15 ` [Part2 PATCH v7 14/38] crypto: ccp: Implement SEV_FACTORY_RESET ioctl command Brijesh Singh
2017-11-03 12:42 ` Borislav Petkov
2017-11-01 21:16 ` [Part2 PATCH v7 15/38] crypto: ccp: Implement SEV_PLATFORM_STATUS " Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 16/38] crypto: ccp: Implement SEV_PEK_GEN " Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 17/38] crypto: ccp: Implement SEV_PDH_GEN " Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 18/38] crypto: ccp: Implement SEV_PEK_CSR " Brijesh Singh
2017-11-03 19:42 ` Borislav Petkov
2017-11-03 20:01 ` Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 19/38] crypto: ccp: Implement SEV_PEK_CERT_IMPORT " Brijesh Singh
2017-11-04 10:22 ` Borislav Petkov
2017-11-01 21:16 ` [Part2 PATCH v7 20/38] crypto: ccp: Implement SEV_PDH_CERT_EXPORT " Brijesh Singh
2017-11-05 11:34 ` Borislav Petkov
2017-11-06 16:16 ` Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 21/38] KVM: X86: Add CONFIG_KVM_AMD_SEV Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 22/38] KVM: SVM: Add sev module_param Brijesh Singh
2017-11-01 21:16 ` Brijesh Singh [this message]
2017-11-06 10:34 ` [Part2 PATCH v7 23/38] KVM: SVM: Reserve ASID range for SEV guest Borislav Petkov
2017-11-06 16:18 ` Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 24/38] KVM: Define SEV key management command id Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 25/38] KVM: SVM: Add KVM_SEV_INIT command Brijesh Singh
2017-11-06 10:57 ` Borislav Petkov
2017-11-06 16:19 ` Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 26/38] KVM: SVM: VMRUN should use associated ASID when SEV is enabled Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 27/38] KVM: SVM: Add support for KVM_SEV_LAUNCH_START command Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 28/38] KVM: SVM: Add support for KVM_SEV_LAUNCH_UPDATE_DATA command Brijesh Singh
2017-11-01 21:16 ` [Part2 PATCH v7 29/38] KVM: SVM: Add support for KVM_SEV_LAUNCH_MEASURE command Brijesh Singh
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=20171101211623.71496-24-brijesh.singh@amd.com \
--to=brijesh.singh@amd.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).