From nobody Mon Feb 9 18:46:32 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=1562080500; cv=none; d=zoho.com; s=zohoarc; b=DxSRnyjbp9PSbuDluvEB/JO1N/1qgXUDBCIi1TH7fjBggmIed9HnHM8OjK4ys2+PPoPZQoRzHQJFKcCDNgpcZ/6m71ACAOzOajAGY72t5CIM9MXOe3Gn7Vx2yYFeBIFmJsndGeReeITYtkbcFurmD7/0fED1oofQ19JUx8HlJ4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562080500; 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=wOuMJApxDA9WcfQrsT3Xap/eF0wAVuDrPdCETgZJjl4=; b=VdnanU92yDQ+7HvIBjueadccIDVm0JdIlehu+M5MuZePu5WX+189CgQEyT2zUsV3CkrCVosN4ljluFUyu73rKCUUCFsTmTkgeFaWKT0AbteGDfmDFYGv5TnuD761w27xgXFcESAGN6CuJza3EEUJFRP7t1iltcHhLroaI0Cq7pQ= 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 1562080500640410.3440512024167; Tue, 2 Jul 2019 08:15:00 -0700 (PDT) Received: from localhost ([::1]:54376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiKUi-00041f-5X for importer@patchew.org; Tue, 02 Jul 2019 11:14:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57083) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiKIS-0001ms-2i for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:02:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiKIP-0004sx-Tj for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:02:15 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:36775) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hiKIC-0004Tk-9l for qemu-devel@nongnu.org; Tue, 02 Jul 2019 11:02:02 -0400 Received: by mail-wr1-x443.google.com with SMTP id n4so18251414wrs.3 for ; Tue, 02 Jul 2019 08:01:34 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id m24sm3006262wmi.39.2019.07.02.08.01.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2019 08:01:31 -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=wOuMJApxDA9WcfQrsT3Xap/eF0wAVuDrPdCETgZJjl4=; b=b9ldxjFVGG30XlPUvOdbU5qIq8qSmhD111Vb2ye2gBF9uaJOAaPx9Gm3/G7GryaBNY 2NYJt24C2gvuLIZcc68QBqVpKqC8HLgsoOqFeB5N/JeXSexUfWM99b9D7h37n42Z/AOe qwiZ22byvibvHkL3bAc4E93mPfXAQuxSWNBaKfAhyab760P5jst9TqsndY9Q4Q4spsF9 +9HUvGuZ3xKolSI4XlkWldC5XCWid8y2YaqlrFo5NdmG6ZTSruE04ZL5c6mc+8lV8utG 5kkFQqiaSv8L5/FUxH75gX7uC90bhobsgOH+H9u4nEDYjLyNvV8ooyhJtXhM1W+x/795 V48g== 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=wOuMJApxDA9WcfQrsT3Xap/eF0wAVuDrPdCETgZJjl4=; b=QlSbBdYPH6a1jf9kYy1F4sVk3IDW55Y09+917BzDQo2JPfrGHyb4BRyoyqyZvC9WYL uvkC8vfd8FzQK8/AWRIHkrvLPxWUeSg3GeIZTH++HtrF48f81v+9yXWnd+JXP/gcm8zr L9K4XxPjIzoRIqgG4cxrPdFx19NeZSIRIbM9wdsB8ACraUCsuWEOb5b0lIDnOZjboXUL TlScR5w5EtL6rsrKHuIm7W9J+i0d7EQ5C3o19e8ZUmDUlxg0hHmbr1STG27uXi3OxMym flGoEH/7nG2wJ0Bxj+57YxfOT6nHxS2PEhAMsb5ybZktb923MJaP9NMG89R1Zp370m02 IgMQ== X-Gm-Message-State: APjAAAWXPeH7ZHfv4rS3pFti1F1jAi19L0G0vujvK8s96fYHaD8xgUIN HrZtHk7vquqRwIFfTZ724uOZ3tjl/KY= X-Google-Smtp-Source: APXvYqwCFDtv9wDTFLZGuX40Xnum0JzAHGBBzldyyo6z/sgbFYslZm8WIajiwjaPEjCXtiOx7IfBcw== X-Received: by 2002:a5d:4949:: with SMTP id r9mr23124832wrs.289.1562079692906; Tue, 02 Jul 2019 08:01:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 2 Jul 2019 17:01:21 +0200 Message-Id: <1562079681-19204-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562079681-19204-1-git-send-email-pbonzini@redhat.com> References: <1562079681-19204-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::443 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 , Eduardo Habkost 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 e35489c..84b42a5 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -469,6 +469,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