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

Commit 84d582d2 authored by Boris Ostrovsky's avatar Boris Ostrovsky Committed by Juergen Gross
Browse files

xen: Revert commits da72ff5b and 72a9b186 

Recent discussion (http://marc.info/?l=xen-devel&m=149192184523741

)
established that commit 72a9b186 ("xen: Remove event channel
notification through Xen PCI platform device") (and thus commit
da72ff5b ("partially revert "xen: Remove event channel
notification through Xen PCI platform device"")) are unnecessary and,
in fact, prevent HVM guests from booting on Xen releases prior to 4.0

Therefore we revert both of those commits.

The summary of that discussion is below:

  Here is the brief summary of the current situation:

  Before the offending commit (72a9b186):

  1) INTx does not work because of the reset_watches path.
  2) The reset_watches path is only taken if you have Xen > 4.0
  3) The Linux Kernel by default will use vector inject if the hypervisor
     support. So even INTx does not work no body running the kernel with
     Xen > 4.0 would notice. Unless he explicitly disabled this feature
     either in the kernel or in Xen (and this can only be disabled by
     modifying the code, not user-supported way to do it).

  After the offending commit (+ partial revert):

  1) INTx is no longer support for HVM (only for PV guests).
  2) Any HVM guest The kernel will not boot on Xen < 4.0 which does
     not have vector injection support. Since the only other mode
     supported is INTx which.

  So based on this summary, I think before commit (72a9b186) we were
  in much better position from a user point of view.

Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 5f6a1614

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 */

arch/x86/pci/xen.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ void __init xen_msi_init(void) 


int __init pci_xen_hvm_init(void)

{

	if (!xen_feature(XENFEAT_hvm_pirqs))

	if (!xen_have_vector_callback || !xen_feature(XENFEAT_hvm_pirqs))

		return 0;



#ifdef CONFIG_ACPI

arch/x86/xen/enlighten_hvm.c

+8 −4
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#include "mmu.h"

#include "smp.h"



__read_mostly int xen_have_vector_callback;

EXPORT_SYMBOL_GPL(xen_have_vector_callback);



void __ref xen_hvm_init_shared_info(void)

{

	int cpu;
@@ -123,7 +126,7 @@ static int xen_cpu_up_prepare_hvm(unsigned int cpu) 
		per_cpu(xen_vcpu_id, cpu) = cpu;

	xen_vcpu_setup(cpu);



	if (xen_feature(XENFEAT_hvm_safe_pvclock))

	if (xen_have_vector_callback && xen_feature(XENFEAT_hvm_safe_pvclock))

		xen_setup_timer(cpu);



	rc = xen_smp_intr_init(cpu);
@@ -139,7 +142,7 @@ static int xen_cpu_dead_hvm(unsigned int cpu) 
{

	xen_smp_intr_free(cpu);



	if (xen_feature(XENFEAT_hvm_safe_pvclock))

	if (xen_have_vector_callback && xen_feature(XENFEAT_hvm_safe_pvclock))

		xen_teardown_timer(cpu);



       return 0;
@@ -156,7 +159,8 @@ static void __init xen_hvm_guest_init(void) 


	xen_panic_handler_init();



	BUG_ON(!xen_feature(XENFEAT_hvm_callback_vector));

	if (xen_feature(XENFEAT_hvm_callback_vector))

		xen_have_vector_callback = 1;



	xen_hvm_smp_init();

	WARN_ON(xen_cpuhp_setup(xen_cpu_up_prepare_hvm, xen_cpu_dead_hvm));
@@ -189,7 +193,7 @@ bool xen_hvm_need_lapic(void) 
		return false;

	if (!xen_hvm_domain())

		return false;

	if (xen_feature(XENFEAT_hvm_pirqs))

	if (xen_feature(XENFEAT_hvm_pirqs) && xen_have_vector_callback)

		return false;

	return true;

}

arch/x86/xen/smp_hvm.c

+5 −0
Original line number Diff line number Diff line 
#include <asm/smp.h>



#include <xen/events.h>



#include "xen-ops.h"

#include "smp.h"
@@ -49,6 +51,9 @@ static void xen_hvm_cpu_die(unsigned int cpu) 


void __init xen_hvm_smp_init(void)

{

	if (!xen_have_vector_callback)

		return;



	smp_ops.smp_prepare_cpus = xen_hvm_smp_prepare_cpus;

	smp_ops.smp_send_reschedule = xen_smp_send_reschedule;

	smp_ops.cpu_die = xen_hvm_cpu_die;

arch/x86/xen/time.c

+8 −0
Original line number Diff line number Diff line
@@ -436,6 +436,14 @@ static void xen_hvm_setup_cpu_clockevents(void) 


void __init xen_hvm_init_time_ops(void)

{

	/*

	 * vector callback is needed otherwise we cannot receive interrupts

	 * on cpu > 0 and at this point we don't know how many cpus are

	 * available.

	 */

	if (!xen_have_vector_callback)

		return;



	if (!xen_feature(XENFEAT_hvm_safe_pvclock)) {

		printk(KERN_INFO "Xen doesn't support pvclock on HVM,"

				"disable pv timer\n");