[Xen-devel] Patch "xen: set cpu capabilities from xen_start_kernel()" has been added to the 4.9-stable tree

[<gregkh@xxxxxxxxxxxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    xen: set cpu capabilities from xen_start_kernel()

to the 4.9-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     xen-set-cpu-capabilities-from-xen_start_kernel.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


From foo@baz Sat Jun  2 15:10:07 CEST 2018
From: Juergen Gross <jgross@xxxxxxxx>
Date: Wed, 30 May 2018 13:09:57 +0200
Subject: xen: set cpu capabilities from xen_start_kernel()
To: stable@xxxxxxxxxxxxxxx, xen-devel@xxxxxxxxxxxxxxxxxxxx
Cc: dwmw@xxxxxxxxxxxx, boris.ostrovsky@xxxxxxxxxx, Juergen Gross 
<jgross@xxxxxxxx>
Message-ID: <20180530110958.19413-3-jgross@xxxxxxxx>

From: Juergen Gross <jgross@xxxxxxxx>

Upstream commit: 0808e80cb760de2733c0527d2090ed2205a1eef8 ("xen: set
cpu capabilities from xen_start_kernel()")

There is no need to set the same capabilities for each cpu
individually. This can easily be done for all cpus when starting the
kernel.

Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 arch/x86/xen/enlighten.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -471,6 +471,14 @@ static void __init xen_init_cpuid_mask(v
                cpuid_leaf1_ecx_set_mask = (1 << (X86_FEATURE_MWAIT % 32));
 }
 
+static void __init xen_init_capabilities(void)
+{
+       if (xen_pv_domain()) {
+               setup_clear_cpu_cap(X86_BUG_SYSRET_SS_ATTRS);
+               setup_force_cpu_cap(X86_FEATURE_XENPV);
+       }
+}
+
 static void xen_set_debugreg(int reg, unsigned long val)
 {
        HYPERVISOR_set_debugreg(reg, val);
@@ -1631,6 +1639,7 @@ asmlinkage __visible void __init xen_sta
 
        xen_init_irq_ops();
        xen_init_cpuid_mask();
+       xen_init_capabilities();
 
 #ifdef CONFIG_X86_LOCAL_APIC
        /*
@@ -1975,14 +1984,6 @@ bool xen_hvm_need_lapic(void)
 }
 EXPORT_SYMBOL_GPL(xen_hvm_need_lapic);
 
-static void xen_set_cpu_features(struct cpuinfo_x86 *c)
-{
-       if (xen_pv_domain()) {
-               clear_cpu_bug(c, X86_BUG_SYSRET_SS_ATTRS);
-               set_cpu_cap(c, X86_FEATURE_XENPV);
-       }
-}
-
 static void xen_pin_vcpu(int cpu)
 {
        static bool disable_pinning;
@@ -2029,7 +2030,6 @@ const struct hypervisor_x86 x86_hyper_xe
        .init_platform          = xen_hvm_guest_init,
 #endif
        .x2apic_available       = xen_x2apic_para_available,
-       .set_cpu_features       = xen_set_cpu_features,
        .pin_vcpu               = xen_pin_vcpu,
 };
 EXPORT_SYMBOL(x86_hyper_xen);


Patches currently in stable-queue which might be from jgross@xxxxxxxx are

queue-4.9/x86-amd-don-t-set-x86_bug_sysret_ss_attrs-when-running-under-xen.patch
queue-4.9/x86-amd-revert-commit-944e0fc51a89c9827b9.patch
queue-4.9/xen-set-cpu-capabilities-from-xen_start_kernel.patch

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel