From nobody Mon Feb 9 07:15:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593530041; cv=none; d=zohomail.com; s=zohoarc; b=AiPOAw7aHTs0cTmXFoVsv6JjGVf9rW/opVKaZxR77mlObS7QxY03Eq49LdVo5OqJrrlmrntB4gz+c05KKB3hqid8zRZplOUhkQBoTKDoZ6/ZFBvPg+LuQplZOJw6tcxKuuFu1sLhlJ1ZglBiqhni/reH6xjc14V6h1PDU9kovgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593530041; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=uP0c6irLZ6kVnyOWAa7zHg/TP/Hw78U+sog6plFEIVI=; b=HgAcWoh4VpVScIV4QGGN5nWZUQNCR7G5DRt9A61FfkH7IYlY/raNAu1ru4+SQ5kXUDGxVp0/mc/mK3PrkYGgUO9OdHSiAKMhGS8p+vWbC0akROIG/uBbXEsqlmbzo+pfZkoT3wZxBKpJLbp/Notk+xMacLLilg+rU9eJRvLgBWI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 159353004119882.73880642848076; Tue, 30 Jun 2020 08:14:01 -0700 (PDT) Received: from localhost ([::1]:55944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqHxQ-0000fG-0y for importer@patchew.org; Tue, 30 Jun 2020 11:14:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqHvU-0007KQ-TM for qemu-devel@nongnu.org; Tue, 30 Jun 2020 11:12:00 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26400 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jqHvS-0006ez-HH for qemu-devel@nongnu.org; Tue, 30 Jun 2020 11:12:00 -0400 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-137-rG4X1N2nPsGDflZhM7zf1g-1; Tue, 30 Jun 2020 11:11:52 -0400 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 2E9E1EC1A0; Tue, 30 Jun 2020 15:11:51 +0000 (UTC) Received: from virtlab511.virt.lab.eng.bos.redhat.com (virtlab511.virt.lab.eng.bos.redhat.com [10.19.152.198]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0C7A60C81; Tue, 30 Jun 2020 15:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593529917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uP0c6irLZ6kVnyOWAa7zHg/TP/Hw78U+sog6plFEIVI=; b=VrgkhIdzJ9zisVpVK9hX98keT7qiuuvCLCFf/GDR/xNKiAE5lGxZa+FXa/Jsb3RJVd7NI2 Bv9iKl7WwApzQJyxExIugJIjGI15a2VCmDJmSOw3lhoOskolUFShfcklorpIF+bdp7ANBs /9gS02KBcLdp1iTQtTE/pGX4caokJ8U= X-MC-Unique: rG4X1N2nPsGDflZhM7zf1g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] KVM: x86: believe what KVM says about WAITPKG Date: Tue, 30 Jun 2020 11:11:50 -0400 Message-Id: <20200630151150.536580-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/30 00:34:33 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: qemu-stable@nongnu.org, Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Currently, QEMU is overriding KVM_GET_SUPPORTED_CPUID's answer for the WAITPKG bit depending on the "-overcommit cpu-pm" setting. This is a bad idea because it does not even check if the host supports it, but it can be done in x86_cpu_realizefn just like we do for the MONITOR bit. This patch moves it there, of course making it conditional on host availability which is not being done for the MONITOR bit. It also makes MONITOR conditional, though not strictly necessary, so that the code looks the same for both and generally more natural. Cc: qemu-stable@nongnu.org Reported-by: Maxim Levitsky Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 5 ++++- target/i386/kvm.c | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c44cc510e1..0de8dc569a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6535,7 +6535,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) if (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; + env->features[FEAT_1_ECX] |=3D + x86_cpu_get_supported_feature_word(FEAT_1_ECX, cpu->migrat= able) & CPUID_EXT_MONITOR; + env->features[FEAT_7_0_ECX] |=3D + x86_cpu_get_supported_feature_word(FEAT_7_0_ECX, cpu->migr= atable) & CPUID_7_0_ECX_WAITPKG; } if (kvm_enabled() && cpu->ucode_rev =3D=3D 0) { cpu->ucode_rev =3D kvm_arch_get_supported_msr_feature(kvm_stat= e, diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 2b6b7443d2..c9ef27080d 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -411,12 +411,6 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uin= t32_t function, if (host_tsx_blacklisted()) { ret &=3D ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE); } - } else if (function =3D=3D 7 && index =3D=3D 0 && reg =3D=3D R_ECX) { - if (enable_cpu_pm) { - ret |=3D CPUID_7_0_ECX_WAITPKG; - } else { - ret &=3D ~CPUID_7_0_ECX_WAITPKG; - } } else if (function =3D=3D 7 && index =3D=3D 0 && reg =3D=3D R_EDX) { /* * Linux v4.17-v4.20 incorrectly return ARCH_CAPABILITIES on SVM h= osts. --=20 2.26.2