From: tip-bot for Borislav Petkov <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: bp@alien8.de, ashok.raj@intel.com, luto@kernel.org, bp@suse.de, arjan@linux.intel.com, gregkh@linuxfoundation.org, hpa@zytor.com, dwmw2@infradead.org, dan.j.williams@intel.com, torvalds@linux-foundation.org, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, dave.hansen@linux.intel.com Subject: [tip:x86/pti] x86/CPU: Add a microcode loader callback Date: Sat, 17 Feb 2018 02:12:33 -0800 [thread overview] Message-ID: <tip-1008c52c09dcb23d93f8e0ea83a6246265d2cce0@git.kernel.org> (raw) In-Reply-To: <20180216112640.11554-3-bp@alien8.de> Commit-ID: 1008c52c09dcb23d93f8e0ea83a6246265d2cce0 Gitweb: https://git.kernel.org/tip/1008c52c09dcb23d93f8e0ea83a6246265d2cce0 Author: Borislav Petkov <bp@suse.de> AuthorDate: Fri, 16 Feb 2018 12:26:39 +0100 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Sat, 17 Feb 2018 08:43:55 +0100 x86/CPU: Add a microcode loader callback 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 <ashok.raj@intel.com> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Ashok Raj <ashok.raj@intel.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20180216112640.11554-3-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org> --- 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(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 1bd9ed8..b0ccd48 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -977,4 +977,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 */ diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 824aee0..84f1cd8 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1749,3 +1749,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(); +} diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 6fdaf7c..aa1b9a4 100644 --- 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 device *dev, 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 device *dev, 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();
next prev parent reply other threads:[~2018-02-17 10:12 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-16 11:26 [PATCH 0/3] x86/microcode: " Borislav Petkov 2018-02-16 11:26 ` [PATCH 1/3] x86/microcode: Propagate return value from updating functions Borislav Petkov 2018-02-17 10:12 ` [tip:x86/pti] " tip-bot for Borislav Petkov 2018-02-16 11:26 ` [PATCH 2/3] x86/CPU: Add a microcode loader callback Borislav Petkov 2018-02-17 10:12 ` tip-bot for Borislav Petkov [this message] 2018-02-17 13:07 ` Raj, Ashok 2018-02-17 13:28 ` Borislav Petkov 2018-02-17 17:06 ` Raj, Ashok 2018-02-16 11:26 ` [PATCH 3/3] x86/CPU: Check CPU feature bits after microcode upgrade Borislav Petkov 2018-02-17 10:13 ` [tip:x86/pti] " tip-bot for Borislav Petkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tip-1008c52c09dcb23d93f8e0ea83a6246265d2cce0@git.kernel.org \ --to=tipbot@zytor.com \ --cc=arjan@linux.intel.com \ --cc=ashok.raj@intel.com \ --cc=bp@alien8.de \ --cc=bp@suse.de \ --cc=dan.j.williams@intel.com \ --cc=dave.hansen@linux.intel.com \ --cc=dwmw2@infradead.org \ --cc=gregkh@linuxfoundation.org \ --cc=hpa@zytor.com \ --cc=jpoimboe@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@vger.kernel.org \ --cc=luto@kernel.org \ --cc=mingo@kernel.org \ --cc=peterz@infradead.org \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.org \ --subject='Re: [tip:x86/pti] x86/CPU: Add a microcode loader callback' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.