Skip to contentSkip to conversation

xen/events: remove event handling recursion detection

PATCH Superseded Juergen Gross 2 participants 3 messages Nov 28, 2019 – Nov 29, 2019 Xen hypervisor interface

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Juergen Gross

author maintainer
#0 lore raw

PATCH v2 1/1 xen/events: remove event handling recursion detection

__xen_evtchn_do_upcall() contains guards against being called recursively. This mechanism was introduced in the early pvops times (kernel 2.6.26) when there were all the Xen backend drivers missing from the upstream kernel, and some of those out-of-tree drivers were enabling interrupts in their event handlers (which was explicitly allowed in the initial XenoLinux).

Nowadays we don't need to support those old drivers any more and the capability to allow recursive calls of __xen_evtchn_do_upcall() can be removed.

---
V2: adapt commit message (Jan Beulich)

---
 drivers/xen/events/events_base.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)
drivers/xen/events/events_base.c +3 -13
index 6c8843968a52..33212c494afd 100644
@@ -1213,31 +1213,21 @@ void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector)
 	notify_remote_via_irq(irq);
 }
 
-static DEFINE_PER_CPU(unsigned, xed_nesting_count);
-
 static void __xen_evtchn_do_upcall(void)
 {
 	struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
-	int cpu = get_cpu();
-	unsigned count;
+	int cpu = smp_processor_id();
 
 	do {
 		vcpu_info->evtchn_upcall_pending = 0;
 
-		if (__this_cpu_inc_return(xed_nesting_count) - 1)
-			goto out;
-
 		xen_evtchn_handle_events(cpu);
 
 		BUG_ON(!irqs_disabled());
 
-		count = __this_cpu_read(xed_nesting_count);
-		__this_cpu_write(xed_nesting_count, 0);
-	} while (count != 1 || vcpu_info->evtchn_upcall_pending);
-
-out:
+		rmb(); /* Hypervisor can set upcall pending. */
 
-	put_cpu();
+	} while (vcpu_info->evtchn_upcall_pending);
 }
 
 void xen_evtchn_do_upcall(struct pt_regs *regs)
Signature · 1 line
2.16.4
#1 lore raw
Quoted 14 lines · Juergen Gross
drivers/xen/events/events_base.c +1 -6
-
 static void __xen_evtchn_do_upcall(void)
 {
 	struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
-	int cpu = get_cpu();
-	unsigned count;
+	int cpu = smp_processor_id();
 
 	do {
 		vcpu_info->evtchn_upcall_pending = 0;
 
-		if (__this_cpu_inc_return(xed_nesting_count) - 1)
-			goto out;
-

drivers/xen/events/events_base.c void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector) · line 1228

Quoted 10 lines
drivers/xen/events/events_base.c +1 -5
 		xen_evtchn_handle_events(cpu);
 
 		BUG_ON(!irqs_disabled());
 
-		count = __this_cpu_read(xed_nesting_count);
-		__this_cpu_write(xed_nesting_count, 0);
-	} while (count != 1 || vcpu_info->evtchn_upcall_pending);
-
-out:
+		rmb(); /* Hypervisor can set upcall pending. */

virt_rmb() perhaps then?

-boris

drivers/xen/events/events_base.c void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector) · line 1233

Quoted 6 lines
drivers/xen/events/events_base.c +1 -1
-	put_cpu();
+	} while (vcpu_info->evtchn_upcall_pending);
 }
 
 void xen_evtchn_do_upcall(struct pt_regs *regs)

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author maintainer
#2 lore raw
Quoted 19 lines · Boris Ostrovsky
Quoted 18 lines · Juergen Gross
drivers/xen/events/events_base.c +1 -6
-
  static void __xen_evtchn_do_upcall(void)
  {
  	struct vcpu_info *vcpu_info = __this_cpu_read(xen_vcpu);
-	int cpu = get_cpu();
-	unsigned count;
+	int cpu = smp_processor_id();
 
  	do {
  		vcpu_info->evtchn_upcall_pending = 0;
 
-		if (__this_cpu_inc_return(xed_nesting_count) - 1)
-			goto out;
-
  		xen_evtchn_handle_events(cpu);
 
  		BUG_ON(!irqs_disabled());
Quoted 8 lines

drivers/xen/events/events_base.c void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector) · line 1228

Quoted 6 lines
drivers/xen/events/events_base.c +1 -5
-		count = __this_cpu_read(xed_nesting_count);
-		__this_cpu_write(xed_nesting_count, 0);
-	} while (count != 1 || vcpu_info->evtchn_upcall_pending);
-
-out:
+		rmb(); /* Hypervisor can set upcall pending. */

virt_rmb() perhaps then?

Yes, that's better.

Juergen