Skip to contentSkip to conversation

xen/events: remove event handling recursion detection

PATCH Superseded Juergen Gross 2 participants 5 messages Nov 4, 2019 Xen hypervisor interface

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Juergen Gross

author maintainer
#0 lore raw

PATCH 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 still Xen versions around not honoring disabled interrupts for sending events to pv guests.

This was changed in Xen 3.0, which is much older than any Xen version supported by the kernel, so the recursion detection can be removed.

---
 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 7 lines · Juergen Gross

__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 still Xen versions around not honoring disabled interrupts for sending events to pv guests.

This was changed in Xen 3.0, which is much older than any Xen version supported by the kernel, so the recursion detection can be removed.

Would you mind pointing out which exact change(s) this was(were)? It had always been my understanding that the recursion detection was mainly to guard against drivers re-enabling interrupts transiently in their handlers (which in turn may no longer be an issue in modern Linux kernels).

Jan

author maintainer
#2 lore raw
Quoted 10 lines · Jan Beulich
Quoted 7 lines · Juergen Gross

__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 still Xen versions around not honoring disabled interrupts for sending events to pv guests.

This was changed in Xen 3.0, which is much older than any Xen version supported by the kernel, so the recursion detection can be removed.

Would you mind pointing out which exact change(s) this was(were)?

Linux kernel: 229664bee6126e01f8662976a5fe2e79813b77c8
Xen: d8263e8dbaf5ef1445bee0662143a0fcb6d43466

Quoted 4 lines

It had always been my understanding that the recursion detection was mainly to guard against drivers re-enabling interrupts transiently in their handlers (which in turn may no longer be an issue in modern Linux kernels).

This would have been doable with a simple bool. The more complex xchg based logic was IMO for recursion detection at any point.

Juergen

#3 lore raw
Quoted 7 lines · Jürgen Groß
Quoted 6 lines · Jan Beulich
Quoted 5 lines · Juergen Gross

__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 still Xen versions around not honoring disabled interrupts for sending events to pv guests.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

This was changed in Xen 3.0, which is much older than any Xen version supported by the kernel, so the recursion detection can be removed.

Would you mind pointing out which exact change(s) this was(were)?

Linux kernel: 229664bee6126e01f8662976a5fe2e79813b77c8
Xen: d8263e8dbaf5ef1445bee0662143a0fcb6d43466

Are you sure about the latter, touching only header files underneath xen/, and there mostly public interface ones?

Quoted 7 lines
Quoted 4 lines

It had always been my understanding that the recursion detection was mainly to guard against drivers re-enabling interrupts transiently in their handlers (which in turn may no longer be an issue in modern Linux kernels).

This would have been doable with a simple bool. The more complex xchg based logic was IMO for recursion detection at any point.

Well, the respective XenoLinux c/s 13098 has no mention of this, i.e. it simply leaves open what the actual reason was:

"[LINUX] Disallow nested event delivery.

This eliminates the risk of overflowing the kernel stack and is a reasonable policy given that we have no concept of priorities among event sources."

Jan

author maintainer
#4 lore raw
Quoted 11 lines · Jan Beulich
Quoted 10 lines · Jürgen Groß
Quoted 9 lines · Jan Beulich
Quoted 7 lines · Juergen Gross

__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 still Xen versions around not honoring disabled interrupts for sending events to pv guests.

This was changed in Xen 3.0, which is much older than any Xen version supported by the kernel, so the recursion detection can be removed.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Would you mind pointing out which exact change(s) this was(were)?

Linux kernel: 229664bee6126e01f8662976a5fe2e79813b77c8
Xen: d8263e8dbaf5ef1445bee0662143a0fcb6d43466

Are you sure about the latter, touching only header files underneath xen/, and there mostly public interface ones?

No, you are right, this was a false interpretation of mine.

Quoted 9 lines
Quoted 8 lines
Quoted 5 lines

It had always been my understanding that the recursion detection was mainly to guard against drivers re-enabling interrupts transiently in their handlers (which in turn may no longer be an issue in modern Linux kernels).

This would have been doable with a simple bool. The more complex xchg based logic was IMO for recursion detection at any point.

Quoted 8 lines

Well, the respective XenoLinux c/s 13098 has no mention of this, i.e. it simply leaves open what the actual reason was:

"[LINUX] Disallow nested event delivery.

This eliminates the risk of overflowing the kernel stack and is a reasonable policy given that we have no concept of priorities among event sources."

For XenoLinux it makes at least a little bit sense, as interrupts were enabled during calls of some handlers AFAIK. The complexity is rather strange, though, as the bool would have been much easier to understand.

I'll adapt the commit message.

Juergen