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

Commit 4a5b6946 authored by Julien Grall's avatar Julien Grall Committed by David Vrabel
Browse files

xen/events: Support event channel rebind on ARM 



Currently, the event channel rebind code is gated with the presence of
the vector callback.

The virtual interrupt controller on ARM has the concept of per-CPU
interrupt (PPI) which allow us to support per-VCPU event channel.
Therefore there is no need of vector callback for ARM.

Xen is already using a free PPI to notify the guest VCPU of an event.
Furthermore, the xen code initialization in Linux (see
arch/arm/xen/enlighten.c) is requesting correctly a per-CPU IRQ.

Introduce new helper xen_support_evtchn_rebind to allow architecture
decide whether rebind an event is support or not. It will always return
true on ARM and keep the same behavior on x86.

This is also allow us to drop the usage of xen_have_vector_callback
entirely in the ARM code.

Signed-off-by: default avatarJulien Grall <julien.grall@citrix.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 907c3eb1

arch/arm/include/asm/xen/events.h

+6 −0
Original line number Diff line number Diff line
@@ -20,4 +20,10 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) 
							    atomic64_t,	\

							    counter), (val))



/* Rebind event channel is supported by default */

static inline bool xen_support_evtchn_rebind(void)

{

	return true;

}



#endif /* _ASM_ARM_XEN_EVENTS_H */

arch/arm/xen/enlighten.c

+0 −4
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ static struct vcpu_info __percpu *xen_vcpu_info; 
unsigned long xen_released_pages;

struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS] __initdata;



/* TODO: to be removed */

__read_mostly int xen_have_vector_callback;

EXPORT_SYMBOL_GPL(xen_have_vector_callback);



int xen_platform_pci_unplug = XEN_UNPLUG_ALL;

EXPORT_SYMBOL_GPL(xen_platform_pci_unplug);

arch/arm64/include/asm/xen/events.h

+6 −0
Original line number Diff line number Diff line
@@ -18,4 +18,10 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) 


#define xchg_xen_ulong(ptr, val) xchg((ptr), (val))



/* Rebind event channel is supported by default */

static inline bool xen_support_evtchn_rebind(void)

{

	return true;

}



#endif /* _ASM_ARM64_XEN_EVENTS_H */

arch/x86/include/asm/xen/events.h

+11 −0
Original line number Diff line number Diff line
@@ -20,4 +20,15 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) 
/* No need for a barrier -- XCHG is a barrier on x86. */

#define xchg_xen_ulong(ptr, val) xchg((ptr), (val))



extern int xen_have_vector_callback;



/*

 * Events delivered via platform PCI interrupts are always

 * routed to vcpu 0 and hence cannot be rebound.

 */

static inline bool xen_support_evtchn_rebind(void)

{

	return (!xen_hvm_domain() || xen_have_vector_callback);

}



#endif /* _ASM_X86_XEN_EVENTS_H */

drivers/xen/events/events_base.c

+1 −5
Original line number Diff line number Diff line
@@ -1301,11 +1301,7 @@ static int rebind_irq_to_cpu(unsigned irq, unsigned tcpu) 
	if (!VALID_EVTCHN(evtchn))

		return -1;



	/*

	 * Events delivered via platform PCI interrupts are always

	 * routed to vcpu 0 and hence cannot be rebound.

	 */

	if (xen_hvm_domain() && !xen_have_vector_callback)

	if (!xen_support_evtchn_rebind())

		return -1;



	/* Send future instances of this interrupt to other vcpu. */