From patchwork Sat Jan 13 01:25:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Wheeler X-Patchwork-Id: 10162081 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6010760327 for ; Sat, 13 Jan 2018 01:32:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E03A28AF7 for ; Sat, 13 Jan 2018 01:32:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40B0528AFD; Sat, 13 Jan 2018 01:32:01 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 EA84028AF7 for ; Sat, 13 Jan 2018 01:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965397AbeAMBbr (ORCPT ); Fri, 12 Jan 2018 20:31:47 -0500 Received: from mx.ewheeler.net ([66.155.3.69]:39822 "EHLO mail.ewheeler.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965242AbeAMBbq (ORCPT ); Fri, 12 Jan 2018 20:31:46 -0500 X-Greylist: delayed 399 seconds by postgrey-1.27 at vger.kernel.org; Fri, 12 Jan 2018 20:31:46 EST Received: from localhost (localhost [127.0.0.1]) by mail.ewheeler.net (Postfix) with ESMTP id 9FEF5A0694; Sat, 13 Jan 2018 01:25:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at ewheeler.net Received: from mail.ewheeler.net ([127.0.0.1]) by localhost (mail.ewheeler.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id JVvHAUMn-w4i; Sat, 13 Jan 2018 01:25:05 +0000 (UTC) Received: from mx.ewheeler.net (mx.ewheeler.net [66.155.3.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.ewheeler.net (Postfix) with ESMTPSA id 7D196A066F; Sat, 13 Jan 2018 01:25:05 +0000 (UTC) Date: Sat, 13 Jan 2018 01:25:04 +0000 (UTC) From: Eric Wheeler X-X-Sender: lists@mail.ewheeler.net To: Paolo Bonzini cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, rkrcmar@redhat.com, liran.alon@oracle.com, jmattson@google.com, aliguori@amazon.com, thomas.lendacky@amd.com, dwmw@amazon.co.uk, bp@alien8.de, x86@kernel.org Subject: Re: [PATCH 8/8] KVM: x86: add SPEC_CTRL and IBPB_SUPPORT to MSR and CPUID lists In-Reply-To: <20180109120311.27565-9-pbonzini@redhat.com> Message-ID: References: <20180109120311.27565-1-pbonzini@redhat.com> <20180109120311.27565-9-pbonzini@redhat.com> User-Agent: Alpine 2.11 (LRH 23 2013-08-11) MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Thank you for your help! --- Eric Wheeler > > static unsigned num_msrs_to_save; > -- > 1.8.3.1 > > > --- 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;