Skip to contentSkip to conversation

enable interrupts in do_page_fault for users.

PATCH New Steven Rostedt 1 participant 2 messages Jun 1, 2007 – Jun 7, 2007

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 enable interrupts in do_page_fault for users.

Ingo,

To prevent scheduling while irqs disabled, I added a force to the do_page_fault to enable interrupts.

The thing is, if the user faults at an address above PAGE_OFFSET. My stupid program that I attached to my last email did just that:

  unsigned long *p = (void*)-1;

  *p = 0xbed;

where (void*)-1 is an address greater than PAGE_OFFSET. If I changed that address to (void*)1, the program still segfaulted, but I didn't get the warning about scheduling while interrupts disabled. I even put in a print to show if interrupts are disabled in do_page_fault before calling force_sig_info, and with (void*)-1 they were, and with (void*)1 they were not disabled.

This patch forces interrupts to always be enabled when entering the user fault code. Maybe this should also be applied to mainline?

This solves the one issue with scheduling while irqs disabled.

-- Steve

arch/x86_64/mm/fault.c +4 -0
Index: linux-2.6.21-rt9/arch/x86_64/mm/fault.c
===================================================================
@@ -476,6 +476,10 @@ bad_area:
 bad_area_nosemaphore:
 	/* User mode accesses just cause a SIGSEGV */
 	if (error_code & PF_USER) {
+
+		/* it's possible to have interrupts off here */
+		local_irq_enable();
+
 		if (is_prefetch(regs, address, error_code))
 			return;
 
#1 lore raw

PATCH 1/1 enable interrupts in do_page_fault for users (take 2 - add i386 fix too)

Thomas,

Can you replace my previous patch with this one. This one includes the fix for i386.

-- Steve

arch/x86_64/mm/fault.c +4 -0
Index: linux-2.6.21-rt9/arch/x86_64/mm/fault.c
===================================================================
@@ -476,6 +476,10 @@ bad_area:
 bad_area_nosemaphore:
 	/* User mode accesses just cause a SIGSEGV */
 	if (error_code & PF_USER) {
+
+		/* it's possible to have interrupts off here */
+		local_irq_enable();
+
 		if (is_prefetch(regs, address, error_code))
 			return;
 
arch/i386/mm/fault.c +4 -0
Index: linux-2.6.21-rt9/arch/i386/mm/fault.c
===================================================================
@@ -459,6 +459,10 @@ bad_area:
 bad_area_nosemaphore:
 	/* User mode accesses just cause a SIGSEGV */
 	if (error_code & 4) {
+
+		/* it's possible to have interrupts off here */
+		local_irq_enable();
+
 		/* 
 		 * Valid to do another page fault here because this one came 
 		 * from user space.