|
 |
9ae3a8 |
From aa89186992d427e17118608c9fa02b36be8fab8e Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: "plai@redhat.com" <plai@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 23 Sep 2019 20:40:25 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 09/12] kvm: Use KVM_GET_MSR_INDEX_LIST for
|
|
|
9ae3a8 |
MSR_IA32_ARCH_CAPABILITIES support
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: plai@redhat.com
|
|
|
9ae3a8 |
Message-id: <1569271227-28026-9-git-send-email-plai@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 90861
|
|
|
9ae3a8 |
O-Subject: [RHEL7.8 qemu-kvm PATCH v6 08/10] kvm: Use KVM_GET_MSR_INDEX_LIST for MSR_IA32_ARCH_CAPABILITIES support
|
|
|
9ae3a8 |
Bugzilla: 1709971
|
|
|
9ae3a8 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
When writing to guest's MSR_IA32_ARCH_CAPABILITIES, check whether it's
|
|
|
9ae3a8 |
supported in the guest using the KVM_GET_MSR_INDEX_LIST ioctl.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Fixes: d86f963694df27f11b3681ffd225c9362de1b634
|
|
|
9ae3a8 |
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Tested-by: balducci@units.it
|
|
|
9ae3a8 |
Signed-off-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
Message-Id: <jpg4lc4iiav.fsf_-_@linux.bootlegged.copy>
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit aec5e9c3a94cf8b7920f59bef69a6f426092c4a0)
|
|
|
9ae3a8 |
Signed-off-by: Paul Lai <plai@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Resolved Conflicts:
|
|
|
9ae3a8 |
target/i386/kvm.c changes to target-i386/kvm.c
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
target-i386/cpu.h | 1 +
|
|
|
9ae3a8 |
target-i386/kvm.c | 19 +++++++++++--------
|
|
|
9ae3a8 |
2 files changed, 12 insertions(+), 8 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
|
|
|
9ae3a8 |
index 5a86b2c..8f73af7 100644
|
|
|
9ae3a8 |
--- a/target-i386/cpu.h
|
|
|
9ae3a8 |
+++ b/target-i386/cpu.h
|
|
|
9ae3a8 |
@@ -1070,6 +1070,7 @@ typedef struct CPUX86State {
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
uint64_t spec_ctrl;
|
|
|
9ae3a8 |
uint64_t virt_ssbd;
|
|
|
9ae3a8 |
+ uint64_t virt_arch_capabs;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
TPRAccess tpr_access_type;
|
|
|
9ae3a8 |
} CPUX86State;
|
|
|
9ae3a8 |
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
|
|
|
9ae3a8 |
index 722cfbc..12781a8 100644
|
|
|
9ae3a8 |
--- a/target-i386/kvm.c
|
|
|
9ae3a8 |
+++ b/target-i386/kvm.c
|
|
|
9ae3a8 |
@@ -81,6 +81,7 @@ static bool has_msr_mtrr;
|
|
|
9ae3a8 |
static bool has_msr_xss;
|
|
|
9ae3a8 |
static bool has_msr_spec_ctrl;
|
|
|
9ae3a8 |
static bool has_msr_virt_ssbd;
|
|
|
9ae3a8 |
+static bool has_msr_arch_capabs;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static bool has_msr_architectural_pmu;
|
|
|
9ae3a8 |
static uint32_t num_architectural_pmu_counters;
|
|
|
9ae3a8 |
@@ -902,6 +903,10 @@ static int kvm_get_supported_msrs(KVMState *s)
|
|
|
9ae3a8 |
has_msr_virt_ssbd = true;
|
|
|
9ae3a8 |
continue;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
+ if (kvm_msr_list->indices[i] == MSR_IA32_ARCH_CAPABILITIES) {
|
|
|
9ae3a8 |
+ has_msr_arch_capabs = true;
|
|
|
9ae3a8 |
+ continue;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -1340,14 +1345,9 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
/* If host supports feature MSR, write down. */
|
|
|
9ae3a8 |
- if (kvm_feature_msrs) {
|
|
|
9ae3a8 |
- int i;
|
|
|
9ae3a8 |
- for (i = 0; i < kvm_feature_msrs->nmsrs; i++)
|
|
|
9ae3a8 |
- if (kvm_feature_msrs->indices[i] == MSR_IA32_ARCH_CAPABILITIES) {
|
|
|
9ae3a8 |
- kvm_msr_entry_set(&msrs[n++], MSR_IA32_ARCH_CAPABILITIES,
|
|
|
9ae3a8 |
- env->features[FEAT_ARCH_CAPABILITIES]);
|
|
|
9ae3a8 |
- break;
|
|
|
9ae3a8 |
- }
|
|
|
9ae3a8 |
+ if (has_msr_arch_capabs) {
|
|
|
9ae3a8 |
+ kvm_msr_entry_set(&msrs[n++], MSR_IA32_ARCH_CAPABILITIES,
|
|
|
9ae3a8 |
+ env->features[FEAT_ARCH_CAPABILITIES]);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
/*
|
|
|
9ae3a8 |
* The following MSRs have side effects on the guest or are too heavy
|
|
|
9ae3a8 |
@@ -1939,6 +1939,9 @@ static int kvm_get_msrs(X86CPU *cpu)
|
|
|
9ae3a8 |
case MSR_VIRT_SSBD:
|
|
|
9ae3a8 |
env->virt_ssbd = msrs[i].data;
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
+ case MSR_IA32_ARCH_CAPABILITIES:
|
|
|
9ae3a8 |
+ env->features[FEAT_ARCH_CAPABILITIES] = msrs[i].data;
|
|
|
9ae3a8 |
+ break;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|