From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]:37106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964897AbeE3IeA (ORCPT ); Wed, 30 May 2018 04:34:00 -0400 Date: Wed, 30 May 2018 10:33:36 +0200 From: Greg KH To: Juergen Gross Cc: stable@vger.kernel.org, xen-devel@lists.xenproject.org, David Woodhouse , Boris Ostrovsky Subject: Re: [PATCH] xen: fix pv domain on amd in 4.9 stable branch Message-ID: <20180530083336.GC9685@kroah.com> References: <20180529131136.15624-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180529131136.15624-1-jgross@suse.com> Sender: stable-owner@vger.kernel.org List-ID: On Tue, May 29, 2018 at 03:11:36PM +0200, Juergen Gross wrote: > Commit 944e0fc51a89c9827b98813d65dc083274777c7f ("x86/amd: don't set > X86_BUG_SYSRET_SS_ATTRS when running under Xen") breaks Xen pv-domains > on AMD processors, as a prerequisite patch from upstream wasn't added > to 4.9. What is the prerequsite patch's git id in Linus's tree? > Fix that by adding the prerequisite setting of X86_FEATURE_XENPV to the > Xen pv early boot path. > > Cc: David Woodhouse > Cc: Boris Ostrovsky > Signed-off-by: Juergen Gross > --- > arch/x86/xen/enlighten.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c > index 081437b5f381..674656cdb68c 100644 > --- a/arch/x86/xen/enlighten.c > +++ b/arch/x86/xen/enlighten.c > @@ -1632,6 +1632,9 @@ asmlinkage __visible void __init xen_start_kernel(void) > xen_init_irq_ops(); > xen_init_cpuid_mask(); > > + /* Needed for init_amd(). */ > + setup_force_cpu_cap(X86_FEATURE_XENPV); > + > #ifdef CONFIG_X86_LOCAL_APIC > /* > * set up the basic apic ops. > -- > 2.13.6 I'd prefer to take whatever is in Linus's tree if at all possible. thanks, greg k-h