Merge tag 'ras-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 RAS updates from Ingo Molnar:
 "Boris is on vacation and he asked us to send you the pending RAS bits:

   - Print the PPIN field on CPUs that fill them out

   - Fix an MCE injection bug

   - Simplify a kzalloc in dev_mcelog_init_device()"

* tag 'ras-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce, EDAC/mce_amd: Print PPIN in machine check records
  x86/mce/dev-mcelog: Use struct_size() helper in kzalloc()
  x86/mce/inject: Fix a wrong assignment of i_mce.status

diff --combined arch/x86/kernel/cpu/mce/core.c
index 9246595c07d736d095ef73615a6dcc5bb8811575,0865349502d5f5700c90959da64bd0179d95c2b6..e76c1ddd35e732bc3ed4a9f58373a23913595b4b
--- 1/arch/x86/kernel/cpu/mce/core.c
--- 2/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@@ -42,7 -42,6 +42,7 @@@
  #include <linux/export.h>
  #include <linux/jump_label.h>
  #include <linux/set_memory.h>
 +#include <linux/sync_core.h>
  #include <linux/task_work.h>
  #include <linux/hardirq.h>
  
@@@ -245,6 -244,8 +245,8 @@@ static void __print_mce(struct mce *m
                pr_cont("ADDR %llx ", m->addr);
        if (m->misc)
                pr_cont("MISC %llx ", m->misc);
+       if (m->ppin)
+               pr_cont("PPIN %llx ", m->ppin);
  
        if (mce_flags.smca) {
                if (m->synd)
@@@ -1084,7 -1085,7 +1086,7 @@@ static noinstr bool mce_check_crashing_
  {
        unsigned int cpu = smp_processor_id();
  
 -      if (cpu_is_offline(cpu) ||
 +      if (arch_cpu_is_offline(cpu) ||
            (crashing_cpu != -1 && crashing_cpu != cpu)) {
                u64 mcgstatus;
  
@@@ -1902,8 -1903,6 +1904,8 @@@ void (*machine_check_vector)(struct pt_
  
  static __always_inline void exc_machine_check_kernel(struct pt_regs *regs)
  {
 +      WARN_ON_ONCE(user_mode(regs));
 +
        /*
         * Only required when from kernel mode. See
         * mce_check_crashing_cpu() for details.
@@@ -1957,7 -1956,7 +1959,7 @@@ DEFINE_IDTENTRY_MCE_USER(exc_machine_ch
  }
  #else
  /* 32bit unified entry point */
 -DEFINE_IDTENTRY_MCE(exc_machine_check)
 +DEFINE_IDTENTRY_RAW(exc_machine_check)
  {
        unsigned long dr7;