Skip to content

[linux-6.6.y] x86/mce: Avoid triggering a schedule call in the NMI context #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Avenger-285714 merged 1 commit into from
Nov 4, 2024
Merged

[linux-6.6.y] x86/mce: Avoid triggering a schedule call in the NMI context #454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions arch/x86/kernel/cpu/mce/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2124,15 +2124,11 @@ static __always_inline void exc_machine_check_user(struct pt_regs *regs)
{
irqentry_state_t irq_state;

irq_state = irqentry_nmi_enter(regs);

irqentry_enter_from_user_mode(regs);

irq_state = irqentry_nmi_enter(regs);
do_machine_check(regs);

irqentry_exit_to_user_mode(regs);

irqentry_nmi_exit(regs, irq_state);
irqentry_exit_to_user_mode(regs);
}

#ifdef CONFIG_X86_64
Expand Down