Commit daa3de23 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ras-urgent-2026-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull MCE fix from Ingo Molnar:

 - Fix an MCE polling interval adjustment regression (Borislav Petkov)

* tag 'ras-urgent-2026-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Restore MCA polling interval halving
parents ec296ebf ea324444

arch/x86/kernel/cpu/mce/core.c

+5 −28
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct mca_config mca_cfg __read_mostly = { 
};



static DEFINE_PER_CPU(struct mce_hw_err, hw_errs_seen);

static unsigned long mce_need_notify;



/*

 * MCA banks polled by the period polling timer for corrected events.
@@ -152,9 +151,11 @@ EXPORT_PER_CPU_SYMBOL_GPL(injectm); 


void mce_log(struct mce_hw_err *err)

{

	if (mce_gen_pool_add(err))

	if (mce_gen_pool_add(err)) {

		pr_info(HW_ERR "Machine check events logged\n");

		irq_work_queue(&mce_irq_work);

	}

}

EXPORT_SYMBOL_GPL(mce_log);



void mce_register_decode_chain(struct notifier_block *nb)
@@ -585,28 +586,6 @@ bool mce_is_correctable(struct mce *m) 
}

EXPORT_SYMBOL_GPL(mce_is_correctable);



/*

 * Notify the user(s) about new machine check events.

 * Can be called from interrupt context, but not from machine check/NMI

 * context.

 */

static bool mce_notify_irq(void)

{

	/* Not more than two messages every minute */

	static DEFINE_RATELIMIT_STATE(ratelimit, 60*HZ, 2);



	if (test_and_clear_bit(0, &mce_need_notify)) {

		mce_work_trigger();



		if (__ratelimit(&ratelimit))

			pr_info(HW_ERR "Machine check events logged\n");



		return true;

	}



	return false;

}



static int mce_early_notifier(struct notifier_block *nb, unsigned long val,

			      void *data)

{
@@ -618,9 +597,7 @@ static int mce_early_notifier(struct notifier_block *nb, unsigned long val, 
	/* Emit the trace record: */

	trace_mce_record(err);



	set_bit(0, &mce_need_notify);



	mce_notify_irq();

	mce_work_trigger();



	return NOTIFY_DONE;

}
@@ -1804,7 +1781,7 @@ static void mce_timer_fn(struct timer_list *t) 
	 * Alert userspace if needed. If we logged an MCE, reduce the polling

	 * interval, otherwise increase the polling interval.

	 */

	if (mce_notify_irq())

	if (!mce_gen_pool_empty())

		iv = max(iv / 2, (unsigned long) HZ/100);

	else

		iv = min(iv * 2, round_jiffies_relative(check_interval * HZ));