KVM Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2 0/3] KVM: x86: fixes for speculation bug feature reporting
@ 2019-08-21  8:26 Paolo Bonzini
  2019-08-21  8:26 ` [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf Paolo Bonzini
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Paolo Bonzini @ 2019-08-21  8:26 UTC (permalink / raw)
  To: linux-kernel, kvm; +Cc: jmattson, ehabkost, konrad.wilk

Patches 1 and 2 are the same as the previous patch, but using
svm_get_supported_cpuid and with a fix to the placement of cpuid_mask.

Patch 3 is new and, unlike the previous one, will only be in kvm/next.

Paolo Bonzini (3):
  KVM: x86: fix reporting of AMD speculation bug CPUID leaf
  KVM: x86: always expose VIRT_SSBD to guests
  KVM: x86: use Intel speculation bugs and features as derived in
    generic x86 code

 arch/x86/kvm/cpuid.c | 27 +++++++++++++++++++--------
 arch/x86/kvm/svm.c   | 13 +++++++++----
 arch/x86/kvm/x86.c   |  7 +++++++
 3 files changed, 35 insertions(+), 12 deletions(-)

-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf
  2019-08-21  8:26 [PATCH v2 0/3] KVM: x86: fixes for speculation bug feature reporting Paolo Bonzini
@ 2019-08-21  8:26 ` Paolo Bonzini
  2019-08-21 19:45   ` Jim Mattson
  2019-08-22 18:46   ` Konrad Rzeszutek Wilk
  2019-08-21  8:26 ` [PATCH 2/3] KVM: x86: always expose VIRT_SSBD to guests Paolo Bonzini
  2019-08-21  8:26 ` [PATCH 3/3] KVM: x86: use Intel speculation bugs and features as derived in generic x86 code Paolo Bonzini
  2 siblings, 2 replies; 10+ messages in thread
From: Paolo Bonzini @ 2019-08-21  8:26 UTC (permalink / raw)
  To: linux-kernel, kvm; +Cc: jmattson, ehabkost, konrad.wilk

The AMD_* bits have to be set from the vendor-independent
feature and bug flags, because KVM_GET_SUPPORTED_CPUID does not care
about the vendor and they should be set on Intel processors as well.
On top of this, SSBD, STIBP and AMD_SSB_NO bit were not set, and
VIRT_SSBD does not have to be added manually because it is a
cpufeature that comes directly from the host's CPUID bit.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/cpuid.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 22c2720cd948..43caeb6059b9 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -729,18 +729,23 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
 			g_phys_as = phys_as;
 		entry->eax = g_phys_as | (virt_as << 8);
 		entry->edx = 0;
+		entry->ebx &= kvm_cpuid_8000_0008_ebx_x86_features;
+		cpuid_mask(&entry->ebx, CPUID_8000_0008_EBX);
 		/*
-		 * IBRS, IBPB and VIRT_SSBD aren't necessarily present in
-		 * hardware cpuid
+		 * AMD has separate bits for each SPEC_CTRL bit.
+		 * arch/x86/kernel/cpu/bugs.c is kind enough to
+		 * record that in cpufeatures so use them.
 		 */
-		if (boot_cpu_has(X86_FEATURE_AMD_IBPB))
+		if (boot_cpu_has(X86_FEATURE_IBPB))
 			entry->ebx |= F(AMD_IBPB);
-		if (boot_cpu_has(X86_FEATURE_AMD_IBRS))
+		if (boot_cpu_has(X86_FEATURE_IBRS))
 			entry->ebx |= F(AMD_IBRS);
-		if (boot_cpu_has(X86_FEATURE_VIRT_SSBD))
-			entry->ebx |= F(VIRT_SSBD);
-		entry->ebx &= kvm_cpuid_8000_0008_ebx_x86_features;
-		cpuid_mask(&entry->ebx, CPUID_8000_0008_EBX);
+		if (boot_cpu_has(X86_FEATURE_STIBP))
+			entry->ebx |= F(AMD_STIBP);
+		if (boot_cpu_has(X86_FEATURE_SSBD))
+			entry->ebx |= F(AMD_SSBD);
+		if (!boot_cpu_has_bug(X86_BUG_SPEC_STORE_BYPASS))
+			entry->ebx |= F(AMD_SSB_NO);
 		/*
 		 * The preference is to use SPEC CTRL MSR instead of the
 		 * VIRT_SPEC MSR.
-- 
1.8.3.1



^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 2/3] KVM: x86: always expose VIRT_SSBD to guests
  2019-08-21  8:26 [PATCH v2 0/3] KVM: x86: fixes for speculation bug feature reporting Paolo Bonzini
  2019-08-21  8:26 ` [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf Paolo Bonzini
@ 2019-08-21  8:26 ` Paolo Bonzini
  2019-08-21 19:47   ` Jim Mattson
  2019-08-22 18:44   ` Konrad Rzeszutek Wilk
  2019-08-21  8:26 ` [PATCH 3/3] KVM: x86: use Intel speculation bugs and features as derived in generic x86 code Paolo Bonzini
  2 siblings, 2 replies; 10+ messages in thread
From: Paolo Bonzini @ 2019-08-21  8:26 UTC (permalink / raw)
  To: linux-kernel, kvm; +Cc: jmattson, ehabkost, konrad.wilk

Even though it is preferrable to use SPEC_CTRL (represented by
X86_FEATURE_AMD_SSBD) instead of VIRT_SPEC, VIRT_SPEC is always
supported anyway because otherwise it would be impossible to
migrate from old to new CPUs.  Make this apparent in the
result of KVM_GET_SUPPORTED_CPUID as well.

While at it, reuse X86_FEATURE_* constants for the SVM leaf too.

However, we need to hide the bit on Intel processors, so move
the setting to svm_set_supported_cpuid.

Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/svm.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index e3d3b2128f2b..c5120a9519f3 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -68,10 +68,8 @@
 #define SEG_TYPE_LDT 2
 #define SEG_TYPE_BUSY_TSS16 3
 
-#define SVM_FEATURE_NPT            (1 <<  0)
 #define SVM_FEATURE_LBRV           (1 <<  1)
 #define SVM_FEATURE_SVML           (1 <<  2)
-#define SVM_FEATURE_NRIP           (1 <<  3)
 #define SVM_FEATURE_TSC_RATE       (1 <<  4)
 #define SVM_FEATURE_VMCB_CLEAN     (1 <<  5)
 #define SVM_FEATURE_FLUSH_ASID     (1 <<  6)
@@ -5933,6 +5931,8 @@ static void svm_cpuid_update(struct kvm_vcpu *vcpu)
 	guest_cpuid_clear(vcpu, X86_FEATURE_X2APIC);
 }
 
+#define F(x) bit(X86_FEATURE_##x)
+
 static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
 {
 	switch (func) {
@@ -5944,6 +5944,11 @@ static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
 		if (nested)
 			entry->ecx |= (1 << 2); /* Set SVM bit */
 		break;
+	case 0x80000008:
+		if (boot_cpu_has(X86_FEATURE_LS_CFG_SSBD) ||
+		     boot_cpu_has(X86_FEATURE_AMD_SSBD))
+			entry->ebx |= F(VIRT_SSBD);
+		break;
 	case 0x8000000A:
 		entry->eax = 1; /* SVM revision 1 */
 		entry->ebx = 8; /* Lets support 8 ASIDs in case we add proper
@@ -5954,11 +5959,11 @@ static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
 
 		/* Support next_rip if host supports it */
 		if (boot_cpu_has(X86_FEATURE_NRIPS))
-			entry->edx |= SVM_FEATURE_NRIP;
+			entry->edx |= F(NRIPS);
 
 		/* Support NPT for the guest if enabled */
 		if (npt_enabled)
-			entry->edx |= SVM_FEATURE_NPT;
+			entry->edx |= F(NPT);
 
 		break;
 	case 0x8000001F:
-- 
1.8.3.1



^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 3/3] KVM: x86: use Intel speculation bugs and features as derived in generic x86 code
  2019-08-21  8:26 [PATCH v2 0/3] KVM: x86: fixes for speculation bug feature reporting Paolo Bonzini
  2019-08-21  8:26 ` [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf Paolo Bonzini
  2019-08-21  8:26 ` [PATCH 2/3] KVM: x86: always expose VIRT_SSBD to guests Paolo Bonzini
@ 2019-08-21  8:26 ` Paolo Bonzini
  2019-08-21 19:48   ` Jim Mattson
  2019-08-22 18:45   ` Konrad Rzeszutek Wilk
  2 siblings, 2 replies; 10+ messages in thread
From: Paolo Bonzini @ 2019-08-21  8:26 UTC (permalink / raw)
  To: linux-kernel, kvm; +Cc: jmattson, ehabkost, konrad.wilk

Similar to AMD bits, set the Intel bits from the vendor-independent
feature and bug flags, because KVM_GET_SUPPORTED_CPUID does not care
about the vendor and they should be set on AMD processors as well.

Suggested-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/cpuid.c | 6 ++++++
 arch/x86/kvm/x86.c   | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 43caeb6059b9..dd5985eb61b4 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -392,6 +392,12 @@ static inline void do_cpuid_7_mask(struct kvm_cpuid_entry2 *entry, int index)
 
 		entry->edx &= kvm_cpuid_7_0_edx_x86_features;
 		cpuid_mask(&entry->edx, CPUID_7_EDX);
+		if (boot_cpu_has(X86_FEATURE_IBPB) && boot_cpu_has(X86_FEATURE_IBRS))
+			entry->edx |= F(SPEC_CTRL);
+		if (boot_cpu_has(X86_FEATURE_STIBP))
+			entry->edx |= F(INTEL_STIBP);
+		if (boot_cpu_has(X86_FEATURE_SSBD))
+			entry->edx |= F(SPEC_CTRL_SSBD);
 		/*
 		 * We emulate ARCH_CAPABILITIES in software even
 		 * if the host doesn't support it.
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 93b0bd45ac73..6b81c7609d09 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1254,6 +1254,13 @@ static u64 kvm_get_arch_capabilities(void)
 	if (l1tf_vmx_mitigation != VMENTER_L1D_FLUSH_NEVER)
 		data |= ARCH_CAP_SKIP_VMENTRY_L1DFLUSH;
 
+	if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
+		data |= ARCH_CAP_RDCL_NO;
+	if (!boot_cpu_has_bug(X86_BUG_SPEC_STORE_BYPASS))
+		data |= ARCH_CAP_SSB_NO;
+	if (!boot_cpu_has_bug(X86_BUG_MDS))
+		data |= ARCH_CAP_MDS_NO;
+
 	return data;
 }
 
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf
  2019-08-21  8:26 ` [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf Paolo Bonzini
@ 2019-08-21 19:45   ` Jim Mattson
  2019-08-22 18:46   ` Konrad Rzeszutek Wilk
  1 sibling, 0 replies; 10+ messages in thread
From: Jim Mattson @ 2019-08-21 19:45 UTC (permalink / raw)
  To: Paolo Bonzini
  Cc: LKML, kvm list, jmattson, Eduardo Habkost, Konrad Rzeszutek Wilk

On Wed, Aug 21, 2019 at 1:27 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The AMD_* bits have to be set from the vendor-independent
> feature and bug flags, because KVM_GET_SUPPORTED_CPUID does not care
> about the vendor and they should be set on Intel processors as well.
> On top of this, SSBD, STIBP and AMD_SSB_NO bit were not set, and
> VIRT_SSBD does not have to be added manually because it is a
> cpufeature that comes directly from the host's CPUID bit.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Jim Mattson <jmattson@google.com>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 2/3] KVM: x86: always expose VIRT_SSBD to guests
  2019-08-21  8:26 ` [PATCH 2/3] KVM: x86: always expose VIRT_SSBD to guests Paolo Bonzini
@ 2019-08-21 19:47   ` Jim Mattson
  2019-08-22 18:44   ` Konrad Rzeszutek Wilk
  1 sibling, 0 replies; 10+ messages in thread
From: Jim Mattson @ 2019-08-21 19:47 UTC (permalink / raw)
  To: Paolo Bonzini
  Cc: LKML, kvm list, jmattson, Eduardo Habkost, Konrad Rzeszutek Wilk

On Wed, Aug 21, 2019 at 1:27 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Even though it is preferrable to use SPEC_CTRL (represented by
> X86_FEATURE_AMD_SSBD) instead of VIRT_SPEC, VIRT_SPEC is always
> supported anyway because otherwise it would be impossible to
> migrate from old to new CPUs.  Make this apparent in the
> result of KVM_GET_SUPPORTED_CPUID as well.
>
> While at it, reuse X86_FEATURE_* constants for the SVM leaf too.
>
> However, we need to hide the bit on Intel processors, so move
> the setting to svm_set_supported_cpuid.
>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Reported-by: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Jim Mattson <jmattson@google.com>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/3] KVM: x86: use Intel speculation bugs and features as derived in generic x86 code
  2019-08-21  8:26 ` [PATCH 3/3] KVM: x86: use Intel speculation bugs and features as derived in generic x86 code Paolo Bonzini
@ 2019-08-21 19:48   ` Jim Mattson
  2019-08-22 18:45   ` Konrad Rzeszutek Wilk
  1 sibling, 0 replies; 10+ messages in thread
From: Jim Mattson @ 2019-08-21 19:48 UTC (permalink / raw)
  To: Paolo Bonzini
  Cc: LKML, kvm list, jmattson, Eduardo Habkost, Konrad Rzeszutek Wilk

On Wed, Aug 21, 2019 at 1:27 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> Similar to AMD bits, set the Intel bits from the vendor-independent
> feature and bug flags, because KVM_GET_SUPPORTED_CPUID does not care
> about the vendor and they should be set on AMD processors as well.
>
> Suggested-by: Jim Mattson <jmattson@google.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Jim Mattson <jmattson@google.com>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 2/3] KVM: x86: always expose VIRT_SSBD to guests
  2019-08-21  8:26 ` [PATCH 2/3] KVM: x86: always expose VIRT_SSBD to guests Paolo Bonzini
  2019-08-21 19:47   ` Jim Mattson
@ 2019-08-22 18:44   ` Konrad Rzeszutek Wilk
  1 sibling, 0 replies; 10+ messages in thread
From: Konrad Rzeszutek Wilk @ 2019-08-22 18:44 UTC (permalink / raw)
  To: Paolo Bonzini; +Cc: linux-kernel, kvm, jmattson, ehabkost

On Wed, Aug 21, 2019 at 10:26:41AM +0200, Paolo Bonzini wrote:
> Even though it is preferrable to use SPEC_CTRL (represented by
> X86_FEATURE_AMD_SSBD) instead of VIRT_SPEC, VIRT_SPEC is always
> supported anyway because otherwise it would be impossible to
> migrate from old to new CPUs.  Make this apparent in the
> result of KVM_GET_SUPPORTED_CPUID as well.
> 
> While at it, reuse X86_FEATURE_* constants for the SVM leaf too.
> 
> However, we need to hide the bit on Intel processors, so move
> the setting to svm_set_supported_cpuid.
> 
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Thank you!

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/3] KVM: x86: use Intel speculation bugs and features as derived in generic x86 code
  2019-08-21  8:26 ` [PATCH 3/3] KVM: x86: use Intel speculation bugs and features as derived in generic x86 code Paolo Bonzini
  2019-08-21 19:48   ` Jim Mattson
@ 2019-08-22 18:45   ` Konrad Rzeszutek Wilk
  1 sibling, 0 replies; 10+ messages in thread
From: Konrad Rzeszutek Wilk @ 2019-08-22 18:45 UTC (permalink / raw)
  To: Paolo Bonzini; +Cc: linux-kernel, kvm, jmattson, ehabkost

On Wed, Aug 21, 2019 at 10:26:42AM +0200, Paolo Bonzini wrote:
> Similar to AMD bits, set the Intel bits from the vendor-independent
> feature and bug flags, because KVM_GET_SUPPORTED_CPUID does not care
> about the vendor and they should be set on AMD processors as well.
> 
> Suggested-by: Jim Mattson <jmattson@google.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Thank you!

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf
  2019-08-21  8:26 ` [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf Paolo Bonzini
  2019-08-21 19:45   ` Jim Mattson
@ 2019-08-22 18:46   ` Konrad Rzeszutek Wilk
  1 sibling, 0 replies; 10+ messages in thread
From: Konrad Rzeszutek Wilk @ 2019-08-22 18:46 UTC (permalink / raw)
  To: Paolo Bonzini; +Cc: linux-kernel, kvm, jmattson, ehabkost

On Wed, Aug 21, 2019 at 10:26:40AM +0200, Paolo Bonzini wrote:
> The AMD_* bits have to be set from the vendor-independent
> feature and bug flags, because KVM_GET_SUPPORTED_CPUID does not care
> about the vendor and they should be set on Intel processors as well.
> On top of this, SSBD, STIBP and AMD_SSB_NO bit were not set, and
> VIRT_SSBD does not have to be added manually because it is a
> cpufeature that comes directly from the host's CPUID bit.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Thank you!

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, back to index

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-21  8:26 [PATCH v2 0/3] KVM: x86: fixes for speculation bug feature reporting Paolo Bonzini
2019-08-21  8:26 ` [PATCH 1/3] KVM: x86: fix reporting of AMD speculation bug CPUID leaf Paolo Bonzini
2019-08-21 19:45   ` Jim Mattson
2019-08-22 18:46   ` Konrad Rzeszutek Wilk
2019-08-21  8:26 ` [PATCH 2/3] KVM: x86: always expose VIRT_SSBD to guests Paolo Bonzini
2019-08-21 19:47   ` Jim Mattson
2019-08-22 18:44   ` Konrad Rzeszutek Wilk
2019-08-21  8:26 ` [PATCH 3/3] KVM: x86: use Intel speculation bugs and features as derived in generic x86 code Paolo Bonzini
2019-08-21 19:48   ` Jim Mattson
2019-08-22 18:45   ` Konrad Rzeszutek Wilk

KVM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/kvm/0 kvm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 kvm kvm/ https://lore.kernel.org/kvm \
		kvm@vger.kernel.org kvm@archiver.kernel.org
	public-inbox-index kvm


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.kvm


AGPL code for this site: git clone https://public-inbox.org/ public-inbox