From patchwork Fri Nov 9 22:21:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10676655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 67C7913B0 for ; Fri, 9 Nov 2018 22:21:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56BC02F2C7 for ; Fri, 9 Nov 2018 22:21:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AD012F30D; Fri, 9 Nov 2018 22:21:42 +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=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham 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 EB6F72F2C7 for ; Fri, 9 Nov 2018 22:21:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728492AbeKJIEP (ORCPT ); Sat, 10 Nov 2018 03:04:15 -0500 Received: from mail-it1-f201.google.com ([209.85.166.201]:41738 "EHLO mail-it1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727746AbeKJIEP (ORCPT ); Sat, 10 Nov 2018 03:04:15 -0500 Received: by mail-it1-f201.google.com with SMTP id s195-v6so5092448itc.6 for ; Fri, 09 Nov 2018 14:21:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=XFP4sd0PA/QTx1X61vW7ZctSegt8z+RfbnMJnHCdGSY=; b=Cd8Dwu2FbdQjS+pe5Qj/KJBsE+jaWA6fsMruJEuzBFYPULsP4SUnjcnZuxjXuWzGG0 m/wW9wu/pftLED3+FYivmW7v6cTzzJdgWNezIQ4yzaEr8I20L+wC61tBHkyeprQh7chA lZ1Z0DS+lMj0b07iVJ0DrfGu/0CMjhH/vZN2gz7Up6ViiXzpXL2j6g+w8yHPatDWdKlt Qvs8lU0Bibgkl8e2gkeJ9sIfwODtAE123mWGpA6kbsGVtcHvhmDU/YXWmPbnUKhQIF63 pmg1Ha7CU1nXec5gbOsoVNh/cPZTLP4cL3hbEYjO4G3kD5PmWn38/5oA6Mpp55p3wCPy OLLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=XFP4sd0PA/QTx1X61vW7ZctSegt8z+RfbnMJnHCdGSY=; b=o6kUN0SXmM0vlX83u5svNQuSka7DFZrHvgWxjywddihMI3igNvvi0XdKyPK99bZp8B GllIeK+tRfwPs2aH2CT7NRYFBEIgaFVDOSxrueEh9vblrYVTERcWqyHX/wJ1d7MWW1sA 1jiD9bDwnjU7lG2ds/MeNqAUrDFmW82g1rsqvNB8BlDqDSAjpi1/PvwBRTyV3PhRMEs7 f96K6GJ4Mn6kaQhAnx5beg/faN5UpPouaCqoP8KeLhBaAAUYBnvny85T67+GCqjQa5VV 2eO89qW4/0kLbvlBSbndHUXraAuDLqcCSb3CcaqHlrF+F/qdtHbjv/hw6JOsiUpmnhqL SFEw== X-Gm-Message-State: AGRZ1gL8TRwn7gTulZbofdc/Z95qzRDm3sxjYkHxdmyhjpOY5h5XZ1Dj x5V1MXmooVzT8pIZnY64vK4pOPoI4/MS4s5HbVsqBKditgEpDVs/YaVzFRVhkNX9oPKazCbrcHp wX4siyYLh0BvMf8utrWF0rgEmIpgaQgBJSvtMWcSD5JtK4soul2CcP5dH3/jbt5Q= X-Google-Smtp-Source: AJdET5eVkdJlzhs9QIUXeogiaNZRDPbyQrWq4ob3HPM6mNrklMC2S9P+DIKK3jDNQst8BqF1XNhgcHZTcbN9dQ== X-Received: by 2002:a24:2914:: with SMTP id p20-v6mr3418191itp.13.1541802099829; Fri, 09 Nov 2018 14:21:39 -0800 (PST) Date: Fri, 9 Nov 2018 14:21:31 -0800 In-Reply-To: <20181109222131.60885-1-jmattson@google.com> Message-Id: <20181109222131.60885-3-jmattson@google.com> Mime-Version: 1.0 References: <20181109222131.60885-1-jmattson@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog Subject: [PATCH v2 4/4] kvm: vmx: Skip all SYSCALL MSRs in setup_msrs() when !EFER.SCE From: Jim Mattson To: kvm@vger.kernel.org Cc: Marc Orr , Peter Shier , Liran Alon , Jim Mattson Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Like IA32_STAR, IA32_LSTAR and IA32_FMASK only need to contain guest values on VM-entry when the guest is in long mode and EFER.SCE is set. Signed-off-by: Jim Mattson Reviewed-by: Peter Shier Reviewed-by: Marc Orr --- arch/x86/kvm/vmx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 88692f0b83b1..2baebaf4fec7 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3401,19 +3401,19 @@ static void setup_msrs(struct vcpu_vmx *vmx) save_nmsrs = 0; #ifdef CONFIG_X86_64 - if (is_long_mode(&vmx->vcpu)) { - index = __find_msr_index(vmx, MSR_SYSCALL_MASK); + /* + * The SYSCALL MSRs are only needed on long mode guests, and only + * when EFER.SCE is set. + */ + if (is_long_mode(&vmx->vcpu) && (vmx->vcpu.arch.efer & EFER_SCE)) { + index = __find_msr_index(vmx, MSR_STAR); if (index >= 0) move_msr_up(vmx, index, save_nmsrs++); index = __find_msr_index(vmx, MSR_LSTAR); if (index >= 0) move_msr_up(vmx, index, save_nmsrs++); - /* - * MSR_STAR is only needed on long mode guests, and only - * if efer.sce is enabled. - */ - index = __find_msr_index(vmx, MSR_STAR); - if ((index >= 0) && (vmx->vcpu.arch.efer & EFER_SCE)) + index = __find_msr_index(vmx, MSR_SYSCALL_MASK); + if (index >= 0) move_msr_up(vmx, index, save_nmsrs++); } #endif