From ff712825c31188b19ece7b9388630f6456bb10db Mon Sep 17 00:00:00 2001 From: "plai@redhat.com" Date: Tue, 20 Aug 2019 00:24:37 +0100 Subject: [PATCH 6/9] kvm: Use KVM_GET_MSR_INDEX_LIST for MSR_IA32_ARCH_CAPABILITIES support RH-Author: plai@redhat.com Message-id: <1566260680-20995-7-git-send-email-plai@redhat.com> Patchwork-id: 90065 O-Subject: [RHEL8.0 qemu-kvm PATCH v3 6/9] kvm: Use KVM_GET_MSR_INDEX_LIST for MSR_IA32_ARCH_CAPABILITIES support Bugzilla: 1718235 RH-Acked-by: Eduardo Habkost RH-Acked-by: John Snow RH-Acked-by: Igor Mammedov From: Bandan Das When writing to guest's MSR_IA32_ARCH_CAPABILITIES, check whether it's supported in the guest using the KVM_GET_MSR_INDEX_LIST ioctl. Fixes: d86f963694df27f11b3681ffd225c9362de1b634 Suggested-by: Eduardo Habkost Tested-by: balducci@units.it Signed-off-by: Bandan Das Message-Id: Signed-off-by: Eduardo Habkost (cherry picked from commit aec5e9c3a94cf8b7920f59bef69a6f426092c4a0) Signed-off-by: Paul Lai Signed-off-by: Danilo C. L. de Paula --- target/i386/kvm.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index d2cb91e..6f661b2 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -94,6 +94,7 @@ static bool has_msr_xss; static bool has_msr_spec_ctrl; static bool has_msr_virt_ssbd; static bool has_msr_smi_count; +static bool has_msr_arch_capabs; static uint32_t has_architectural_pmu_version; static uint32_t num_architectural_pmu_gp_counters; @@ -1330,6 +1331,9 @@ static int kvm_get_supported_msrs(KVMState *s) case MSR_VIRT_SSBD: has_msr_virt_ssbd = true; break; + case MSR_IA32_ARCH_CAPABILITIES: + has_msr_arch_capabs = true; + break; } } } @@ -1834,14 +1838,9 @@ static int kvm_put_msrs(X86CPU *cpu, int level) #endif /* If host supports feature MSR, write down. */ - if (kvm_feature_msrs) { - int i; - for (i = 0; i < kvm_feature_msrs->nmsrs; i++) - if (kvm_feature_msrs->indices[i] == MSR_IA32_ARCH_CAPABILITIES) { - kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES, - env->features[FEAT_ARCH_CAPABILITIES]); - break; - } + if (has_msr_arch_capabs) { + kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES, + env->features[FEAT_ARCH_CAPABILITIES]); } /* -- 1.8.3.1