From nobody Fri May 3 04:54:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579544683; cv=none; d=zohomail.com; s=zohoarc; b=gpjzSyDevm2jYv639RwDjdu6AeLxdCmgNaiHpKX4vJj28B5igu2VJVWS9M4nQq0RpAjJLhLio1VA4025B8c/n2WoxsgGyDThweESqesdRWnkhZ2pQI80oKFIJ7hUObAergxAIbGxlQryNKhjOK848Xoho7NXAgyrhmIjx65aLko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579544683; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=8Fv0IKPF/yMuVLLryL5bveudWPKe7c/RAeaAxHEb/D8=; b=coppn8QYGed/0aWBSNTC12yxS22z1rphdlNYG9j2rXQ8+NAf0s5SrcKmrbs8AeHLbYCxUm8LEGVCb6XyiI8OOPhSK8iFVD0AYthvZx+x/DHRUk8lWbIa5lddL/b/RcOTdKDSwA85ZlXcCGxH4TQOl1XCb+7NCmcZusmkDMG4Pig= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579544683320831.1136944947554; Mon, 20 Jan 2020 10:24:43 -0800 (PST) Received: from localhost ([::1]:42552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itbj8-00025b-4t for importer@patchew.org; Mon, 20 Jan 2020 13:24:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56623) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itbgb-0007Dx-Du for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:22:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itbgX-0008JW-6O for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:22:05 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:30735 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1itbgW-0008Ix-5G for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:22:00 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-29-eJmgK06NMJCMGFyqT7FNKA-1; Mon, 20 Jan 2020 13:21:51 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B79292EE3; Mon, 20 Jan 2020 18:21:49 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.112.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4691860BF7; Mon, 20 Jan 2020 18:21:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579544519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8Fv0IKPF/yMuVLLryL5bveudWPKe7c/RAeaAxHEb/D8=; b=GiYZbaIr7ACyEYVqOCXVS55OipZr/rpAKud38AEypak5miST/ZtzLaVFUT3I85KTmREiQD /uV7AwCfELry39ZA2scphRTcrf+mHCrFarSKoJZAUVehhDWg0mlLVjqiPi+0os+qn7O8p6 OZkDyOA29UVkNd2TEv+anWe7xUreCHE= From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/3] target/i386: kvm: initialize feature MSRs very early Date: Mon, 20 Jan 2020 19:21:42 +0100 Message-Id: <1579544504-3616-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1579544504-3616-1-git-send-email-pbonzini@redhat.com> References: <1579544504-3616-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: eJmgK06NMJCMGFyqT7FNKA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vkuznets@redhat.com, liran.alon@oracle.com, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some read-only MSRs affect the behavior of ioctls such as KVM_SET_NESTED_STATE. We can initialize them once and for all right after the CPU is realized, since they will never be modified by the guest. Reported-by: Qingua Cheng Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/kvm.c | 81 ++++++++++++++++++++++++++++++----------------= ---- target/i386/kvm_i386.h | 1 + 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 7ee3202..f6dd6b7 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -67,6 +67,8 @@ * 255 kvm_msr_entry structs */ #define MSR_BUF_SIZE 4096 =20 +static void kvm_init_msrs(X86CPU *cpu); + const KVMCapabilityInfo kvm_arch_required_capabilities[] =3D { KVM_CAP_INFO(SET_TSS_ADDR), KVM_CAP_INFO(EXT_CPUID), @@ -1842,6 +1844,8 @@ int kvm_arch_init_vcpu(CPUState *cs) has_msr_tsc_aux =3D false; } =20 + kvm_init_msrs(cpu); + r =3D hyperv_init_vcpu(cpu); if (r) { goto fail; @@ -2660,11 +2664,53 @@ static void kvm_msr_entry_add_vmx(X86CPU *cpu, Feat= ureWordArray f) VMCS12_MAX_FIELD_INDEX << 1); } =20 +static int kvm_buf_set_msrs(X86CPU *cpu) +{ + int ret =3D kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf); + if (ret < 0) { + return ret; + } + + if (ret < cpu->kvm_msr_buf->nmsrs) { + struct kvm_msr_entry *e =3D &cpu->kvm_msr_buf->entries[ret]; + error_report("error: failed to set MSR 0x%" PRIx32 " to 0x%" PRIx6= 4, + (uint32_t)e->index, (uint64_t)e->data); + } + + assert(ret =3D=3D cpu->kvm_msr_buf->nmsrs); + return 0; +} + +static void kvm_init_msrs(X86CPU *cpu) +{ + CPUX86State *env =3D &cpu->env; + + kvm_msr_buf_reset(cpu); + if (has_msr_arch_capabs) { + kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES, + env->features[FEAT_ARCH_CAPABILITIES]); + } + + if (has_msr_core_capabs) { + kvm_msr_entry_add(cpu, MSR_IA32_CORE_CAPABILITY, + env->features[FEAT_CORE_CAPABILITY]); + } + + /* + * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but + * all kernels with MSR features should have them. + */ + if (kvm_feature_msrs && cpu_has_vmx(env)) { + kvm_msr_entry_add_vmx(cpu, env->features); + } + + assert(kvm_buf_set_msrs(cpu) =3D=3D 0); +} + static int kvm_put_msrs(X86CPU *cpu, int level) { CPUX86State *env =3D &cpu->env; int i; - int ret; =20 kvm_msr_buf_reset(cpu); =20 @@ -2722,17 +2768,6 @@ static int kvm_put_msrs(X86CPU *cpu, int level) } #endif =20 - /* If host supports feature MSR, write down. */ - if (has_msr_arch_capabs) { - kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES, - env->features[FEAT_ARCH_CAPABILITIES]); - } - - if (has_msr_core_capabs) { - kvm_msr_entry_add(cpu, MSR_IA32_CORE_CAPABILITY, - env->features[FEAT_CORE_CAPABILITY]); - } - /* * The following MSRs have side effects on the guest or are too heavy * for normal writeback. Limit them to reset or full state updates. @@ -2910,14 +2945,6 @@ static int kvm_put_msrs(X86CPU *cpu, int level) =20 /* Note: MSR_IA32_FEATURE_CONTROL is written separately, see * kvm_put_msr_feature_control. */ - - /* - * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST= , but - * all kernels with MSR features should have them. - */ - if (kvm_feature_msrs && cpu_has_vmx(env)) { - kvm_msr_entry_add_vmx(cpu, env->features); - } } =20 if (env->mcg_cap) { @@ -2933,19 +2960,7 @@ static int kvm_put_msrs(X86CPU *cpu, int level) } } =20 - ret =3D kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf); - if (ret < 0) { - return ret; - } - - if (ret < cpu->kvm_msr_buf->nmsrs) { - struct kvm_msr_entry *e =3D &cpu->kvm_msr_buf->entries[ret]; - error_report("error: failed to set MSR 0x%" PRIx32 " to 0x%" PRIx6= 4, - (uint32_t)e->index, (uint64_t)e->data); - } - - assert(ret =3D=3D cpu->kvm_msr_buf->nmsrs); - return 0; + return kvm_buf_set_msrs(cpu); } =20 =20 diff --git a/target/i386/kvm_i386.h b/target/i386/kvm_i386.h index 7d0242f..00bde7a 100644 --- a/target/i386/kvm_i386.h +++ b/target/i386/kvm_i386.h @@ -46,4 +46,5 @@ bool kvm_enable_x2apic(void); bool kvm_has_x2apic_api(void); =20 bool kvm_hv_vpindex_settable(void); + #endif --=20 1.8.3.1 From nobody Fri May 3 04:54:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579544602; cv=none; d=zohomail.com; s=zohoarc; b=iLBQCMJM0Jvm4xrztxAS/KOi6oXiAsMlWt5ZEc7WsxTkoMOQ6aPEMiKQmEOHLpqY0hHBNp9LLbYonLVlnDODFxj6iu8jZSwr6TYR/WkkbRlQLCRAfekVarS5t+WcUs7hUoEhH9khHRsv7hhklt4mh4Rzflm/q6H8o+fMMgWME3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579544602; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=4h394zVYwzBK1bDgWPwOkluW3Bm8JJtIZLYnXuoV6F0=; b=ff2OQberypJHBFh/LRWmpDAvn/VeIgeDZ/NmQXjekcZO2srHCu258Lk3IkOnuuJx1EEaN8B4kQZRfG1pYtIk3it9nazNzOiu82GJ1l2jQ4IFB7OYqUdOr/E0c8xc21aoagJy1RakzBx+ehvpelMIAW3n70ZiiLwg7A93t7q9EQk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579544602066728.7379946958472; Mon, 20 Jan 2020 10:23:22 -0800 (PST) Received: from localhost ([::1]:42532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itbho-0008Qu-Nr for importer@patchew.org; Mon, 20 Jan 2020 13:23:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56604) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itbgY-00074b-2v for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:22:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itbgT-0008H3-5D for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:22:02 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:59394 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1itbgS-0008Ga-LL for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:21:56 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-411-NU6wtaCEPF2qS_bdfr0z1A-1; Mon, 20 Jan 2020 13:21:52 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78DF28010C4; Mon, 20 Jan 2020 18:21:51 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.112.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3543260BF7; Mon, 20 Jan 2020 18:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579544515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4h394zVYwzBK1bDgWPwOkluW3Bm8JJtIZLYnXuoV6F0=; b=ANZAT28QTIKvsS7uEpggG2+1oxak0MqlNdotKwwxjJYGsscHoeVtu7/A3iyTPyo+oobDF/ g8/8otXt2pzUMfWKoeU3hthIEe2XPBnsXd9Q2TGnDkvW8JWqbbl5wyWKCZR37NNDJ6J9ok df7zEA4FPdvCdrelhDiKMMnqVI/08SE= From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/3] target/i386: add a ucode-rev property Date: Mon, 20 Jan 2020 19:21:43 +0100 Message-Id: <1579544504-3616-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1579544504-3616-1-git-send-email-pbonzini@redhat.com> References: <1579544504-3616-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: NU6wtaCEPF2qS_bdfr0z1A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vkuznets@redhat.com, liran.alon@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add the property and plumb it in TCG and HVF (the latter of which tried to support returning a constant value but used the wrong MSR). Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 10 ++++++++++ target/i386/cpu.h | 3 +++ target/i386/hvf/x86_emu.c | 4 +--- target/i386/misc_helper.c | 4 ++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 41f28ce..05ce64c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6418,6 +6418,15 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) } } =20 + if (cpu->ucode_rev =3D=3D 0) { + /* The default is the same as KVM's. */ + if (IS_AMD_CPU(env)) { + cpu->ucode_rev =3D 0x01000065; + } else { + cpu->ucode_rev =3D 0x100000000ULL; + } + } + /* mwait extended info: needed for Core compatibility */ /* We always wake on interrupt even if host does not have the capabili= ty */ cpu->mwait.ecx |=3D CPUID_MWAIT_EMX | CPUID_MWAIT_IBE; @@ -7100,6 +7109,7 @@ static Property x86_cpu_properties[] =3D { DEFINE_PROP_UINT32("min-level", X86CPU, env.cpuid_min_level, 0), DEFINE_PROP_UINT32("min-xlevel", X86CPU, env.cpuid_min_xlevel, 0), DEFINE_PROP_UINT32("min-xlevel2", X86CPU, env.cpuid_min_xlevel2, 0), + DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0), DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_leve= l, true), DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id), DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true), diff --git a/target/i386/cpu.h b/target/i386/cpu.h index e6de38a..576f309 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -348,6 +348,7 @@ typedef enum X86Seg { #define MSR_IA32_SPEC_CTRL 0x48 #define MSR_VIRT_SSBD 0xc001011f #define MSR_IA32_PRED_CMD 0x49 +#define MSR_IA32_UCODE_REV 0x8b #define MSR_IA32_CORE_CAPABILITY 0xcf =20 #define MSR_IA32_ARCH_CAPABILITIES 0x10a @@ -1627,6 +1628,8 @@ struct X86CPU { CPUNegativeOffsetState neg; CPUX86State env; =20 + uint64_t ucode_rev; + uint32_t hyperv_spinlock_attempts; char *hyperv_vendor_id; bool hyperv_synic_kvm_only; diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c index 3df7672..92ab815 100644 --- a/target/i386/hvf/x86_emu.c +++ b/target/i386/hvf/x86_emu.c @@ -664,8 +664,6 @@ static void exec_lods(struct CPUX86State *env, struct x= 86_decode *decode) RIP(env) +=3D decode->len; } =20 -#define MSR_IA32_UCODE_REV 0x00000017 - void simulate_rdmsr(struct CPUState *cpu) { X86CPU *x86_cpu =3D X86_CPU(cpu); @@ -681,7 +679,7 @@ void simulate_rdmsr(struct CPUState *cpu) val =3D cpu_get_apic_base(X86_CPU(cpu)->apic_state); break; case MSR_IA32_UCODE_REV: - val =3D (0x100000000ULL << 32) | 0x100000000ULL; + val =3D x86_cpu->ucode_rev; break; case MSR_EFER: val =3D rvmcs(cpu->hvf_fd, VMCS_GUEST_IA32_EFER); diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c index 3eff688..aed16fe 100644 --- a/target/i386/misc_helper.c +++ b/target/i386/misc_helper.c @@ -229,6 +229,7 @@ void helper_rdmsr(CPUX86State *env) #else void helper_wrmsr(CPUX86State *env) { + X86CPU *x86_cpu =3D env_archcpu(env); uint64_t val; =20 cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 1, GETPC()); @@ -371,6 +372,9 @@ void helper_wrmsr(CPUX86State *env) env->msr_bndcfgs =3D val; cpu_sync_bndcs_hflags(env); break; + case MSR_IA32_UCODE_REV: + val =3D x86_cpu->ucode_rev; + break; default: if ((uint32_t)env->regs[R_ECX] >=3D MSR_MC0_CTL && (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL + --=20 1.8.3.1 From nobody Fri May 3 04:54:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579544677; cv=none; d=zohomail.com; s=zohoarc; b=RUw69JMFJ8dvrL2SlZRqaZVUmNIjks0vead/LT5zIxm0EwaaMvwT7aJLofHMAjnsUM5ypSUoCox/lfv48Hh68JPbxuT8JZvNPaIhN7LamYDZF9rnzWljumRt4H+oGgvkgqPedb9I/eDfe/7t5GtbbJiqdI18FnHDN694YXPUO6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579544677; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=V+jR/1rAbzkovhkdRzOKFOz/6Lyar651g9ecZc89aww=; b=Ffp0G+MHbwn0oo6+yGVnbSrOXDIp+1CrI2f62tPGTi0KG34RnLq/PXAagwhvMA1CASyHR+ZiZiOoaTmhRBA3JXG9cQIKt7RpSK+EA1XljWN56O+qkRLGn8SOAO+DHzVbhUOHHT2P1q45/tt7jKIcmdUk8znejrlROAkAMGmfYvM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579544677559474.95586044870697; Mon, 20 Jan 2020 10:24:37 -0800 (PST) Received: from localhost ([::1]:42550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itbj2-0001xQ-GB for importer@patchew.org; Mon, 20 Jan 2020 13:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56615) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itbga-00079Z-DW for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:22:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itbgU-0008Ht-FZ for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:22:03 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:42470 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1itbgT-0008HL-RO for qemu-devel@nongnu.org; Mon, 20 Jan 2020 13:21:58 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-28-dkxmx-gzPbCPowLYZXsV4Q-1; Mon, 20 Jan 2020 13:21:54 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C4731854335; Mon, 20 Jan 2020 18:21:53 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.112.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC4AE60BF7; Mon, 20 Jan 2020 18:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579544517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=V+jR/1rAbzkovhkdRzOKFOz/6Lyar651g9ecZc89aww=; b=SOGGbMS3kNCUStQKE6g24B/Hg2IUPTUDkzGK6UG62hRkIhiJL53wcUvaJXozGCBg/w2iBV V7k+pwtq9GhJfexFWgWYsEjSgh1GH+O1TeWqTt1zkq36vzxlK67RspZEDrPBdZi1qQ+ODA gYtNdOnHlkRMfCt6tRFKS0gkG5KmnYk= From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/3] target/i386: kvm: initialize microcode revision from KVM Date: Mon, 20 Jan 2020 19:21:44 +0100 Message-Id: <1579544504-3616-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1579544504-3616-1-git-send-email-pbonzini@redhat.com> References: <1579544504-3616-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: dkxmx-gzPbCPowLYZXsV4Q-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vkuznets@redhat.com, liran.alon@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" KVM can return the host microcode revision as a feature MSR. Use it as the default value for -cpu host. Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 4 ++++ target/i386/kvm.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 05ce64c..1f731c1 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6416,6 +6416,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) &cpu->mwait.ecx, &cpu->mwait.edx); env->features[FEAT_1_ECX] |=3D CPUID_EXT_MONITOR; } + if (kvm_enabled() && cpu->ucode_rev =3D=3D 0) { + cpu->ucode_rev =3D kvm_arch_get_supported_msr_feature(kvm_stat= e, + MSR_IA32_U= CODE_REV); + } } =20 if (cpu->ucode_rev =3D=3D 0) { diff --git a/target/i386/kvm.c b/target/i386/kvm.c index f6dd6b7..26c1e78 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -2696,6 +2696,11 @@ static void kvm_init_msrs(X86CPU *cpu) env->features[FEAT_CORE_CAPABILITY]); } =20 + if (kvm_arch_get_supported_msr_feature(kvm_state, + MSR_IA32_UCODE_REV)) { + kvm_msr_entry_add(cpu, MSR_IA32_UCODE_REV, cpu->ucode_rev); + } + /* * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but * all kernels with MSR features should have them. --=20 1.8.3.1