lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 086/246] x86/microcode: Make the late update update_lock a raw lock for RT
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Scott Wood <swood@redhat.com>

    [ Upstream commit ff987fcf011d20c53b3a613edf6e2055ea48e26e ]

    __reload_late() is called from stop_machine context and thus cannot
    acquire a non-raw spinlock on PREEMPT_RT.

    Signed-off-by: Scott Wood <swood@redhat.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ashok Raj <ashok.raj@intel.com>
    Cc: Clark Williams <williams@redhat.com>
    Cc: Pei Zhang <pezhang@redhat.com>
    Cc: x86-ml <x86@kernel.org>
    Link: http://lkml.kernel.org/r/20180524154420.24455-1-swood@redhat.com
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/kernel/cpu/microcode/core.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/x86/kernel/cpu/microcode/core.c
    +++ b/arch/x86/kernel/cpu/microcode/core.c
    @@ -70,7 +70,7 @@ static DEFINE_MUTEX(microcode_mutex);
    /*
    * Serialize late loading so that CPUs get updated one-by-one.
    */
    -static DEFINE_SPINLOCK(update_lock);
    +static DEFINE_RAW_SPINLOCK(update_lock);

    struct ucode_cpu_info ucode_cpu_info[NR_CPUS];

    @@ -560,9 +560,9 @@ static int __reload_late(void *info)
    if (__wait_for_cpus(&late_cpus_in, NSEC_PER_SEC))
    return -1;

    - spin_lock(&update_lock);
    + raw_spin_lock(&update_lock);
    apply_microcode_local(&err);
    - spin_unlock(&update_lock);
    + raw_spin_unlock(&update_lock);

    /* siblings return UCODE_OK because their engine got updated already */
    if (err > UCODE_NFOUND) {

    \
     
     \ /
      Last update: 2018-08-01 20:13    [W:4.023 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site