Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754796AbeAMIA0 (ORCPT + 1 other); Sat, 13 Jan 2018 03:00:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46164 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbeAMIAY (ORCPT ); Sat, 13 Jan 2018 03:00:24 -0500 Date: Sat, 13 Jan 2018 03:00:21 -0500 (EST) From: Paolo Bonzini To: Eric Wheeler Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, rkrcmar@redhat.com, liran alon , jmattson@google.com, aliguori@amazon.com, thomas lendacky , dwmw@amazon.co.uk, bp@alien8.de, x86@kernel.org Message-ID: <872917357.33315916.1515830421597.JavaMail.zimbra@redhat.com> In-Reply-To: References: <20180109120311.27565-1-pbonzini@redhat.com> <20180109120311.27565-9-pbonzini@redhat.com> Subject: Re: [PATCH 8/8] KVM: x86: add SPEC_CTRL and IBPB_SUPPORT to MSR and CPUID lists MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [78.12.229.84, 10.4.196.4, 10.4.195.26] Thread-Topic: x86: add SPEC_CTRL and IBPB_SUPPORT to MSR and CPUID lists Thread-Index: mO2tgVRDaWmLVznGWE4X6iTxVT4vDQ== X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Sat, 13 Jan 2018 08:00:24 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Just add the new MSR at the end of the array. Paolo ----- Eric Wheeler ha scritto: > On Tue, 9 Jan 2018, Paolo Bonzini wrote: > > > Expose them to userspace, now that guests can use them. > > I am not adding cpufeatures here to avoid having a kernel > > that shows spec_ctrl in /proc/cpuinfo and actually has no > > support whatsoever for IBRS/IBPB. Keep the ugly special-casing > > for now, and clean it up once the generic arch/x86/ code > > learns about them. > > > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > index daa1918031df..4abb37d9f4d8 100644 > > --- a/arch/x86/kvm/x86.c > > +++ b/arch/x86/kvm/x86.c > > @@ -1032,6 +1032,7 @@ unsigned int kvm_get_pt_addr_cnt(void) > > MSR_IA32_RTIT_ADDR1_A, MSR_IA32_RTIT_ADDR1_B, > > MSR_IA32_RTIT_ADDR2_A, MSR_IA32_RTIT_ADDR2_B, > > MSR_IA32_RTIT_ADDR3_A, MSR_IA32_RTIT_ADDR3_B, > > + MSR_IA32_SPEC_CTRL, > > }; > > Hi Paolo, > > Thank you for posting this! > > I am trying to merge this into 4.14 which does not have > kvm_get_pt_addr_cnt. The rest of the patch commits, but this gets > rejected. Is this a necessary part of the commit? > > patching file arch/x86/kvm/cpuid.c > Hunk #1 succeeded at 389 (offset -8 lines). > Hunk #2 succeeded at 479 (offset -9 lines). > Hunk #3 succeeded at 636 (offset -27 lines). > patching file arch/x86/kvm/x86.c > Hunk #1 FAILED at 1032. > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86/kvm/x86.c.rej > > ]# cat arch/x86/kvm/x86.c.rej > --- arch/x86/kvm/x86.c > +++ arch/x86/kvm/x86.c > @@ -1032,6 +1032,7 @@ > MSR_IA32_RTIT_ADDR1_A, MSR_IA32_RTIT_ADDR1_B, > MSR_IA32_RTIT_ADDR2_A, MSR_IA32_RTIT_ADDR2_B, > MSR_IA32_RTIT_ADDR3_A, MSR_IA32_RTIT_ADDR3_B, > + MSR_IA32_SPEC_CTRL, > }; > > static unsigned num_msrs_to_save; > > > Thank you for your help! > > -- > Eric Wheeler > > > > > > static unsigned num_msrs_to_save; > > -- > > 1.8.3.1 > > > > > >