From patchwork Wed Mar 8 18:03:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9611815 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 395E8602B4 for ; Wed, 8 Mar 2017 18:33:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 343D4285B1 for ; Wed, 8 Mar 2017 18:33:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 290C9285CC; Wed, 8 Mar 2017 18:33:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E35FF285B1 for ; Wed, 8 Mar 2017 18:33:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754010AbdCHSdZ (ORCPT ); Wed, 8 Mar 2017 13:33:25 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:32788 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753908AbdCHSdW (ORCPT ); Wed, 8 Mar 2017 13:33:22 -0500 Received: by mail-wm0-f66.google.com with SMTP id n11so7465503wma.0; Wed, 08 Mar 2017 10:33:21 -0800 (PST) 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=JFeAeWx2g9gPf3UKtNE7FeA3cFNYLOCeZD4ZHM78Zbg=; b=I+6uFtqcX5Zm4C/cGQ4O8D+MKkG2j8A4eybSEOiaJM78OrzdzgLp+PYAvfBz5yFlb3 OPDWCwXq9/kY/OHa5aRV/w8hGMlssVJ1NxOvhZg7Unr0BEak1QcNSIJv7cl6KeJcdd33 8t34TsWA4kPJ+h2hQbNLeKh97PuBRCgemOBFRoJfdVpld5jqkK8k4zA69p97BtUltLWt EVKP/EC+RJOK0XUgvzRbHHI6bdEQIYZf2OYhBPDH9Lrd3jfndLMU4CZUhqqePtZGyzgy pu/U+dzC3GnDmdfMJYtFtSyD4E9Na8MzBry710uVNghz1n7A3JFOq7hZQBoMvpH/6ylQ H89Q== 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=JFeAeWx2g9gPf3UKtNE7FeA3cFNYLOCeZD4ZHM78Zbg=; b=iu2P4fy2zwecyg1IjXz0NxxdVsikQhfbauXrThRdDCzlQs2zB0WL1Qqf25VK2eqduw pGKNCJxQ8cDnIzfK32DqafPDpNpK5Zbm4weNGTo7S2NJiZl3DcsprPnXGjP3LHCoDGiZ xm5eTPfm+NkAV/cuYts1dk7JtaadVg68lBKH3pxKYHaLpwzPsIiEtS3ZJf4yZwlG1RZ1 LADdMGcS7dRGQe/hs8PsPwk6URdQzZnFQYZOQbF9APNyxA21dNxwabB4U37yWSjQD4t6 a0CyJTc3yz76mv8f7LIPhMc9DBGNhteXBKASM1ekSg4tCpuXHnPTzWEB1Nnp6v6UPNkr BPKA== X-Gm-Message-State: AMke39lj+1UAOf5YDQGqWum+y+VfH0mk+ptqOvWxbBmWEygd20lpGF/8hakFbnCZoSsH2g== X-Received: by 10.28.150.194 with SMTP id y185mr22074434wmd.92.1488996240271; Wed, 08 Mar 2017 10:04:00 -0800 (PST) Received: from 640k.lan (94-36-220-234.adsl-ull.clienti.tiscali.it. [94.36.220.234]) by smtp.gmail.com with ESMTPSA id z70sm5125458wrc.2.2017.03.08.10.03.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 10:03:59 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: bdas@redhat.com, dmatlack@google.com Subject: [PATCH 1/6] KVM: nVMX: we support 1GB EPT pages Date: Wed, 8 Mar 2017 19:03:51 +0100 Message-Id: <1488996236-5676-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488996236-5676-1-git-send-email-pbonzini@redhat.com> References: <1488996236-5676-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Large pages at the PDPE level can be emulated by the MMU, so the bit can be set unconditionally in the EPT capabilities MSR. The same is true of 2MB EPT pages, though all Intel processors with EPT in practice support those. Signed-off-by: Paolo Bonzini Reviewed-by: David Hildenbrand --- arch/x86/kvm/vmx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 283aa8601833..89b74d9bc357 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2764,14 +2764,14 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) vmx->nested.nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT; vmx->nested.nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT | - VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT | - VMX_EPT_INVEPT_BIT; + VMX_EPTP_WB_BIT | VMX_EPT_INVEPT_BIT; if (cpu_has_vmx_ept_execute_only()) vmx->nested.nested_vmx_ept_caps |= VMX_EPT_EXECUTE_ONLY_BIT; vmx->nested.nested_vmx_ept_caps &= vmx_capability.ept; vmx->nested.nested_vmx_ept_caps |= VMX_EPT_EXTENT_GLOBAL_BIT | - VMX_EPT_EXTENT_CONTEXT_BIT; + VMX_EPT_EXTENT_CONTEXT_BIT | VMX_EPT_2MB_PAGE_BIT | + VMX_EPT_1GB_PAGE_BIT; } else vmx->nested.nested_vmx_ept_caps = 0;