Commit bad6722e authored by Eliav Farber's avatar Eliav Farber Committed by Thomas Gleixner
Browse files

kexec: Consolidate machine_kexec_mask_interrupts() implementation 



Consolidate the machine_kexec_mask_interrupts implementation into a common
function located in a new file: kernel/irq/kexec.c. This removes duplicate
implementations from architecture-specific files in arch/arm, arch/arm64,
arch/powerpc, and arch/riscv, reducing code duplication and improving
maintainability.

The new implementation retains architecture-specific behavior for
CONFIG_GENERIC_IRQ_KEXEC_CLEAR_VM_FORWARD, which was previously implemented
for ARM64. When enabled (currently for ARM64), it clears the active state
of interrupts forwarded to virtual machines (VMs) before handling other
interrupt masking operations.

Signed-off-by: default avatarEliav Farber <farbere@amazon.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241204142003.32859-2-farbere@amazon.com
parent 429f49ad

arch/arm/kernel/machine_kexec.c

+0 −23
Original line number Diff line number Diff line
@@ -127,29 +127,6 @@ void crash_smp_send_stop(void) 
	cpus_stopped = 1;

}



static void machine_kexec_mask_interrupts(void)

{

	unsigned int i;

	struct irq_desc *desc;



	for_each_irq_desc(i, desc) {

		struct irq_chip *chip;



		chip = irq_desc_get_chip(desc);

		if (!chip)

			continue;



		if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data))

			chip->irq_eoi(&desc->irq_data);



		if (chip->irq_mask)

			chip->irq_mask(&desc->irq_data);



		if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))

			chip->irq_disable(&desc->irq_data);

	}

}



void machine_crash_shutdown(struct pt_regs *regs)

{

	local_irq_disable();

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ config ARM64 
	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IOREMAP

	select GENERIC_IRQ_IPI

	select GENERIC_IRQ_KEXEC_CLEAR_VM_FORWARD

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW_LEVEL

arch/arm64/kernel/machine_kexec.c

+0 −31
Original line number Diff line number Diff line
@@ -207,37 +207,6 @@ void machine_kexec(struct kimage *kimage) 
	BUG(); /* Should never get here. */

}



static void machine_kexec_mask_interrupts(void)

{

	unsigned int i;

	struct irq_desc *desc;



	for_each_irq_desc(i, desc) {

		struct irq_chip *chip;

		int ret;



		chip = irq_desc_get_chip(desc);

		if (!chip)

			continue;



		/*

		 * First try to remove the active state. If this

		 * fails, try to EOI the interrupt.

		 */

		ret = irq_set_irqchip_state(i, IRQCHIP_STATE_ACTIVE, false);



		if (ret && irqd_irq_inprogress(&desc->irq_data) &&

		    chip->irq_eoi)

			chip->irq_eoi(&desc->irq_data);



		if (chip->irq_mask)

			chip->irq_mask(&desc->irq_data);



		if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))

			chip->irq_disable(&desc->irq_data);

	}

}



/**

 * machine_crash_shutdown - shutdown non-crashing cpus and save registers

 */

arch/powerpc/include/asm/kexec.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct pt_regs; 
extern void kexec_smp_wait(void);	/* get and clear naca physid, wait for

					  master to copy new code to 0 */

extern void default_machine_kexec(struct kimage *image);

extern void machine_kexec_mask_interrupts(void);



void relocate_new_kernel(unsigned long indirection_page, unsigned long reboot_code_buffer,

			 unsigned long start_address) __noreturn;

arch/powerpc/kexec/core.c

+0 −22
Original line number Diff line number Diff line
@@ -22,28 +22,6 @@ 
#include <asm/setup.h>

#include <asm/firmware.h>



void machine_kexec_mask_interrupts(void) {

	unsigned int i;

	struct irq_desc *desc;



	for_each_irq_desc(i, desc) {

		struct irq_chip *chip;



		chip = irq_desc_get_chip(desc);

		if (!chip)

			continue;



		if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data))

			chip->irq_eoi(&desc->irq_data);



		if (chip->irq_mask)

			chip->irq_mask(&desc->irq_data);



		if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))

			chip->irq_disable(&desc->irq_data);

	}

}



#ifdef CONFIG_CRASH_DUMP

void machine_crash_shutdown(struct pt_regs *regs)

{