From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752019AbdFNJXv (ORCPT ); Wed, 14 Jun 2017 05:23:51 -0400 Received: from terminus.zytor.com ([65.50.211.136]:51223 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751864AbdFNJXt (ORCPT ); Wed, 14 Jun 2017 05:23:49 -0400 Date: Wed, 14 Jun 2017 02:19:09 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, bp@suse.de, mingo@kernel.org, yazen.ghannam@amd.com, tony.luck@intel.com, hpa@zytor.com, bp@alien8.de, tglx@linutronix.de, peterz@infradead.org Reply-To: yazen.ghannam@amd.com, hpa@zytor.com, tony.luck@intel.com, bp@alien8.de, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org In-Reply-To: <20170613162835.30750-7-bp@alien8.de> References: <20170613162835.30750-7-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce/mce-inject: Preset the MCE injection struct Git-Commit-ID: 86d2eac5a7045933a88c97f0453f22106bb90b54 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 86d2eac5a7045933a88c97f0453f22106bb90b54 Gitweb: http://git.kernel.org/tip/86d2eac5a7045933a88c97f0453f22106bb90b54 Author: Borislav Petkov AuthorDate: Tue, 13 Jun 2017 18:28:33 +0200 Committer: Ingo Molnar CommitDate: Wed, 14 Jun 2017 07:32:09 +0200 x86/mce/mce-inject: Preset the MCE injection struct Populate the MCE injection struct before doing initial injection so that values which don't change have sane defaults. Tested-by: Yazen Ghannam Signed-off-by: Borislav Petkov Acked-by: Yazen Ghannam Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Link: http://lkml.kernel.org/r/20170613162835.30750-7-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/mcheck/mce-inject.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index 00af8dd..231ad23 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c @@ -103,6 +103,13 @@ DEFINE_SIMPLE_ATTRIBUTE(misc_fops, inj_misc_get, inj_misc_set, "%llx\n"); DEFINE_SIMPLE_ATTRIBUTE(addr_fops, inj_addr_get, inj_addr_set, "%llx\n"); DEFINE_SIMPLE_ATTRIBUTE(synd_fops, inj_synd_get, inj_synd_set, "%llx\n"); +static void setup_inj_struct(struct mce *m) +{ + memset(m, 0, sizeof(struct mce)); + + m->cpuvendor = boot_cpu_data.x86_vendor; +} + /* Update fake mce registers on current CPU. */ static void inject_mce(struct mce *m) { @@ -700,6 +707,8 @@ static int __init inject_init(void) register_nmi_handler(NMI_LOCAL, mce_raise_notify, 0, "mce_notify"); mce_register_injector_chain(&inject_nb); + setup_inj_struct(&i_mce); + pr_info("Machine check injector initialized\n"); return 0;