Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752637AbcDKGvS (ORCPT ); Mon, 11 Apr 2016 02:51:18 -0400 Received: from mx2.suse.de ([195.135.220.15]:60061 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751541AbcDKGvQ (ORCPT ); Mon, 11 Apr 2016 02:51:16 -0400 Subject: Re: [Xen-devel] [PATCH v5 14/14] x86/paravirt: remove paravirt_enabled() To: "Luis R. Rodriguez" , bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, rusty@rustcorp.com.au References: <1460158825-13117-1-git-send-email-mcgrof@kernel.org> <1460158825-13117-15-git-send-email-mcgrof@kernel.org> Cc: kozerkov@parallels.com, matt@codeblueprint.co.uk, lv.zheng@intel.com, xen-devel@lists.xensource.com, joro@8bytes.org, x86@kernel.org, robert.moore@intel.com, linux-acpi@vger.kernel.org, glin@suse.com, lenb@kernel.org, josh@joshtriplett.org, jlee@suse.com, lguest@lists.ozlabs.org, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com, toshi.kani@hp.com, andrew.cooper3@citrix.com, rjw@rjwysocki.net, linux-kernel@vger.kernel.org, luto@amacapital.net, david.vrabel@citrix.com, tiwai@suse.de From: Juergen Gross Message-ID: <570B4961.6000703@suse.com> Date: Mon, 11 Apr 2016 08:51:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <1460158825-13117-15-git-send-email-mcgrof@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3983 Lines: 120 On 09/04/16 01:40, Luis R. Rodriguez wrote: > That that paravirt_enabled() is replaced with proper > x86 semantics we can remove it. > > Signed-off-by: Luis R. Rodriguez > --- > arch/x86/include/asm/paravirt.h | 5 ----- > arch/x86/include/asm/paravirt_types.h | 1 - > arch/x86/include/asm/processor.h | 1 - > arch/x86/kernel/kvm.c | 8 -------- > arch/x86/kernel/paravirt.c | 1 - > arch/x86/lguest/boot.c | 2 -- > arch/x86/xen/enlighten.c | 1 - > 7 files changed, 19 deletions(-) Xen parts: Acked-by: Juergen Gross Juergen > > diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h > index 6c7a4a192032..dff26bc91b17 100644 > --- a/arch/x86/include/asm/paravirt.h > +++ b/arch/x86/include/asm/paravirt.h > @@ -15,11 +15,6 @@ > #include > #include > > -static inline int paravirt_enabled(void) > -{ > - return pv_info.paravirt_enabled; > -} > - > static inline void load_sp0(struct tss_struct *tss, > struct thread_struct *thread) > { > diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h > index 6acc1b26cf40..7fedf24bd811 100644 > --- a/arch/x86/include/asm/paravirt_types.h > +++ b/arch/x86/include/asm/paravirt_types.h > @@ -69,7 +69,6 @@ struct pv_info { > u16 extra_user_64bit_cs; /* __USER_CS if none */ > #endif > > - int paravirt_enabled; > const char *name; > }; > > diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h > index 0c70c7daa6b8..8d326e822cb8 100644 > --- a/arch/x86/include/asm/processor.h > +++ b/arch/x86/include/asm/processor.h > @@ -473,7 +473,6 @@ static inline unsigned long current_top_of_stack(void) > #include > #else > #define __cpuid native_cpuid > -#define paravirt_enabled() 0 > > static inline void load_sp0(struct tss_struct *tss, > struct thread_struct *thread) > diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c > index dc1207e2f193..eea2a6f72b31 100644 > --- a/arch/x86/kernel/kvm.c > +++ b/arch/x86/kernel/kvm.c > @@ -285,14 +285,6 @@ static void __init paravirt_ops_setup(void) > { > pv_info.name = "KVM"; > > - /* > - * KVM isn't paravirt in the sense of paravirt_enabled. A KVM > - * guest kernel works like a bare metal kernel with additional > - * features, and paravirt_enabled is about features that are > - * missing. > - */ > - pv_info.paravirt_enabled = 0; > - > if (kvm_para_has_feature(KVM_FEATURE_NOP_IO_DELAY)) > pv_cpu_ops.io_delay = kvm_io_delay; > > diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c > index f08ac28b8136..71a2d8a05a66 100644 > --- a/arch/x86/kernel/paravirt.c > +++ b/arch/x86/kernel/paravirt.c > @@ -294,7 +294,6 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void) > > struct pv_info pv_info = { > .name = "bare hardware", > - .paravirt_enabled = 0, > .kernel_rpl = 0, > .shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */ > > diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c > index f5497ee5fd2f..3847e736702e 100644 > --- a/arch/x86/lguest/boot.c > +++ b/arch/x86/lguest/boot.c > @@ -1408,8 +1408,6 @@ __init void lguest_init(void) > { > /* We're under lguest. */ > pv_info.name = "lguest"; > - /* Paravirt is enabled. */ > - pv_info.paravirt_enabled = 1; > /* We're running at privilege level 1, not 0 as normal. */ > pv_info.kernel_rpl = 1; > /* Everyone except Xen runs with this set. */ > diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c > index e066fcf87c3d..7c1da39623f4 100644 > --- a/arch/x86/xen/enlighten.c > +++ b/arch/x86/xen/enlighten.c > @@ -1186,7 +1186,6 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, > } > > static const struct pv_info xen_info __initconst = { > - .paravirt_enabled = 1, > .shared_kernel_pmd = 0, > > #ifdef CONFIG_X86_64 >