From nobody Thu Apr 25 20:49:36 2024 Delivered-To: importer@patchew.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=1590050604; cv=none; d=zohomail.com; s=zohoarc; b=e5itFbSuTNT9RSV+UxvqgIpUTdfykamTirUpOBkGpuCREksI3CisENQgKrdKbTv2RFgrGzvX9FKUM9Rj4kOdIz9a6wAqgtSchMrJ+P8TuZE+ZBZUCRaUFJL/Z2TPMFw34kQcNHuotwEArbxdzoYCtD0yVRGUJrBAyJwd2Ag20Y4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590050604; h=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=QQeyNMYyr6h5PfngvnfF/86Fl3mYVL82wgSLqkkAHQg=; b=GgktSX4/wDCbI1ux439tsQUVTS815OjeLe8etd2MjNQPvxmQF06tfyO4/xhvsLS417gDFyc9IqlmjlvDsl5xrsic1TWtD50FHXW6BG5aPa69VWNTl7WJcXh236VyWOLh6G/zNrq9+x91AJzeRyu1aB3WBr2vOJFNXhfLEPIq5+M= 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 15900506040621007.7722512623485; Thu, 21 May 2020 01:43:24 -0700 (PDT) Received: from localhost ([::1]:38468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbgnS-0003BS-63 for importer@patchew.org; Thu, 21 May 2020 04:43:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbgmh-0002eR-O7; Thu, 21 May 2020 04:42:35 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jbgmg-0000C2-AX; Thu, 21 May 2020 04:42:35 -0400 Received: by mail-wm1-x343.google.com with SMTP id n18so5530288wmj.5; Thu, 21 May 2020 01:42:32 -0700 (PDT) Received: from donizetti.redhat.com ([151.30.94.134]) by smtp.gmail.com with ESMTPSA id t14sm5153398wrb.56.2020.05.21.01.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 01:42:30 -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:mime-version :content-transfer-encoding; bh=QQeyNMYyr6h5PfngvnfF/86Fl3mYVL82wgSLqkkAHQg=; b=eEvsr0TYeas0gkH7cs4SLzulzE/hE25fjLhZ3vlqQNRpavLhHzN3PmKPITKmlWDE42 D8VJdiJkpMsuGDoXA3pa3BtnPHKtJFDT0mezGHMmdc2Q8H5LGNG1DRS4llbdDFuYzARl begsAP7HPb5prFzzVIyniedYoPYgSDa2yBapWAJG6K1tHXwbAyTnKZksUyOgudo1ntJH sA+fha3pXU86vddpdGer20DF+CkDaaP1bCiRdhWkvFVoTBlDSm762BOeHOa4DNUFQUeu lHhFmwHr+ECZ0OXzIYVONK6iR7ZXjwLHTKLYZ7Rh8BrgiBgSGtMNDebuc9vgi9TVZJzh PdjQ== 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 :mime-version:content-transfer-encoding; bh=QQeyNMYyr6h5PfngvnfF/86Fl3mYVL82wgSLqkkAHQg=; b=hyQBTT41VMkznhi3Pq7Jq8JQNGde7TpB7rDtaNIe3lw/JB2LKGFfNtkgpQUn7QatMP g14vg+gRxLxpu+gOE57vSFaiLxMyeMViV52g72jSoU/hImEtEtnqo9lD3exerktTYcJU v3eF7AK9vvt4rGoyNfgI704XnFN7zCKITDhBfKH9HK9DsoZza/qX51n7DdmvRgVKDL5+ 8UKmL3Z3GSMRAGeFRwuLD+HudHIJrXqfE+SaqWynAFWTUf1z1jRt2iKtMvC6dZ2UVY7I h1sdf9nCRqBLdqXnsE2gJiFqi7U5+z7B8HOyOGhAULL0KeFYoqZlLG7LIrgx2DWUsnvD VdiA== X-Gm-Message-State: AOAM532sJp9G/cv8kkQrrjwCTQ2y9ZR3xI4ZJZRHXpOQ5J9f18jiPHV6 /avdmVjN+Ko49AA7oKjb5Kd+pbbs X-Google-Smtp-Source: ABdhPJxiU7svautQk2/DqO/wP74cYWHQVLPY32vIvIkil7RT/dnJruvfdHHoyROxI/1bOXkIgc/Xqg== X-Received: by 2002:a7b:cbc5:: with SMTP id n5mr8152828wmi.110.1590050551464; Thu, 21 May 2020 01:42:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] target-i386: do not force-expose WAITPKG if -overcommit cpu-pm=on Date: Thu, 21 May 2020 10:42:29 +0200 Message-Id: <20200521084229.13235-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 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=2a00:1450:4864:20::343; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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: ehabkost@redhat.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) Content-Type: text/plain; charset="utf-8" By force-enabling the WAITPKG bit whenever -overcommit cpu-pm=3Don is used, commit 67192a298f ("x86/cpu: Add support for UMONITOR/UMWAIT/TPAUSE", 2019-10-23) broke that option is the host processor does not have WAITPKG or the host kernel is too old. This is because TPAUSE, UMWAIT and UMONITOR are not NOPs on older processors (though perhaps they should have been!). Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target/i386/kvm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 6513584948..6554fdef3c 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -408,9 +408,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint= 32_t function, 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 { + if (!enable_cpu_pm) { ret &=3D ~CPUID_7_0_ECX_WAITPKG; } } else if (function =3D=3D 7 && index =3D=3D 0 && reg =3D=3D R_EDX) { --=20 2.25.4