From nobody Tue Feb 10 04:16:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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 (zoho.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=1568717699; cv=none; d=zoho.com; s=zohoarc; b=OeuxfU/GrTmglAo2npQoj7cenvOJu3ZhW8t4JbIeL1vXwmqsW7ahm0qFlSKvbgrDV6xJzo52cECkgRVST/0Xua1cvnGLt+A4wj6+oiLgd9afPb/EhCklJG+/5GFd/Og+TKbUGa6Y93Lju+ZZfOQG6OAjDuEN6p51Om8inmzQkiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568717699; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Kd0p6yXmgjigeU61/QAXfYOPrIpw2GObANA3tBzEWzw=; b=KvBNxjMtuuNkF8tMCZzGtYYCF7rF2sKpxCD+BtydI4516Ov1R2ACGHF5lSrxODuWqqr6TxzIvzLcL19CbI+5B/e4P7vaFp6zxzQmdffjO3+mavGo/l6CSL5JV9XsxBBwxbHG0EVHHEps9xhHG8Tn95eXpoXVvuf8BwzV4uLTkKM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.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 1568717699368166.13213825149217; Tue, 17 Sep 2019 03:54:59 -0700 (PDT) Received: from localhost ([::1]:44000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAB8J-0004CT-Hr for importer@patchew.org; Tue, 17 Sep 2019 06:54:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46888) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAAov-0001pU-VK for qemu-devel@nongnu.org; Tue, 17 Sep 2019 06:34:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAAou-00050z-Sc for qemu-devel@nongnu.org; Tue, 17 Sep 2019 06:34:53 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46892) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAAot-0004zi-04 for qemu-devel@nongnu.org; Tue, 17 Sep 2019 06:34:52 -0400 Received: by mail-wr1-x441.google.com with SMTP id o18so2515988wrv.13 for ; Tue, 17 Sep 2019 03:34:50 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q3sm1985415wrm.86.2019.09.17.03.34.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Sep 2019 03:34:48 -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=Kd0p6yXmgjigeU61/QAXfYOPrIpw2GObANA3tBzEWzw=; b=Tcy/TTqmdP3cFF8IWO4M8trtmbMDxfiSL9FtaY5WehJOFL8MKjoAHX0nP8mMQNW9eF 4wGBZymVJoYoOok5p1MNni3BO1YMpfGW7928XVgleiMzGbtaNOpOFUloOlqCOmpWX+0Q +xKJi0AN+yq2BvdMQlZ4G2ccLhPCFyHVYuO//OQZQXr+UwcHWh/lKDb6newdHjWhuoLs Nzwt49+dNJA6qbj1S2L0+EVypMWtzvjlTyaXR62QJf51qa0nv4CkjJx7OVbAncojP1MV DWS8HJWJX0Az/CjAetUiCYEQVQ4EyIiWMO/AQ0/OxW5TQNds4DhuQaZ9w65J9ES1QfqO TNmA== 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=Kd0p6yXmgjigeU61/QAXfYOPrIpw2GObANA3tBzEWzw=; b=jfvsmEjnxLxprHoJodofUMz08OfvmH7DXXZWhQH9AfuFkVCRG+uq9zbJR4HxZR+NSi feZYzGYLlLOQBy5ws9H5f5W+aJC+5EbXrIeNI5JBdmk5yNgH2XOXKY278IpUpsV0veIq 2ug5sPznV64rROQDVEGXJnTyCwczH6LLMVD2lIXAPVq5Bt/iUT972wBnubYgg2UsL+/9 ioJUtahAQxdIr1/iakF4MuV7CDmqYfYcYrj424RHFHyXJQ16mys4x97IOSoxd248lsBf f1ATAzzJ0RDgZLEHGMwjHyLRfiRvTOuJXpI6UxWz9VB346EOTwzu7nfvU2H/Q0iUkSXY KKUg== X-Gm-Message-State: APjAAAVD9IKlkBZppTw5n7j914wPwH6A2Cz2l9EsHarNxHMqDPl3WgwD JinKYYhLEqLeMHke1wAp7hIS3bsl X-Google-Smtp-Source: APXvYqw+9KAl0Byh1d2oNvbFfXtqjeaYoqdkpBc7zLE9aqUDgNP4li2hXn3ISv1cGVuZIsaWNxL4fA== X-Received: by 2002:a5d:66cb:: with SMTP id k11mr2237822wrw.174.1568716489579; Tue, 17 Sep 2019 03:34:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 17 Sep 2019 12:34:40 +0200 Message-Id: <1568716480-9973-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1568716480-9973-1-git-send-email-pbonzini@redhat.com> References: <1568716480-9973-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:4864:20::441 Subject: [Qemu-devel] [PATCH 7/7] target/i386: work around KVM_GET_MSRS bug for secondary execution controls 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: liran.alon@oracle.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some secondary controls are automatically enabled/disabled based on the CPU= ID values that are set for the guest. However, they are still available at a global level and therefore should be present when KVM_GET_MSRS is sent to /dev/kvm. Unfortunately KVM forgot to include those, so fix that. Signed-off-by: Paolo Bonzini --- target/i386/kvm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index bba1930..4843f8c 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -478,6 +478,23 @@ uint64_t kvm_arch_get_supported_msr_feature(KVMState *= s, uint32_t index) value =3D msr_data.entries[0].data; switch (index) { case MSR_IA32_VMX_PROCBASED_CTLS2: + /* KVM forgot to add these bits for some time, do this ourselves. = */ + if (kvm_arch_get_supported_cpuid(s, 0xD, 1, R_ECX) & CPUID_XSAVE_X= SAVES) { + value |=3D (uint64_t)VMX_SECONDARY_EXEC_XSAVES << 32; + } + if (kvm_arch_get_supported_cpuid(s, 1, 0, R_ECX) & CPUID_EXT_RDRAN= D) { + value |=3D (uint64_t)VMX_SECONDARY_EXEC_RDRAND_EXITING << 32; + } + if (kvm_arch_get_supported_cpuid(s, 7, 0, R_EBX) & CPUID_7_0_EBX_I= NVPCID) { + value |=3D (uint64_t)VMX_SECONDARY_EXEC_ENABLE_INVPCID << 32; + } + if (kvm_arch_get_supported_cpuid(s, 7, 0, R_EBX) & CPUID_7_0_EBX_R= DSEED) { + value |=3D (uint64_t)VMX_SECONDARY_EXEC_RDSEED_EXITING << 32; + } + if (kvm_arch_get_supported_cpuid(s, 0x80000001, 0, R_EDX) & CPUID_= EXT2_RDTSCP) { + value |=3D (uint64_t)VMX_SECONDARY_EXEC_RDTSCP << 32; + } + /* fall through */ case MSR_IA32_VMX_TRUE_PINBASED_CTLS: case MSR_IA32_VMX_TRUE_PROCBASED_CTLS: case MSR_IA32_VMX_TRUE_ENTRY_CTLS: --=20 1.8.3.1