Skip to contentSkip to conversation

strange work_notifysig code since 2.6.16

PATCH In review Joe Korty 3 participants 4 messages Oct 24, 2006 – Oct 25, 2006

lore
Share & tools
lore

Joe Korty

author
#0 lore raw

PATCH 1/1 strange work_notifysig code since 2.6.16

tree 9b5daef5280800a0006343a17f63072658d91a1d is surely wrong.

	[PATCH] Make vm86 support optional
	Jan 8, 2006, tree first appears in 2.6.16

If the branch to work_notifysig_86 is taken and CONFIG_VM86=n, then entry.S drops into unrelated assembly code.

The branch to work_notifysig_v86, a few lines above the patch, says:
"returning to kernel-space or vm86-space"
which implies if vm86-space isn't being supported we still need the branch & jumped-to code in order to handle the kernel case.

However, I don't understand this area all that well, so take this patch as more of an indication of a possible problem area than as a true fix.

arch/i386/kernel/entry.S +0 -2
Index: 2.6.18.1/arch/i386/kernel/entry.S
===================================================================
@@ -457,7 +457,6 @@
 
 	ALIGN
 work_notifysig_v86:
-#ifdef CONFIG_VM86
 	pushl %ecx			# save ti_flags for do_notify_resume
 	CFI_ADJUST_CFA_OFFSET 4
 	call save_v86_state		# %eax contains pt_regs pointer
@@ -467,7 +466,6 @@
 	xorl %edx, %edx
 	call do_notify_resume
 	jmp resume_userspace_sig
-#endif
 
 	# perform syscall exit tracing
 	ALIGN
#1 lore raw
Quoted 23 lines · Joe Korty

tree 9b5daef5280800a0006343a17f63072658d91a1d is surely wrong.

	[PATCH] Make vm86 support optional
	Jan 8, 2006, tree first appears in 2.6.16

If the branch to work_notifysig_86 is taken and CONFIG_VM86=n, then entry.S drops into unrelated assembly code.

The branch to work_notifysig_v86, a few lines above the patch, says:
"returning to kernel-space or vm86-space"
which implies if vm86-space isn't being supported we still need the branch & jumped-to code in order to handle the kernel case.

However, I don't understand this area all that well, so take this patch as more of an indication of a possible problem area than as a true fix.

Index: 2.6.18.1/arch/i386/kernel/entry.S
===================================================================

arch/i386/kernel/entry.S line 462

Quoted 7 lines
arch/i386/kernel/entry.S +0 -1
@@ -457,7 +457,6 @@
 
 	ALIGN
 work_notifysig_v86:
-#ifdef CONFIG_VM86
 	pushl %ecx			# save ti_flags for do_notify_resume
 	CFI_ADJUST_CFA_OFFSET 4
 	call save_v86_state		# %eax contains pt_regs pointer

I suspect this won't link with CONFIG_VM86 disabled because save_v86_state goes away. I think we just need to move the #endif up a few lines.

Quoted 8 lines
arch/i386/kernel/entry.S +0 -1
@@ -467,7 +466,6 @@
 	xorl %edx, %edx
 	call do_notify_resume
 	jmp resume_userspace_sig
-#endif
 
 	# perform syscall exit tracing
 	ALIGN
Signature · 1 line
Mathematics is the supreme nostalgia of our time.
author
#2 lore raw
Quoted 2 lines

I suspect this won't link with CONFIG_VM86 disabled because save_v86_state goes away. I think we just need to move the #endif up a few lines.

Hi Matt,
Since that also makes the 'then' and 'else' branches identical, perhaps this patch would be better .. it eliminates the VM86 test entirely when CONFIG_VM86=n.

Boot tested with CONFIG_VM86=y.

Regards,
Joe

The entry.S code at work_notifysig is surely wrong. It drops into unrelated code if the branch to work_notifysig_v86 is taken, and CONFIG_VM86=n.

[PATCH] Make vm86 support optional
tree 9b5daef5280800a0006343a17f63072658d91a1d pushed to git Jan 8, 2006, and first appears in 2.6.16

The 'fix' here is to also compile out the vm86 test & branch when CONFIG_VM86=n.

arch/i386/kernel/entry.S +4 -2
Index: 2.6.18.1/arch/i386/kernel/entry.S
===================================================================
@@ -447,6 +447,7 @@
 
 work_notifysig:				# deal with pending signals and
 					# notify-resume requests
+#ifdef CONFIG_VM86
 	testl $VM_MASK, EFLAGS(%esp)
 	movl %esp, %eax
 	jne work_notifysig_v86		# returning to kernel-space or
@@ -457,17 +458,18 @@
 
 	ALIGN
 work_notifysig_v86:
-#ifdef CONFIG_VM86
 	pushl %ecx			# save ti_flags for do_notify_resume
 	CFI_ADJUST_CFA_OFFSET 4
 	call save_v86_state		# %eax contains pt_regs pointer
 	popl %ecx
 	CFI_ADJUST_CFA_OFFSET -4
 	movl %eax, %esp
+#else
+	movl %esp, %eax
+#endif
 	xorl %edx, %edx
 	call do_notify_resume
 	jmp resume_userspace_sig
-#endif
 
 	# perform syscall exit tracing
 	ALIGN
#3 lore raw
Quoted 9 lines · Joe Korty
Quoted 2 lines

I suspect this won't link with CONFIG_VM86 disabled because save_v86_state goes away. I think we just need to move the #endif up a few lines.

Hi Matt,
Since that also makes the 'then' and 'else' branches identical, perhaps this patch would be better .. it eliminates the VM86 test entirely when CONFIG_VM86=n.

Boot tested with CONFIG_VM86=y.

Added.

-Andi