From patchwork Mon Nov 12 20:44: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: 10679231 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 740BE13B5 for ; Mon, 12 Nov 2018 20:44:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 661D029C46 for ; Mon, 12 Nov 2018 20:44:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 595472A5EF; Mon, 12 Nov 2018 20:44:12 +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 084D229C46 for ; Mon, 12 Nov 2018 20:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729470AbeKMGjE (ORCPT ); Tue, 13 Nov 2018 01:39:04 -0500 Received: from mail-it1-f202.google.com ([209.85.166.202]:35431 "EHLO mail-it1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725861AbeKMGjD (ORCPT ); Tue, 13 Nov 2018 01:39:03 -0500 Received: by mail-it1-f202.google.com with SMTP id e19-v6so8618208itc.0 for ; Mon, 12 Nov 2018 12:44:09 -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=j1EazihaPpCDX3xk0jW8cPBkb5jUYLNjbT8UbODOL7A=; b=XaZYSYTG8soRn98LMDnMYN9j+fi1VYoGjpSrrWPl7fYfeZtHZRkFulrp1VEsDDbV7b lxLiWZTfv3Hpe/ZV0+kMYJEOI168DF+XM8bUiH4fwmMaXWVL5cjdpYTN+AXTuPQTcinX ZCJYrNwenFvUTpXhzk/1kkiLHVXLIdqgXEC3Sogad4ujs8ZHXvmv0EuMcstKftxNM6vr nLjPVoc/N43JHAOHzXsDdSVM11dGg6IYJTdnuPldLNPW5o8DqLIgopKlTW1B4bxfP2Tm 0Ug1zJv3YInXrK2ySXXBElxLNirb9KLM9JX1h7ud42yBlRDIFE1QQ3Vr7m/bfOt3ZINo h2PQ== 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=j1EazihaPpCDX3xk0jW8cPBkb5jUYLNjbT8UbODOL7A=; b=LWWQcyUp4yx+vOG44FDQjc2vqwUh7uLXQ6INjaDYkQvfVkBL9u6VQNHSbVmWaytGpW U3HJX60wfYbtCgFdcEnsh/b8hV1e1xuh4z4DDT98n/8pNonunAsxOHQ5mOPC4dXrdd2W ZcuHAAugWoZTo/AtsWghgvZ/pIocvefWIipyTpBXJv5vxgHx0NlBuD2FC+EOicuk11Eh SfmFjqycqprB0gFtYH00mrtGtEq3ZKe/zjPb7IdFCdQ286063uFHAq1h0A1TSIj1fFqq IhTDOG+Y0LXSFcYtbTC/OaEv52tNbyQDMaF6h7fdrXXLbCZJRP8YrdUHzPVEm8BNZlJY rHdQ== X-Gm-Message-State: AGRZ1gL24acQlnUZguIuC29Y7w3U7c8wnAJVtZL8dVGDQXSEn+DFb6Ft pRCCGdVDLQlgK15U+/3057dFIceqT6YeIafWiDRrMkiyEieur7hDd+GqT04mA+gT4P9q8yQTNXG /QusGk+hG/r3cKJHPbaua3mxHKkxpybS8z0xjNZRO66S7kmvYGntZJiRbGowpKSw= X-Google-Smtp-Source: AJdET5cJ2P0oelQ/eublWIG99KYke3HHqiwKPZOYpynMgPedxOz8lJf6bKShgtqbvgls2EQA5zru8BoBjh81+A== X-Received: by 2002:a24:1f46:: with SMTP id d67-v6mr973622itd.36.1542055449120; Mon, 12 Nov 2018 12:44:09 -0800 (PST) Date: Mon, 12 Nov 2018 12:44:01 -0800 In-Reply-To: <20181109222042.60248-1-jmattson@google.com> Message-Id: <20181112204401.261404-1-jmattson@google.com> Mime-Version: 1.0 References: <20181109222042.60248-1-jmattson@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog Subject: [PATCH v3 1/4] kvm: vmx: Set IA32_TSC_AUX for legacy mode guests From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson , Peter Shier , Marc Orr , Liran Alon Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP RDTSCP is supported in legacy mode as well as long mode. The IA32_TSC_AUX MSR should be set to the correct guest value before entering any guest that supports RDTSCP. Fixes: 4e47c7a6d714 ("KVM: VMX: Add instruction rdtscp support for guest") Signed-off-by: Jim Mattson Reviewed-by: Peter Shier Reviewed-by: Marc Orr Reviewed-by: Liran Alon --- 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 ccc6a01eb4f4..120fc97a63fc 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3415,9 +3415,6 @@ static void setup_msrs(struct vcpu_vmx *vmx) index = __find_msr_index(vmx, MSR_CSTAR); if (index >= 0) move_msr_up(vmx, index, save_nmsrs++); - index = __find_msr_index(vmx, MSR_TSC_AUX); - if (index >= 0 && guest_cpuid_has(&vmx->vcpu, X86_FEATURE_RDTSCP)) - move_msr_up(vmx, index, save_nmsrs++); /* * MSR_STAR is only needed on long mode guests, and only * if efer.sce is enabled. @@ -3430,6 +3427,9 @@ static void setup_msrs(struct vcpu_vmx *vmx) index = __find_msr_index(vmx, MSR_EFER); if (index >= 0 && update_transition_efer(vmx, index)) move_msr_up(vmx, index, save_nmsrs++); + index = __find_msr_index(vmx, MSR_TSC_AUX); + if (index >= 0 && guest_cpuid_has(&vmx->vcpu, X86_FEATURE_RDTSCP)) + move_msr_up(vmx, index, save_nmsrs++); vmx->save_nmsrs = save_nmsrs;