From patchwork Tue Oct 30 19:20:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10661461 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 D6BB613A4 for ; Tue, 30 Oct 2018 19:21:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C332628CC9 for ; Tue, 30 Oct 2018 19:21:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B742C2AB53; Tue, 30 Oct 2018 19:21:03 +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 5E06628CC9 for ; Tue, 30 Oct 2018 19:21:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727819AbeJaEPq (ORCPT ); Wed, 31 Oct 2018 00:15:46 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:42684 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727645AbeJaEPq (ORCPT ); Wed, 31 Oct 2018 00:15:46 -0400 Received: by mail-pg1-f202.google.com with SMTP id s17-v6so6467328pga.9 for ; Tue, 30 Oct 2018 12:21:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=QBt9fCUy6mOswWKM0Q+cnhjLt66Ni/w7Jk2erW34wNc=; b=rU8soY1AoiZ/noRfYxwLVMm7hj5CJlUlQ8yamcUlvPMl+MUHUgQLLDn+OIUzpnop0v DgYpN10ocgzw0Zgj7PKOFkh3LDT2oSKwRr406AM+4LIdFgnpVjhON5c8Bpb99NhlcZ2X zxs1rAKncZzM1JeoY/xH9clG/Hpqq8FsFf+hCjECGC/C1WFov6j+pHW65kqAfipRkjYU MmOGcpAwWtzHyB9yaXW5FXwUFFRmFvS+CxqWjbW0St8r32BU01iRBmGqMka6c+vkjO52 KyoQ3gDz4xYpbPFZu2roIkSA/ScyfV5+tagSeEBv39b2WpkPw1ixsepeVry+wBL5c5h5 akvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=QBt9fCUy6mOswWKM0Q+cnhjLt66Ni/w7Jk2erW34wNc=; b=QHjFdNGX+wIlvgXPCPPLW63NMTBWBZxQO4SCqK/ntgvopJK4gCNs6TbbxE2MmT6kWQ 4Rh4JmKdgw0wpIcwAz1QAAR/xcLxoSNsegPoxi89t42R8h9SVkWrd3myNxwPAFSa+CuL QLPMYVgdnZ6Bp1sN83H+i+5knkFNG24lktoxQMZZDsAH08xza/GRwgRiQGqWvqMItZT7 yLPDXE9Mw+6d/pBxxtDjbGiu6Dm41jVaCrG2XlC8u1M/M+1TmbONnVUZWZBG9zxJshjv 2TXf3aXX/kNB+3xh1fDMjAGbmvSaiwDlTJjFUE+epCrOMb86m5zdsPPkbwfzaVPdXWIM aFZA== X-Gm-Message-State: AGRZ1gIY89Hq6BvpnrUQd6/naFnN73xFBrm0w4HXzU4tqUHdCRFnWENp NFGtGVFdluxpHvr4mpew9cE3EnKbGd5mDJFXoDJIPHbLfvrWbIusL4jo9GnHH2SmmS/pPVhC3B0 fVCJbIGAyurK+fhU0AltlozvXhXcfUzEVK9Bbb6tpC2Pt/7uvLwUmi86nRT5i32g= X-Google-Smtp-Source: AJdET5fgh7x73gWVUMW3i0qpDe0Hk3mI8dqF6hjbWKydHtb6jIWjnrixttNlW4eXXCQyvQL0/4FU+Tdw7Urw7A== X-Received: by 2002:a17:902:6b84:: with SMTP id p4-v6mr56728plk.85.1540927261073; Tue, 30 Oct 2018 12:21:01 -0700 (PDT) Date: Tue, 30 Oct 2018 12:20:21 -0700 Message-Id: <20181030192021.110384-1-jmattson@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [PATCH] kvm: x86: Don't modify MSR_PLATFORM_INFO on vCPU reset From: Jim Mattson To: kvm@vger.kernel.org Cc: Drew Schmitt , Jim Mattson , Abhiroop Dabral Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If userspace has provided a different value for this MSR (e.g with the turbo bits set), the userspace-provided value should survive a vCPU reset. For backwards compatibility, MSR_PLATFORM_INFO is initialized in kvm_arch_vcpu_setup. Signed-off-by: Jim Mattson Reviewed-by: Drew Schmitt Cc: Abhiroop Dabral --- arch/x86/kvm/x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 66d66d77caee..6ab3149bf9dc 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8617,6 +8617,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) { + vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT; kvm_vcpu_mtrr_init(vcpu); vcpu_load(vcpu); kvm_vcpu_reset(vcpu, false); @@ -8719,7 +8720,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) kvm_pmu_reset(vcpu); vcpu->arch.smbase = 0x30000; - vcpu->arch.msr_platform_info = MSR_PLATFORM_INFO_CPUID_FAULT; vcpu->arch.msr_misc_features_enables = 0; vcpu->arch.xcr0 = XFEATURE_MASK_FP;