Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp453163ybt; Wed, 8 Jul 2020 04:05:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTebDnOenR2L+pOVzmNj4eWygCSXObYApNMtCGYuv0AMDdRe56CMPXNmkY66XNI0Z2IQHn X-Received: by 2002:a05:6402:16c2:: with SMTP id r2mr13899865edx.127.1594206315436; Wed, 08 Jul 2020 04:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594206315; cv=none; d=google.com; s=arc-20160816; b=wnPn2ok6uJGDLJWhLgKczNan8YAudVigDlu/Qph4geKNXXozrrLxDm6enHfpwkC4va bbJ4Vv3dNzuDWV4gGULiorNXPBrRtr7NccI2oOPNAY4VMJbKz6Dm+rOn5Q3N+e/qw7UE sdxv8XmpYVXxhyL1fQ/fKe0/oh85PR2E2LI1V4+ictcVFt5N0YJlazBXDCa5cP4cOimn aprds2hozPj1sEzurhiOqZVF09jCLbNIk0ZRrIE7SIXBRO3romoexG1EV/5nMEVi9I+c Leh31ECgHO6K6YC9oYZjdPDCN7pkSoiD0mxsHd/uKYZtSM7Gby1iB/lE6mPsCRbERYTN TW3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=X7JqGrX6+FRCRSoYELtArJatwC752X2T97lt6/es+Gg=; b=weBbsTPiRX7gj0S8NaW4kfx6vjzk9h6SSgjg8nJGggdoriZ3L/x10Rg25km3h5aOFH bfEWuWVGRD/61Up+9m+Hfcel42biCqshMq0+MmHY9iLIztXo6ebqV0LblvwFKSIZwu6u rexzCon4tu28V8CO/ukMfhF/FUO7eh+ZmzQSSRGT76ZeTYqYp87mUorIi12srdotyIXg HFf3n5mlUsVJTAUKZGTAFdGQ6nwljB6Eciitq1rV8rU3xTfIB5wTRl9jdmhPiIGxg5KI rpbNjqQCx9pFjqx/bsei2djn1LkWRorTXYhTNUhGEFE7+QxEytSHnQNI+0+m50xvE+qr YiHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZNnzLjcr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id la26si16123506ejb.587.2020.07.08.04.04.53; Wed, 08 Jul 2020 04:05:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZNnzLjcr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728708AbgGHLDz (ORCPT + 99 others); Wed, 8 Jul 2020 07:03:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41711 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726110AbgGHLDy (ORCPT ); Wed, 8 Jul 2020 07:03:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594206234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=X7JqGrX6+FRCRSoYELtArJatwC752X2T97lt6/es+Gg=; b=ZNnzLjcr1WJMYz5qNvBlcrHtqJymhlP64CopFAXQ6ixHKgQk0nuiWWG3CZZXLkoHTrTMRG rqx31CGwyHMwLmurdxDpW3qSwgKwMCqPhsgwXDciWEsKsNIpDVJxleurG3byS22Y0/Cmfe 9G+GVe7599b1wvxa54I1rfhYKnYIL4c= 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-449-89poVGgePnqb6q3haNmrDw-1; Wed, 08 Jul 2020 07:03:52 -0400 X-MC-Unique: 89poVGgePnqb6q3haNmrDw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 91EDD8015F5; Wed, 8 Jul 2020 11:03: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 402DB7848A; Wed, 8 Jul 2020 11:03:51 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH] KVM: x86: Make CR4.VMXE reserved for the guest Date: Wed, 8 Jul 2020 07:03:50 -0400 Message-Id: <20200708110350.848997-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CR4.VMXE is reserved unless the VMX CPUID bit is set. On Intel, it is also tested by vmx_set_cr4, but AMD relies on kvm_valid_cr4, so fix it. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/x86.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index 56975c6c1e15..224670d7c245 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -392,6 +392,8 @@ bool kvm_vcpu_exit_request(struct kvm_vcpu *vcpu); __reserved_bits |= X86_CR4_LA57; \ if (!__cpu_has(__c, X86_FEATURE_UMIP)) \ __reserved_bits |= X86_CR4_UMIP; \ + if (!__cpu_has(__c, X86_FEATURE_VMX)) \ + __reserved_bits |= X86_CR4_VMXE; \ __reserved_bits; \ }) -- 2.26.2