From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751468AbdFFJdM (ORCPT ); Tue, 6 Jun 2017 05:33:12 -0400 Received: from mail.skyhub.de ([5.9.137.197]:44822 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751387AbdFFJdK (ORCPT ); Tue, 6 Jun 2017 05:33:10 -0400 From: Borislav Petkov To: Tony Luck , Yazen Ghannam Cc: linux-edac , LKML Subject: [PATCH 4/4] x86/mce/mce-inject: Preset the MCE injection struct Date: Tue, 6 Jun 2017 11:32:50 +0200 Message-Id: <20170606093250.28071-5-bp@alien8.de> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170606093250.28071-1-bp@alien8.de> References: <20170606093250.28071-1-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov Populate the MCE injection struct before doing initial injection so that values which don't change have sane defaults. Signed-off-by: Borislav Petkov --- 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 2f2312bcf936..1893249c1971 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 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; -- 2.13.0