From patchwork Wed Dec 5 23:29:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10715055 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 2645913BB for ; Wed, 5 Dec 2018 23:29:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17F4A2E0B8 for ; Wed, 5 Dec 2018 23:29:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C4292E0F5; Wed, 5 Dec 2018 23:29:22 +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 141112E0BE for ; Wed, 5 Dec 2018 23:29:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728744AbeLEX3S (ORCPT ); Wed, 5 Dec 2018 18:29:18 -0500 Received: from mail-it1-f202.google.com ([209.85.166.202]:38984 "EHLO mail-it1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728411AbeLEX3S (ORCPT ); Wed, 5 Dec 2018 18:29:18 -0500 Received: by mail-it1-f202.google.com with SMTP id k133so18292260ite.4 for ; Wed, 05 Dec 2018 15:29:17 -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=+fjSOfpO/GDAmXM+nGFkTRaHaV5WH4ZMDHZldXRn8sk=; b=WrHzm5VfnCJvfS0xr5ZYjy1t8QJn0EYV2O/DBcFGL6LEd88vNA32aL+wBP9wU9etDH L/gMjm6YhCG8G4ugvqz6mNxBDQ074k5Tvn5ZyXTX/kgvDQxK+oYdvOKX/kX2gJR6whDK 7g82z9BGCbdBNemp3Qs7BDYdle37sXWYUqhOiMlByz/J/+HlK/YA8uRsTVAWTCbSzzt6 h9EOoo3FCMiWwxnodRtN6ao5lDfPX1A4FC4Kk8mKQ0I6XF4xlgSFAYkUgJHNptMW6kJT kxdCU1dzX8wEC65teJXMEFyoxoFgmIyO+hbDfgvPqqqGNEXyDzqpuDgq9LiSu4L3TVOO UsLQ== 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=+fjSOfpO/GDAmXM+nGFkTRaHaV5WH4ZMDHZldXRn8sk=; b=GIWYEnZDasfWyivB3a/xloXzNc+HkjqMwTev7nrr1s+PmSh10WJbOJGjMWtUwfyGOl 6SCQOg+pogrcBjUY8oruzAIauDdVZqFUACPzpBl48F4HpAcFdB7KqFd+VLPT4vqvAvOp OF3iBwZ9stOI6eJIDKXAzXcbionttOXhAburwKYV7x582fRkL29a1Rv717QLPU9r7Z0Z 7UmBJ2lSatpjb2Uw0fJO/RrnVnBO+C26juYm/Lj03K+700FcLzmKF4d0pHKnF7InMgQv 0QsHT+mh/tW1QQvLTljDhzG1x53xyTJnB3UdP07H8Cjo52UBokGLr/BuHlfyxotlKm7T q/yA== X-Gm-Message-State: AA+aEWYgBKFORhrmfU66CfNAZOoICS4qajQ0/W5176xBll3JYEnvpyI6 78ypUU/EgHNwJj3ci/T0/R4AVLMNn7ZkUFigcycX8LxP3ny97eYlIXE+bP23lbvuY2ncFk/ByfN B7w6489DN1bg8aWfBaqEa65C6XDN5956Ffs1erg2qfwwAVtwVbM90/rVF0U8p/kA= X-Google-Smtp-Source: AFSGD/XbuLVkA34A9ScQWF+OHW1bu7WPuA7p+v5vBSu6mc902cO4ZB/7Fip+b+zxn2HazWr8B72mGM5qS0YhIA== X-Received: by 2002:a24:5f49:: with SMTP id r70mr15413147itb.22.1544052557155; Wed, 05 Dec 2018 15:29:17 -0800 (PST) Date: Wed, 5 Dec 2018 15:29:01 -0800 In-Reply-To: <20181205232902.1431-1-jmattson@google.com> Message-Id: <20181205232902.1431-5-jmattson@google.com> Mime-Version: 1.0 References: <20181205232902.1431-1-jmattson@google.com> X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-goog Subject: [PATCH v4 4/5] kvm: vmx: Skip all SYSCALL MSRs in setup_msrs() when !EFER.SCE From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson , Peter Shier , Marc Orr 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 12430486e911e..7ae3842f659e2 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3429,19 +3429,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