powerpc/mce: Avoid using irq_work_queue() in realmode
PATCH v2 1/2 powerpc/mce: Avoid using irq_work_queue() in realmode
In realmode mce handler we use irq_work_queue() to defer the processing of mce events, irq_work_queue() can only be called when translation is enabled because it touches memory outside RMA, hence we enable translation before calling irq_work_queue and disable on return, though it is not safe to do in realmode.
To avoid this, program the decrementer and call the event processing functions from timer handler.
---
V2:
* Use arch_irq_work_raise to raise decrementer interrupt.
* Avoid having atomic variable.
--- arch/powerpc/include/asm/machdep.h | 2 + arch/powerpc/include/asm/mce.h | 2 + arch/powerpc/include/asm/paca.h | 1 + arch/powerpc/kernel/mce.c | 51 +++++++++++------------- arch/powerpc/kernel/time.c | 2 + arch/powerpc/platforms/pseries/pseries.h | 1 + arch/powerpc/platforms/pseries/ras.c | 31 +------------- arch/powerpc/platforms/pseries/setup.c | 1 + 8 files changed, 33 insertions(+), 58 deletions(-)
arch/powerpc/include/asm/machdep.h +2 -0
@@ -99,6 +99,8 @@ struct machdep_calls {/* Called during machine check exception to retrive fixup address. */ bool (*mce_check_early_recovery)(struct pt_regs *regs); +void (*machine_check_log_err)(void ); +/* Motherboard/chipset features. This is a kind of general purpose * hook used to control some machine specific features (like reset * lines, chip power control, etc...).
arch/powerpc/include/asm/mce.h +2 -0
@@ -235,8 +235,10 @@ extern void machine_check_print_event_info(struct machine_check_event *evt,unsigned long addr_to_pfn (struct pt_regs *regs,unsigned long addr);extern void mce_common_process_ue (struct pt_regs *regs,struct mce_error_info *mce_err); +void machine_check_raise_dec_intr (void );int mce_register_notifier (struct notifier_block *nb);int mce_unregister_notifier (struct notifier_block *nb); +void mce_run_late_handlers (void );#ifdef CONFIG_PPC_BOOK3S_64 void flush_and_reload_slb (void );void flush_erat (void );
arch/powerpc/include/asm/paca.h +1 -0
@@ -280,6 +280,7 @@ struct paca_struct {#endif #ifdef CONFIG_PPC_BOOK3S_64 struct mce_info *mce_info; +u32 mces_to_process;#endif /* CONFIG_PPC_BOOK3S_64 */ }____cacheline_aligned ;
arch/powerpc/kernel/mce.c +23 -28
108 lines not on this page · raw message
arch/powerpc/kernel/time.c +2 -0
@@ -594,6 +594,8 @@ DEFINE_INTERRUPT_HANDLER_ASYNC(timer_interrupt)if (test_irq_work_pending ()) {clear_irq_work_pending (); +if (IS_ENABLED (CONFIG_PPC_BOOK3S_64 )) +mce_run_late_handlers ();irq_work_run (); }
arch/powerpc/platforms/pseries/pseries.h +1 -0
@@ -21,6 +21,7 @@ struct pt_regs;extern int pSeries_system_reset_exception (struct pt_regs *regs);extern int pSeries_machine_check_exception (struct pt_regs *regs);extern long pseries_machine_check_realmode (struct pt_regs *regs); +void pSeries_machine_check_log_err (void );#ifdef CONFIG_SMP extern void smp_init_pseries (void );
arch/powerpc/platforms/pseries/ras.c +1 -30
@@ -23,11 +23,6 @@ static DEFINE_SPINLOCK(ras_log_buf_lock);static int ras_check_exception_token; -static void mce_process_errlog_event (struct irq_work *work); -static struct irq_work mce_errlog_process_work = { - .func = mce_process_errlog_event, -}; -#define EPOW_SENSOR_TOKEN 9#define EPOW_SENSOR_INDEX 0
@@ -729,40 +724,16 @@ static int mce_handle_error(struct pt_regs *regs, struct rtas_error_log *errp) error_type = mce_log->error_type; disposition =mce_handle_err_realmode (disposition, error_type); - -/* -* Enable translation as we will be accessing per-cpu variables -* in save_mce_event() which may fall outside RMO region, also -* leave it enabled because subsequently we will be queuing work -* to workqueues where again per-cpu variables accessed, besides -* fwnmi_release_errinfo() crashes when called in realmode on -* pseries. -* Note: All the realmode handling like flushing SLB entries for -* SLB multihit is done by now. -*/ out: - msr =mfmsr (); -mtmsr (msr |MSR_IR |MSR_DR ); - disposition =mce_handle_err_virtmode (regs, errp, mce_log, disposition); - -/* -* Queue irq work to log this rtas event later. -* irq_work_queue uses per-cpu variables, so do this in virt -* mode as well. -*/ -irq_work_queue (&mce_errlog_process_work); - -mtmsr (msr); -return disposition; }/* * Process MCE rtas errlog event. */ -static void mce_process_errlog_event (struct irq_work *work) +void pSeries_machine_check_log_err (void ) {struct rtas_error_log *err;
arch/powerpc/platforms/pseries/setup.c +1 -0
@@ -1084,6 +1084,7 @@ define_machine(pseries) { .system_reset_exception = pSeries_system_reset_exception, .machine_check_early = pseries_machine_check_realmode, .machine_check_exception = pSeries_machine_check_exception, + .machine_check_log_err = pSeries_machine_check_log_err, #ifdef CONFIG_KEXEC_CORE .machine_kexec = pSeries_machine_kexec, .kexec_cpu_down = pseries_kexec_cpu_down,
Signature · 1 line
2.31.1
PATCH v2 2/2 pseries/mce: Refactor the pseries mce handling code
Now that we are no longer switching on the mmu in realmode mce handler, Revert the commit 4ff753feab02("powerpc/pseries:
Avoid using addr_to_pfn in real mode") partially, which introduced functions mce_handle_err_virtmode/realmode() to separate mce handler code which needed translation to enabled.
--- arch/powerpc/platforms/pseries/ras.c | 122 +++++++++++---------------- 1 file changed, 49 insertions(+), 73 deletions(-)
arch/powerpc/platforms/pseries/ras.c +49 -73
@@ -511,58 +511,17 @@ int pSeries_system_reset_exception(struct pt_regs *regs)return 0 ;/* need to perform reset */ } -static int mce_handle_err_realmode (int disposition,u8 error_type) -{ -#ifdef CONFIG_PPC_BOOK3S_64 -if (disposition ==RTAS_DISP_NOT_RECOVERED ) { -switch (error_type) { -case MC_ERROR_TYPE_ERAT : -flush_erat (); - disposition =RTAS_DISP_FULLY_RECOVERED ; -break ; -case MC_ERROR_TYPE_SLB : -/* -* Store the old slb content in paca before flushing. -* Print this when we go to virtual mode. -* There are chances that we may hit MCE again if there -* is a parity error on the SLB entry we trying to read -* for saving. Hence limit the slb saving to single -* level of recursion. -*/ -if (local_paca->in_mce ==1 ) -slb_save_contents (local_paca->mce_faulty_slbs); -flush_and_reload_slb (); - disposition =RTAS_DISP_FULLY_RECOVERED ; -break ; -default : -break ; - } - }else if (disposition ==RTAS_DISP_LIMITED_RECOVERY ) { -/* Platform corrected itself but could be degraded */ -pr_err ("MCE: limited recovery, system may be degraded\n" ); - disposition =RTAS_DISP_FULLY_RECOVERED ; - } -#endif -return disposition; -} - -static int mce_handle_err_virtmode (struct pt_regs *regs, -struct rtas_error_log *errp, -struct pseries_mc_errorlog *mce_log, -int disposition) +static int mce_handle_error (struct pt_regs *regs,struct rtas_error_log *errp) {struct mce_error_info mce_err = {0 }; +unsigned long eaddr =0 , paddr =0 ; +struct pseries_errorlog *pseries_log; +struct pseries_mc_errorlog *mce_log; +int disposition =rtas_error_disposition (errp);int initiator =rtas_error_initiator (errp);int severity =rtas_error_severity (errp); -unsigned long eaddr =0 , paddr =0 ;u8 error_type, err_sub_type; -if (!mce_log) - goto out; - - error_type = mce_log->error_type; - err_sub_type =rtas_mc_error_sub_type (mce_log); -if (initiator ==RTAS_INITIATOR_UNKNOWN ) mce_err.initiator =MCE_INITIATOR_UNKNOWN ;else if (initiator ==RTAS_INITIATOR_CPU )
@@ -588,6 +547,8 @@ static int mce_handle_err_virtmode(struct pt_regs *regs, mce_err.severity =MCE_SEV_SEVERE ; else if (severity == RTAS_SEVERITY_ERROR) mce_err.severity = MCE_SEV_SEVERE; + else if (severity == RTAS_SEVERITY_FATAL) + mce_err.severity = MCE_SEV_FATAL; else mce_err.severity = MCE_SEV_FATAL;
@@ -599,7 +560,18 @@ static int mce_handle_err_virtmode(struct pt_regs *regs, mce_err.error_type =MCE_ERROR_TYPE_UNKNOWN ; mce_err.error_class =MCE_ECLASS_UNKNOWN ; -switch (error_type) { +if (!rtas_error_extended (errp)) + goto out; + + pseries_log =get_pseries_errorlog (errp,PSERIES_ELOG_SECT_ID_MCE ); +if (!pseries_log) + goto out; + + mce_log = (struct pseries_mc_errorlog *)pseries_log->data; + error_type = mce_log->error_type; + err_sub_type =rtas_mc_error_sub_type (mce_log); + +switch (mce_log->error_type) {case MC_ERROR_TYPE_UE : mce_err.error_type =MCE_ERROR_TYPE_UE ;mce_common_process_ue (regs, &mce_err);
@@ -692,41 +664,45 @@ static int mce_handle_err_virtmode(struct pt_regs *regs, mce_err.error_type =MCE_ERROR_TYPE_DCACHE ;break ;case MC_ERROR_TYPE_I_CACHE : - mce_err.error_type =MCE_ERROR_TYPE_ICACHE ; + mce_err.error_type =MCE_ERROR_TYPE_DCACHE ;break ;case MC_ERROR_TYPE_UNKNOWN :default : mce_err.error_type =MCE_ERROR_TYPE_UNKNOWN ;break ; } + +#ifdef CONFIG_PPC_BOOK3S_64 +if (disposition ==RTAS_DISP_NOT_RECOVERED ) { +switch (error_type) { +case MC_ERROR_TYPE_SLB : +case MC_ERROR_TYPE_ERAT : +/* +* Store the old slb content in paca before flushing. +* Print this when we go to virtual mode. +* There are chances that we may hit MCE again if there +* is a parity error on the SLB entry we trying to read +* for saving. Hence limit the slb saving to single +* level of recursion. +*/ +if (local_paca->in_mce ==1 ) +slb_save_contents (local_paca->mce_faulty_slbs); +flush_and_reload_slb (); + disposition =RTAS_DISP_FULLY_RECOVERED ; +break ; +default : +break ; + } + }else if (disposition ==RTAS_DISP_LIMITED_RECOVERY ) { +/* Platform corrected itself but could be degraded */ +pr_err ("MCE: limited recovery, system may be degraded\n" ); + disposition =RTAS_DISP_FULLY_RECOVERED ; + } +#endif out:save_mce_event (regs, disposition ==RTAS_DISP_FULLY_RECOVERED , - &mce_err, regs->nip, eaddr, paddr); -return disposition; -} + &mce_err, regs->nip, eaddr, paddr); -static int mce_handle_error (struct pt_regs *regs,struct rtas_error_log *errp) -{ -struct pseries_errorlog *pseries_log; -struct pseries_mc_errorlog *mce_log =NULL ; -int disposition =rtas_error_disposition (errp); -unsigned long msr; -u8 error_type; - -if (!rtas_error_extended (errp)) - goto out; - - pseries_log =get_pseries_errorlog (errp,PSERIES_ELOG_SECT_ID_MCE ); -if (!pseries_log) - goto out; - - mce_log = (struct pseries_mc_errorlog *)pseries_log->data; - error_type = mce_log->error_type; - - disposition =mce_handle_err_realmode (disposition, error_type); -out: - disposition =mce_handle_err_virtmode (regs, errp, mce_log, - disposition);return disposition; }
Signature · 1 line
2.31.1
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Ganesh,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on powerpc/next]
[also build test ERROR on v5.16-rc2 next-20211124]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Ganesh-Goudar/powerpc-mce-Avoid-using-irq_work_queue-in-realmode/20211124-130459 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next config: powerpc-allnoconfig (https://download.01.org/0day-ci/archive/20211124/202111241736.ZgcO0Sk3-lkp(a)intel.com/config) compiler: powerpc-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/bac24ec52edd7013115ad594974f64a30565266d
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Ganesh-Goudar/powerpc-mce-Avoid-using-irq_work_queue-in-realmode/20211124-130459 git checkout bac24ec52edd7013115ad594974f64a30565266d
# save the config file to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross ARCH=powerpc
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
arch/powerpc/kernel/time.c: In function '____timer_interrupt':
>> arch/powerpc/kernel/time.c:598:25: error: implicit declaration of function 'mce_run_late_handlers' [-Werror=implicit-function-declaration]
598 | mce_run_late_handlers();
| ^~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
vim +/mce_run_late_handlers +598 arch/powerpc/kernel/time.c
590
591 old_regs = set_irq_regs(regs);
592
593 trace_timer_interrupt_entry(regs);
594
595 if (test_irq_work_pending()) {
596 clear_irq_work_pending();
597 if (IS_ENABLED(CONFIG_PPC_BOOK3S_64))
> 598 mce_run_late_handlers();
599 irq_work_run();
600 }
601
602 now = get_tb();
603 if (now >= *next_tb) {
604 *next_tb = ~(u64)0;
605 if (evt->event_handler)
606 evt->event_handler(evt);
607 __this_cpu_inc(irq_stat.timer_irqs_event);
608 } else {
609 now = *next_tb - now;
610 if (now <= decrementer_max)
611 set_dec(now);
612 /* We may have raced with new irq work */
613 if (test_irq_work_pending())
614 set_dec(1);
615 __this_cpu_inc(irq_stat.timer_irqs_others);
616 }
617
618 trace_timer_interrupt_exit(regs);
619
620 set_irq_regs(old_regs);
621 }
622 EXPORT_SYMBOL(timer_interrupt);
623
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]