Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4447ac11 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86/idt: Simplify alloc_intr_gate() 



The only users of alloc_intr_gate() are hypervisors, which both check the
used_vectors bitmap whether they have allocated the gate already. Move that
check into alloc_intr_gate() and simplify the users.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephen Hemminger <sthemmin@microsoft.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/20170828064959.580830286@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent db18da78

arch/x86/kernel/cpu/mshyperv.c

+2 −7
Original line number Diff line number Diff line
@@ -59,13 +59,8 @@ void hyperv_vector_handler(struct pt_regs *regs) 
void hv_setup_vmbus_irq(void (*handler)(void))

{

	vmbus_handler = handler;

	/*

	 * Setup the IDT for hypervisor callback. Prevent reallocation

	 * at module reload.

	 */

	if (!test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors))

		alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR,

				hyperv_callback_vector);

	/* Setup the IDT for hypervisor callback */

	alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR, hyperv_callback_vector);

}



void hv_remove_vmbus_irq(void)

arch/x86/kernel/idt.c

+3 −3
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ void set_intr_gate(unsigned int n, const void *addr) 


void alloc_intr_gate(unsigned int n, const void *addr)

{

	BUG_ON(test_bit(n, used_vectors) || n < FIRST_SYSTEM_VECTOR);

	set_bit(n, used_vectors);

	BUG_ON(n < FIRST_SYSTEM_VECTOR);

	if (!test_and_set_bit(n, used_vectors))

		set_intr_gate(n, addr);

}

drivers/xen/events/events_base.c

+2 −4
Original line number Diff line number Diff line
@@ -1653,8 +1653,6 @@ void xen_callback_vector(void) 
			return;

		}

		pr_info("Xen HVM callback vector for event delivery is enabled\n");

		/* in the restore case the vector has already been allocated */

		if (!test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors))

		alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR,

				xen_hvm_callback_vector);

	}