From nobody Tue Nov 4 15:26:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530218766814630.0420500374556; Thu, 28 Jun 2018 13:46:06 -0700 (PDT) Received: from localhost ([::1]:38507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdnm-0008Hc-Lc for importer@patchew.org; Thu, 28 Jun 2018 16:46:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdB9-0007r2-Cw for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:06:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYdB8-0001Hd-Ar for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:06:07 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:43333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYdB8-0001Di-3Z for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:06:06 -0400 Received: by mail-wr0-x22b.google.com with SMTP id c5-v6so6682437wrs.10 for ; Thu, 28 Jun 2018 13:06:06 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 127-v6sm6211110wmd.18.2018.06.28.13.06.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:06:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=11b/2Qh4va607wMFix7Rh5tVqH0iqJ2Q2iZsA8zdnww=; b=EPMoYAAwdj7eQrBIpZYE7Ex3PUuZiIYcdxNSLg32Q6bkZPCLOFV+pjvbY4AHcANxdx 2UDDfunLtUL0cQEeHre1vnA2+VMO706yHNqPmaghsmdQfOOLdyqEGPHx/2IUUmUWH8e3 7ECm9M2pWftJLEykascz+7PCR8rS9MIcDgTKiW5uEJJjR5SgbEFu7FeAMKYVqOhQKbYl F642H2w2esUq8xcO1XFJcL6LA3ZsO+3L/MEu5ilrZj/mrXh50kMdEZKypcs7VGqVgrXO vBWgdtXAS2NuTCbq1Ij5tGao6GcBI22eU5Wh5pjtbpxq1xQO5QH0hzKOGKOfMlAoRpvV 8nsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=11b/2Qh4va607wMFix7Rh5tVqH0iqJ2Q2iZsA8zdnww=; b=lu4zBnF0+kpE/ac+Mv3r838rXvwO89Hm+ezUBek3EZdGGg69Rg/mVlLKdOdttMtxOY BzZ90X6Uu5Z+cHjbzpC7/p7Ef/bmko6rYhNpvKWjLbsn4x/nntvdsPl0nIhyBUpPpi/6 2K3uStQEgSxND29yRqQFtCg91y2TtGnVkAEeMf/lXapE0xmxb+9m4ipVfSMOnDqCukCy 7J9VA9yGxoJahq4ZmcWiysX7sAzo7n4hsLcaNQgVUiBWZskLOVd4HS2GLR4ELSyTkMm0 nfnhmUqC9e2XqMVaa1E3Tcp/5o5Bv8rOglcnR/etmKowftc5Xt4eJJXOZ0BVu+tABG4h U9cg== X-Gm-Message-State: APt69E10zTmbyi2ZVzXK8za+YkE6pIB+EqxoRNR1PFB5iZO49z8QA7dw ykDFVSBDccrWr5ke4b6B9heBPOsW X-Google-Smtp-Source: AAOMgpcmcGANfn4ZAziIx/EzdTckn0uAFE1JMmbcA5TbOcRSEvxQFtL+0d23lrNlQgQCS2lHi4QY6g== X-Received: by 2002:adf:c301:: with SMTP id n1-v6mr10279909wrf.270.1530216364825; Thu, 28 Jun 2018 13:06:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:05:02 +0200 Message-Id: <1530216310-52873-53-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> References: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22b Subject: [Qemu-devel] [PULL 52/60] i386/cpu: make -cpu host support monitor/mwait X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Michael S. Tsirkin" When guest CPU PM is enabled, and with -cpu host, expose the host CPU MWAIT leaf in the CPUID so guest can make good PM decisions. Note: the result is 100% CPU utilization reported by host as host no longer knows that the CPU is halted. Signed-off-by: Michael S. Tsirkin Reviewed-by: Eduardo Habkost Message-Id: <20180622192148.178309-3-mst@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 19 ++++++++++++++----- target/i386/cpu.h | 9 +++++++++ target/i386/kvm.c | 9 +++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index e6c2f8a..b54f36a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3959,11 +3959,11 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, } break; case 5: - /* mwait info: needed for Core compatibility */ - *eax =3D 0; /* Smallest monitor-line size in bytes */ - *ebx =3D 0; /* Largest monitor-line size in bytes */ - *ecx =3D CPUID_MWAIT_EMX | CPUID_MWAIT_IBE; - *edx =3D 0; + /* MONITOR/MWAIT Leaf */ + *eax =3D cpu->mwait.eax; /* Smallest monitor-line size in bytes */ + *ebx =3D cpu->mwait.ebx; /* Largest monitor-line size in bytes */ + *ecx =3D cpu->mwait.ecx; /* flags */ + *edx =3D cpu->mwait.edx; /* mwait substates */ break; case 6: /* Thermal and Power Leaf */ @@ -4811,6 +4811,15 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) goto out; } =20 + if (xcc->host_cpuid_required && enable_cpu_pm) { + host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx, + &cpu->mwait.ecx, &cpu->mwait.edx); + env->features[FEAT_1_ECX] |=3D CPUID_EXT_MONITOR; + } + /* 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; + if (cpu->apic_id =3D=3D UNASSIGNED_APIC_ID) { error_setg(errp, "apic-id property was not initialized properly"); return; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 16c59b7..8eaefee 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1382,6 +1382,15 @@ struct X86CPU { /* if true the CPUID code directly forward host cache leaves to the gu= est */ bool cache_info_passthrough; =20 + /* if true the CPUID code directly forwards + * host monitor/mwait leaves to the guest */ + struct { + uint32_t eax; + uint32_t ebx; + uint32_t ecx; + uint32_t edx; + } mwait; + /* Features that were filtered out because of missing host capabilitie= s */ uint32_t filtered_features[FEATURE_WORDS]; =20 diff --git a/target/i386/kvm.c b/target/i386/kvm.c index dc991f6..c5f72d6 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -366,6 +366,15 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uin= t32_t function, if (!kvm_irqchip_in_kernel()) { ret &=3D ~CPUID_EXT_X2APIC; } + + if (enable_cpu_pm) { + int disable_exits =3D kvm_check_extension(s, + KVM_CAP_X86_DISABLE_EX= ITS); + + if (disable_exits & KVM_X86_DISABLE_EXITS_MWAIT) { + ret |=3D CPUID_EXT_MONITOR; + } + } } else if (function =3D=3D 6 && reg =3D=3D R_EAX) { ret |=3D CPUID_6_EAX_ARAT; /* safe to allow because of emulated AP= IC */ } else if (function =3D=3D 7 && index =3D=3D 0 && reg =3D=3D R_EBX) { --=20 1.8.3.1