[tip:ras/core] x86/mce-inject: Reset injection struct after injection
Commit-ID: 7401a633c34adc7aefd3edfec60074cb0475a3e8 Gitweb: https://git.kernel.org/tip/7401a633c34adc7aefd3edfec60074cb0475a3e8 Author: Borislav Petkov AuthorDate: Tue, 4 Sep 2018 11:22:12 +0200 Committer: Borislav Petkov CommitDate: Fri, 21 Sep 2018 14:28:37 +0200 x86/mce-inject: Reset injection struct after injection Clear the MCE struct which is used for collecting the injection details after injection. Also, populate it with more details from the machine. Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20180905081954.10391-1...@alien8.de --- arch/x86/kernel/cpu/mcheck/mce-inject.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index c805a06e14c3..1fc424c40a31 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c @@ -108,6 +108,9 @@ static void setup_inj_struct(struct mce *m) memset(m, 0, sizeof(struct mce)); m->cpuvendor = boot_cpu_data.x86_vendor; + m->time = ktime_get_real_seconds(); + m->cpuid = cpuid_eax(1); + m->microcode = boot_cpu_data.microcode; } /* Update fake mce registers on current CPU. */ @@ -576,6 +579,9 @@ static int inj_bank_set(void *data, u64 val) m->bank = val; do_inject(); + /* Reset injection struct */ + setup_inj_struct(_mce); + return 0; }
[tip:ras/core] x86/mce-inject: Reset injection struct after injection
Commit-ID: 7401a633c34adc7aefd3edfec60074cb0475a3e8 Gitweb: https://git.kernel.org/tip/7401a633c34adc7aefd3edfec60074cb0475a3e8 Author: Borislav Petkov AuthorDate: Tue, 4 Sep 2018 11:22:12 +0200 Committer: Borislav Petkov CommitDate: Fri, 21 Sep 2018 14:28:37 +0200 x86/mce-inject: Reset injection struct after injection Clear the MCE struct which is used for collecting the injection details after injection. Also, populate it with more details from the machine. Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/20180905081954.10391-1...@alien8.de --- arch/x86/kernel/cpu/mcheck/mce-inject.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index c805a06e14c3..1fc424c40a31 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c @@ -108,6 +108,9 @@ static void setup_inj_struct(struct mce *m) memset(m, 0, sizeof(struct mce)); m->cpuvendor = boot_cpu_data.x86_vendor; + m->time = ktime_get_real_seconds(); + m->cpuid = cpuid_eax(1); + m->microcode = boot_cpu_data.microcode; } /* Update fake mce registers on current CPU. */ @@ -576,6 +579,9 @@ static int inj_bank_set(void *data, u64 val) m->bank = val; do_inject(); + /* Reset injection struct */ + setup_inj_struct(_mce); + return 0; }
