Skip to contentSkip to conversation

x86/xen: allow privcmd hypercalls to be preempted

PATCH Superseded David Vrabel 5 participants 11 messages Feb 5, 2015 – Feb 6, 2015

Subsystems (2)

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 x86/xen: allow privcmd hypercalls to be preempted

Hypercalls submitted by user space tools via the privcmd driver can take a long time (potentially many 10s of seconds) if the hypercall has many sub-operations.

A fully preemptible kernel may deschedule such as task in any upcall called from a hypercall continuation.

However, in a kernel with voluntary or no preemption, hypercall continuations in Xen allow event handlers to be run but the task issuing the hypercall will not be descheduled until the hypercall is complete and the ioctl returns to user space. These long running tasks may also trigger the kernel's soft lockup detection.

Add xen_preemptible_hcall_begin() and xen_preemptible_hcall_end() to bracket hypercalls that may be preempted. Use these in the privcmd driver.

When returning from an upcall, call xen_maybe_preempt_hcall() which adds a schedule point if if the current task was within a preemptible hypercall.

Since preempt_schedule_irq() can move the task to a different CPU, clear and set xen_in_preemptible_hcall around the call.

---
Changes in v5:
- Add xen_maybe_preempt_hcall() instead of copy-and-paste of assembly.

Changes in v4:
- Fix 32-bit build.

Changes in v3:
- Export xen_in_preemptible_hcall (to fix modular privcmd driver).

Changes in v2:
- Use per-cpu variable to mark preemptible regions
- Call preempt_schedule_irq() from the correct place in xen_hypervisor_callback

---
 arch/x86/kernel/entry_32.S |    3 +++
 arch/x86/kernel/entry_64.S |    3 +++
 drivers/xen/Makefile       |    2 +-
 drivers/xen/preempt.c      |   42 ++++++++++++++++++++++++++++++++++++++++++
 drivers/xen/privcmd.c      |    2 ++
 include/xen/xen-ops.h      |   26 ++++++++++++++++++++++++++
 6 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 drivers/xen/preempt.c
arch/x86/kernel/entry_32.S +3 -0
index 000d419..31e2d5b 100644
@@ -982,6 +982,9 @@ ENTRY(xen_hypervisor_callback)
 ENTRY(xen_do_upcall)
 1:	mov %esp, %eax
 	call xen_evtchn_do_upcall
+#ifndef CONFIG_PREEMPT
+	call xen_maybe_preempt_hcall
+#endif
 	jmp  ret_from_intr
 	CFI_ENDPROC
 ENDPROC(xen_hypervisor_callback)
arch/x86/kernel/entry_64.S +3 -0
index 9ebaf63..9069401 100644
@@ -1198,6 +1198,9 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
 	popq %rsp
 	CFI_DEF_CFA_REGISTER rsp
 	decl PER_CPU_VAR(irq_count)
+#ifndef CONFIG_PREEMPT
+	call xen_maybe_preempt_hcall
+#endif
 	jmp  error_exit
 	CFI_ENDPROC
 END(xen_do_hypervisor_callback)
drivers/xen/Makefile +1 -1
index 2140398..2ccd359 100644
@@ -2,7 +2,7 @@ ifeq ($(filter y, $(CONFIG_ARM) $(CONFIG_ARM64)),)
 obj-$(CONFIG_HOTPLUG_CPU)		+= cpu_hotplug.o
 endif
 obj-$(CONFIG_X86)			+= fallback.o
-obj-y	+= grant-table.o features.o balloon.o manage.o
+obj-y	+= grant-table.o features.o balloon.o manage.o preempt.o
 obj-y	+= events/
 obj-y	+= xenbus/
 
drivers/xen/preempt.c new file +42 -0

42 lines not on this page · raw message

drivers/xen/privcmd.c +2 -0
index 569a13b..59ac71c 100644
@@ -56,10 +56,12 @@ static long privcmd_ioctl_hypercall(void __user *udata)
 	if (copy_from_user(&hypercall, udata, sizeof(hypercall)))
 		return -EFAULT;
 
+	xen_preemptible_hcall_begin();
 	ret = privcmd_call(hypercall.op,
 			   hypercall.arg[0], hypercall.arg[1],
 			   hypercall.arg[2], hypercall.arg[3],
 			   hypercall.arg[4]);
+	xen_preemptible_hcall_end();
 
 	return ret;
 }
include/xen/xen-ops.h +26 -0
index 7491ee5..8333821 100644
@@ -46,4 +46,30 @@ static inline efi_system_table_t __init *xen_efi_probe(void)
 }
 #endif
 
+#ifdef CONFIG_PREEMPT
+
+static inline void xen_preemptible_hcall_begin(void)
+{
+}
+
+static inline void xen_preemptible_hcall_end(void)
+{
+}
+
+#else
+
+DECLARE_PER_CPU(bool, xen_in_preemptible_hcall);
+
+static inline void xen_preemptible_hcall_begin(void)
+{
+	__this_cpu_write(xen_in_preemptible_hcall, true);
+}
+
+static inline void xen_preemptible_hcall_end(void)
+{
+	__this_cpu_write(xen_in_preemptible_hcall, false);
+}
+
+#endif /* CONFIG_PREEMPT */
+
 #endif /* INCLUDE_XEN_OPS_H */
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 17 lines · David Vrabel

Hypercalls submitted by user space tools via the privcmd driver can take a long time (potentially many 10s of seconds) if the hypercall has many sub-operations.

A fully preemptible kernel may deschedule such as task in any upcall called from a hypercall continuation.

However, in a kernel with voluntary or no preemption, hypercall continuations in Xen allow event handlers to be run but the task issuing the hypercall will not be descheduled until the hypercall is complete and the ioctl returns to user space. These long running tasks may also trigger the kernel's soft lockup detection.

Add xen_preemptible_hcall_begin() and xen_preemptible_hcall_end() to bracket hypercalls that may be preempted. Use these in the privcmd driver.

Quoted 8 lines

When returning from an upcall, call xen_maybe_preempt_hcall() which adds a schedule point if if the current task was within a preemptible hypercall.

Since preempt_schedule_irq() can move the task to a different CPU, clear and set xen_in_preemptible_hcall around the call.

Is this in place of Luis' earlier patches?

-boris

#2 lore raw
Quoted 22 lines · Boris Ostrovsky
Quoted 21 lines · David Vrabel

Hypercalls submitted by user space tools via the privcmd driver can take a long time (potentially many 10s of seconds) if the hypercall has many sub-operations.

A fully preemptible kernel may deschedule such as task in any upcall called from a hypercall continuation.

However, in a kernel with voluntary or no preemption, hypercall continuations in Xen allow event handlers to be run but the task issuing the hypercall will not be descheduled until the hypercall is complete and the ioctl returns to user space. These long running tasks may also trigger the kernel's soft lockup detection.

Add xen_preemptible_hcall_begin() and xen_preemptible_hcall_end() to bracket hypercalls that may be preempted. Use these in the privcmd driver.

When returning from an upcall, call xen_maybe_preempt_hcall() which adds a schedule point if if the current task was within a preemptible hypercall.

Quoted 6 lines
Quoted 4 lines

Since preempt_schedule_irq() can move the task to a different CPU, clear and set xen_in_preemptible_hcall around the call.

Is this in place of Luis' earlier patches?

Yes.

David

#3 lore raw
In reply to David Vrabel

drivers/xen/preempt.c line 32

Quoted 4 lines · David Vrabel
drivers/xen/preempt.c new file +4 -0
+
+void xen_maybe_preempt_hcall(void)
+{
+	if (__this_cpu_read(xen_in_preemptible_hcall)) {

Can you check should_resched() here?

-boris

Quoted 11 lines
drivers/xen/preempt.c new file +10 -0
+		/*
+		 * Clear flag as we may be rescheduled on a different
+		 * cpu.
+		 */
+		__this_cpu_write(xen_in_preemptible_hcall, false);
+		_cond_resched();
+		__this_cpu_write(xen_in_preemptible_hcall, true);
+	}
+}
+#endif /* CONFIG_PREEMPT */
#4 lore raw
Quoted 7 lines · Boris Ostrovsky

drivers/xen/preempt.c line 32

Quoted 4 lines · David Vrabel
drivers/xen/preempt.c new file +4 -0
+
+void xen_maybe_preempt_hcall(void)
+{
+    if (__this_cpu_read(xen_in_preemptible_hcall)) {

Can you check should_resched() here?

_cond_resched() already does this.

David

#5 lore raw
Quoted 9 lines · David Vrabel
Quoted 6 lines · Boris Ostrovsky

drivers/xen/preempt.c line 32

Quoted 4 lines · David Vrabel
drivers/xen/preempt.c new file +4 -0
+
+void xen_maybe_preempt_hcall(void)
+{
+    if (__this_cpu_read(xen_in_preemptible_hcall)) {

Can you check should_resched() here?

_cond_resched() already does this.

Right, you'd be checking it twice, but since in most cases you won't need to reschedule you will then avoid making unnecessary call (and per-cpu updates).

-boris

#6 lore raw
In reply to David Vrabel

arch/x86/kernel/entry_32.S ENTRY(xen_hypervisor_callback) · line 990

Quoted 12 lines · David Vrabel
arch/x86/kernel/entry_32.S +3 -0
@@ -982,6 +982,9 @@ ENTRY(xen_hypervisor_callback)
 ENTRY(xen_do_upcall)
 1:	mov %esp, %eax
 	call xen_evtchn_do_upcall
+#ifndef CONFIG_PREEMPT
+	call xen_maybe_preempt_hcall
+#endif
 	jmp  ret_from_intr
 	CFI_ENDPROC
 ENDPROC(xen_hypervisor_callback)

Oh good, did you get to test 32-bit? I was still trying to get a good recent Xen build to test the domU suggestion you had.

drivers/xen/preempt.c

Quoted 20 lines
arch/x86/kernel/entry_64.S +3 -0
index 9ebaf63..9069401 100644
@@ -1198,6 +1198,9 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
 	popq %rsp
 	CFI_DEF_CFA_REGISTER rsp
 	decl PER_CPU_VAR(irq_count)
+#ifndef CONFIG_PREEMPT
+	call xen_maybe_preempt_hcall
+#endif
 	jmp  error_exit
 	CFI_ENDPROC
 END(xen_do_hypervisor_callback)
drivers/xen/preempt.c new file +0 -0
new file mode 100644
index 0000000..e2bcc01

<-- ... -->

drivers/xen/preempt.c line 37

Quoted 11 lines
drivers/xen/preempt.c new file +11 -0
+DEFINE_PER_CPU(bool, xen_in_preemptible_hcall);
+EXPORT_SYMBOL_GPL(xen_in_preemptible_hcall);
+
+void xen_maybe_preempt_hcall(void)
+{
+	if (__this_cpu_read(xen_in_preemptible_hcall)) {
+		/*
+		 * Clear flag as we may be rescheduled on a different
+		 * cpu.
+		 */
+		__this_cpu_write(xen_in_preemptible_hcall, false);

This read might be on CPU 3.

drivers/xen/preempt.c line 39

Quoted 2 lines
drivers/xen/preempt.c new file +2 -0
+		_cond_resched();
+		__this_cpu_write(xen_in_preemptible_hcall, true);

This CPU wright might happen on CPU 1 and as such it would write true to another CPU. I had tested this approach and it was my original approach and while it sort of works its obviously broken due to the above. After considering Andy's original request to use pt_regs instead it seemed a lot safer than trying to fix this approach, so that is what I went with.

Luis

#7 lore raw
Quoted 50 lines · Luis R. Rodriguez

arch/x86/kernel/entry_32.S ENTRY(xen_hypervisor_callback) · line 990

Quoted 12 lines · David Vrabel
arch/x86/kernel/entry_32.S +3 -0
@@ -982,6 +982,9 @@ ENTRY(xen_hypervisor_callback)
 ENTRY(xen_do_upcall)
 1:	mov %esp, %eax
 	call xen_evtchn_do_upcall
+#ifndef CONFIG_PREEMPT
+	call xen_maybe_preempt_hcall
+#endif
 	jmp  ret_from_intr
 	CFI_ENDPROC
 ENDPROC(xen_hypervisor_callback)

Oh good, did you get to test 32-bit? I was still trying to get a good recent Xen build to test the domU suggestion you had.

drivers/xen/preempt.c

Quoted 19 lines
arch/x86/kernel/entry_64.S +3 -0
index 9ebaf63..9069401 100644
@@ -1198,6 +1198,9 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
 	popq %rsp
 	CFI_DEF_CFA_REGISTER rsp
 	decl PER_CPU_VAR(irq_count)
+#ifndef CONFIG_PREEMPT
+	call xen_maybe_preempt_hcall
+#endif
 	jmp  error_exit
 	CFI_ENDPROC
 END(xen_do_hypervisor_callback)
drivers/xen/preempt.c new file +0 -0
new file mode 100644
index 0000000..e2bcc01

<-- ... -->

drivers/xen/preempt.c line 37

Quoted 11 lines
drivers/xen/preempt.c new file +11 -0
+DEFINE_PER_CPU(bool, xen_in_preemptible_hcall);
+EXPORT_SYMBOL_GPL(xen_in_preemptible_hcall);
+
+void xen_maybe_preempt_hcall(void)
+{
+	if (__this_cpu_read(xen_in_preemptible_hcall)) {
+		/*
+		 * Clear flag as we may be rescheduled on a different
+		 * cpu.
+		 */
+		__this_cpu_write(xen_in_preemptible_hcall, false);

This read might be on CPU 3.

Quoted 4 lines

drivers/xen/preempt.c line 39

Quoted 2 lines
drivers/xen/preempt.c new file +2 -0
+		_cond_resched();
+		__this_cpu_write(xen_in_preemptible_hcall, true);

This CPU wright might happen on CPU 1 and as such it would write true to another CPU.

That is the entire point, because the hypercall is now being continued on CPU1 rather than CPU3. The "preemptibleness" follows the task which initiated the hypercall, not the cpu which it happened to start executing on.

~Andrew

Quoted 13 lines

I had tested this approach and
it was my original approach and while it sort of works its obviously broken due to the above. After considering Andy's original request to use pt_regs instead it seemed a lot safer than trying to fix this approach, so that is what I went with.

Luis

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

#8 lore raw
Quoted 24 lines · Andrew Cooper
Quoted 23 lines · Luis R. Rodriguez

drivers/xen/preempt.c

Quoted 5 lines · David Vrabel
drivers/xen/preempt.c new file +0 -0
new file mode 100644
index 0000000..e2bcc01

<-- ... -->

drivers/xen/preempt.c line 37

Quoted 11 lines
drivers/xen/preempt.c new file +11 -0
+DEFINE_PER_CPU(bool, xen_in_preemptible_hcall);
+EXPORT_SYMBOL_GPL(xen_in_preemptible_hcall);
+
+void xen_maybe_preempt_hcall(void)
+{
+    if (__this_cpu_read(xen_in_preemptible_hcall)) {
+            /*
+             * Clear flag as we may be rescheduled on a different
+             * cpu.
+             */
+            __this_cpu_write(xen_in_preemptible_hcall, false);

This read might be on CPU 3.

Quoted 2 lines
drivers/xen/preempt.c new file +2 -0
+            _cond_resched();
+            __this_cpu_write(xen_in_preemptible_hcall, true);
Quoted 7 lines
Quoted 2 lines

This CPU wright might happen on CPU 1 and as such it would write true to another CPU.

That is the entire point, because the hypercall is now being continued on CPU1 rather than CPU3. The "preemptibleness" follows the task which initiated the hypercall, not the cpu which it happened to start executing on.

Ah yes, indeed. Glad we could ditch pt_regs!

Luis

#9 lore raw
In reply to David Vrabel

Review

Quoted 7 lines · David Vrabel

Hypercalls submitted by user space tools via the privcmd driver can take a long time (potentially many 10s of seconds) if the hypercall has many sub-operations.

(quoted diff) +2 -0
+
+void xen_maybe_preempt_hcall(void)

I think this should be asmlinkage __visible. Other than that, this looks good to me. I like your solution to the tracking problem.

drivers/xen/preempt.c line 32

Quoted 2 lines
drivers/xen/preempt.c new file +2 -0
+{
+       if (__this_cpu_read(xen_in_preemptible_hcall)) {

Hmm. That being said, is there any issue with nested interrupts? Suppose you get an interrupt that re-enables IRQs in the middle (I think we do this on occasion). Then you get another interrupt that reschedules illegally in the middle of the first one.

Something like if (__this_cpu_read(xen_in_preemptible_hcall) && !in_interrupt()) { along with a comment might do the trick.

--Andy

#10 lore raw
Quoted 12 lines · Andy Lutomirski

Review

Quoted 7 lines · David Vrabel

Hypercalls submitted by user space tools via the privcmd driver can take a long time (potentially many 10s of seconds) if the hypercall has many sub-operations.

(quoted diff) +2 -0
+
+void xen_maybe_preempt_hcall(void)

I think this should be asmlinkage __visible. Other than that, this looks good to me. I like your solution to the tracking problem.

Quoted 4 lines

drivers/xen/preempt.c line 32

Quoted 2 lines
drivers/xen/preempt.c new file +2 -0
+{
+       if (__this_cpu_read(xen_in_preemptible_hcall)) {

Hmm. That being said, is there any issue with nested interrupts?

The should_resched() check in _cond_resched() already handles this because irq_enter() sets the preempt count as non-zero.

FWIW, XenServer has been using something like this in production for about a year without any problems.

David