From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48bHWRjhBAoP0JdhhUGK19dl4WbBl+b1DeZ6aXaR+9dPXP7hXyG6WV1dRgBLMEcyEzAIBxn ARC-Seal: i=1; a=rsa-sha256; t=1523399928; cv=none; d=google.com; s=arc-20160816; b=fZ/mhy9LcQeMZPAGzwJmgE/efiXGHCrHiWOunvy3sbIM7PPepzCh3pEQerPpz1DqeI 5Vb2aDP2eLX62VbWLBWpU5hvx2XUOZEcVTGPfUIO3rKt8L5NGSwxlQDMlR1k6OTtt9HA fcEh1pfoAKNFCmEKD5/lZgtLXJ7cHv/Z2BWgh+JQSb9Qi69iZXFPAPv1lTkZ3//o0ABO QhAKh37/ZvchLTm7hOCFgmACAZH30wiGAp0NkWGP7gdzFqsjZxMRhAWXTUxlmktS+Uij FxhuDVJq30jHe989jU8gBXAXzPezDpTsmw8Sehl9Rb7wctK+TFwrMNMLecYvnYNe9m+Z 9D2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=hHgNLKhOuZoD/bJUJAYmR2UJSTiq+ezT64iborSgtbY=; b=AUJbjItNDfIKOMjczXzx6mF708gCrg3MCPMx8e+w+iOxaadqfK7jPFPQcl/GuhQQA/ 5/iwwPoQerrSAqmfV3m3XEopEPD4TahTRSRgdCvN6Y0Mtv74oD2fFAKVbsldk708HwTW 2UwHCb0G/0cyHz9iOfv5MS0DDm+DY2LhFdFRBZvefeTGhEFg9SZGUgFN64Y1rzh1DLkx 7+X+gU+sOwOB76Of4hupKNv24qb3dOEa1ObSi4TLCyOAqPesgVVDzAuY6uTM7ROWwrga bW/JBQoBjrRaUwwYSwYYq7wlP5Gu1m2+98jbZBQp4V2bsa8+45RdP7vWxTZAQU4nDOtm GhVA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ashok Raj , Borislav Petkov , Andy Lutomirski , Arjan van de Ven , Borislav Petkov , Dan Williams , Dave Hansen , David Woodhouse , Josh Poimboeuf , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Ingo Molnar Subject: [PATCH 4.14 086/138] x86/CPU: Add a microcode loader callback Date: Wed, 11 Apr 2018 00:24:36 +0200 Message-Id: <20180410212912.160225124@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180410212902.121524696@linuxfoundation.org> References: <20180410212902.121524696@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597400097812019407?= X-GMAIL-MSGID: =?utf-8?q?1597400604087884408?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Borislav Petkov commit 1008c52c09dcb23d93f8e0ea83a6246265d2cce0 upstream. Add a callback function which the microcode loader calls when microcode has been updated to a newer revision. Do the callback only when no error was encountered during loading. Tested-by: Ashok Raj Signed-off-by: Borislav Petkov Reviewed-by: Ashok Raj Cc: Andy Lutomirski Cc: Arjan van de Ven Cc: Borislav Petkov Cc: Dan Williams Cc: Dave Hansen Cc: David Woodhouse Cc: Greg Kroah-Hartman Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20180216112640.11554-3-bp@alien8.de Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/cpu/common.c | 10 ++++++++++ arch/x86/kernel/cpu/microcode/core.c | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -968,4 +968,5 @@ bool xen_set_default_idle(void); void stop_this_cpu(void *dummy); void df_debug(struct pt_regs *regs, long error_code); +void microcode_check(void); #endif /* _ASM_X86_PROCESSOR_H */ --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1724,3 +1724,13 @@ static int __init init_cpu_syscore(void) return 0; } core_initcall(init_cpu_syscore); + +/* + * The microcode loader calls this upon late microcode load to recheck features, + * only when microcode has been updated. Caller holds microcode_mutex and CPU + * hotplug lock. + */ +void microcode_check(void) +{ + perf_check_microcode(); +} --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -509,6 +509,7 @@ static ssize_t reload_store(struct devic const char *buf, size_t size) { enum ucode_state tmp_ret = UCODE_OK; + bool do_callback = false; unsigned long val; ssize_t ret = 0; int cpu; @@ -531,10 +532,13 @@ static ssize_t reload_store(struct devic if (!ret) ret = -EINVAL; } + + if (tmp_ret == UCODE_UPDATED) + do_callback = true; } - if (!ret && tmp_ret == UCODE_UPDATED) - perf_check_microcode(); + if (!ret && do_callback) + microcode_check(); mutex_unlock(µcode_mutex); put_online_cpus();