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

Commit 99bbb3a8 authored by Stefano Stabellini's avatar Stefano Stabellini
Browse files

xen: PV on HVM: support PV spinlocks and IPIs 



Initialize PV spinlocks on boot CPU right after native_smp_prepare_cpus
(that switch to APIC mode and initialize APIC routing); on secondary
CPUs on CPU_UP_PREPARE.

Enable the usage of event channels to send and receive IPIs when
running as a PV on HVM guest.

Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
parent 53d5522c

arch/x86/xen/enlighten.c

+3 −0
Original line number Diff line number Diff line
@@ -1330,6 +1330,8 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self, 
	switch (action) {

	case CPU_UP_PREPARE:

		per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu];

		if (xen_have_vector_callback)

			xen_init_lock_cpu(cpu);

		break;

	default:

		break;
@@ -1354,6 +1356,7 @@ static void __init xen_hvm_guest_init(void) 


	if (xen_feature(XENFEAT_hvm_callback_vector))

		xen_have_vector_callback = 1;

	xen_hvm_smp_init();

	register_cpu_notifier(&xen_hvm_cpu_notifier);

	xen_unplug_emulated_devices();

	have_vcpu_info_placement = 0;

arch/x86/xen/smp.c

+38 −0
Original line number Diff line number Diff line
@@ -509,3 +509,41 @@ void __init xen_smp_init(void) 
	xen_fill_possible_map();

	xen_init_spinlocks();

}



static void __init xen_hvm_smp_prepare_cpus(unsigned int max_cpus)

{

	native_smp_prepare_cpus(max_cpus);

	WARN_ON(xen_smp_intr_init(0));



	if (!xen_have_vector_callback)

		return;

	xen_init_lock_cpu(0);

	xen_init_spinlocks();

}



static int __cpuinit xen_hvm_cpu_up(unsigned int cpu)

{

	int rc;

	rc = native_cpu_up(cpu);

	WARN_ON (xen_smp_intr_init(cpu));

	return rc;

}



static void xen_hvm_cpu_die(unsigned int cpu)

{

	unbind_from_irqhandler(per_cpu(xen_resched_irq, cpu), NULL);

	unbind_from_irqhandler(per_cpu(xen_callfunc_irq, cpu), NULL);

	unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu), NULL);

	unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu), NULL);

	native_cpu_die(cpu);

}



void __init xen_hvm_smp_init(void)

{

	smp_ops.smp_prepare_cpus = xen_hvm_smp_prepare_cpus;

	smp_ops.smp_send_reschedule = xen_smp_send_reschedule;

	smp_ops.cpu_up = xen_hvm_cpu_up;

	smp_ops.cpu_die = xen_hvm_cpu_die;

	smp_ops.send_call_func_ipi = xen_smp_send_call_function_ipi;

	smp_ops.send_call_func_single_ipi = xen_smp_send_call_function_single_ipi;

}

arch/x86/xen/xen-ops.h

+2 −0
Original line number Diff line number Diff line
@@ -64,10 +64,12 @@ void xen_setup_vcpu_info_placement(void); 


#ifdef CONFIG_SMP

void xen_smp_init(void);

void __init xen_hvm_smp_init(void);



extern cpumask_var_t xen_cpu_initialized_map;

#else

static inline void xen_smp_init(void) {}

static inline void xen_hvm_smp_init(void) {}

#endif



#ifdef CONFIG_PARAVIRT_SPINLOCKS