| Message ID | 20200629103113.9328-1-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86/boot: Don't disable PV32 when XEN_SHSTK is compiled out | expand |
On 29.06.2020 12:31, Andrew Cooper wrote: > There is no need to automatically disable PV32 support on SHSTK-capable > hardware if Xen isn't actually using the feature. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
> -----Original Message----- > From: Andrew Cooper <andrew.cooper3@citrix.com> > Sent: 29 June 2020 11:31 > To: Xen-devel <xen-devel@lists.xenproject.org> > Cc: Andrew Cooper <andrew.cooper3@citrix.com>; Jan Beulich <JBeulich@suse.com>; Wei Liu <wl@xen.org>; > Roger Pau Monné <roger.pau@citrix.com>; Paul Durrant <paul@xen.org> > Subject: [PATCH] x86/boot: Don't disable PV32 when XEN_SHSTK is compiled out > > There is no need to automatically disable PV32 support on SHSTK-capable > hardware if Xen isn't actually using the feature. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Jan Beulich <JBeulich@suse.com> > CC: Wei Liu <wl@xen.org> > CC: Roger Pau Monné <roger.pau@citrix.com> > CC: Paul Durrant <paul@xen.org> > > For 4.14. Minor bugfix. Release-acked-by: Paul Durrant <paul@xen.org> > --- > xen/arch/x86/setup.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c > index 2aa1cd50b8..c9b6af826d 100644 > --- a/xen/arch/x86/setup.c > +++ b/xen/arch/x86/setup.c > @@ -95,7 +95,11 @@ unsigned long __initdata highmem_start; > size_param("highmem-start", highmem_start); > #endif > > +#ifdef CONFIG_XEN_SHSTK > static bool __initdata opt_xen_shstk = true; > +#else > +#define opt_xen_shstk false > +#endif > > static int __init parse_cet(const char *s) > { > -- > 2.11.0
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2aa1cd50b8..c9b6af826d 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -95,7 +95,11 @@ unsigned long __initdata highmem_start; size_param("highmem-start", highmem_start); #endif +#ifdef CONFIG_XEN_SHSTK static bool __initdata opt_xen_shstk = true; +#else +#define opt_xen_shstk false +#endif static int __init parse_cet(const char *s) {
There is no need to automatically disable PV32 support on SHSTK-capable hardware if Xen isn't actually using the feature. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Jan Beulich <JBeulich@suse.com> CC: Wei Liu <wl@xen.org> CC: Roger Pau Monné <roger.pau@citrix.com> CC: Paul Durrant <paul@xen.org> For 4.14. Minor bugfix. --- xen/arch/x86/setup.c | 4 ++++ 1 file changed, 4 insertions(+)