Skip to contentSkip to conversation

x86: entry_32.S fix compiling warnings

PATCH Applied Jaswinder Singh Rajput 3 participants 6 messages Mar 14, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: entry_32.S fix compiling warnings

Hello Ingo,

Are these looks OK to you:

Subject: [PATCH] x86: entry_32.S fix compiling warnings

Fixed:
arch/x86/kernel/entry_32.S:446: Warning: 00000000080001d1 shortened to 00000000000001d1 arch/x86/kernel/entry_32.S:457: Warning: 000000000800feff shortened to 000000000000feff arch/x86/kernel/entry_32.S:527: Warning: 00000000080001d1 shortened to 00000000000001d1 arch/x86/kernel/entry_32.S:541: Warning: 000000000800feff shortened to 000000000000feff arch/x86/kernel/entry_32.S:676: Warning: 0000000008000091 shortened to 0000000000000091

---
 arch/x86/kernel/entry_32.S |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
arch/x86/kernel/entry_32.S +8 -10
index 899e893..82cf555 100644
@@ -442,8 +442,7 @@ sysenter_past_esp:
 
 	GET_THREAD_INFO(%ebp)
 
-	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
-	testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
+	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
 	jnz sysenter_audit
 sysenter_do_call:
 	cmpl $(nr_syscalls), %eax
@@ -454,7 +453,7 @@ sysenter_do_call:
 	DISABLE_INTERRUPTS(CLBR_ANY)
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $_TIF_ALLWORK_MASK, %cx
+	testl $_TIF_ALLWORK_MASK, %ecx
 	jne sysexit_audit
 sysenter_exit:
 /* if something modifies registers it must also disable sysexit */
@@ -468,7 +467,7 @@ sysenter_exit:
 
 #ifdef CONFIG_AUDITSYSCALL
 sysenter_audit:
-	testw $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
+	testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
 	jnz syscall_trace_entry
 	addl $4,%esp
 	CFI_ADJUST_CFA_OFFSET -4
@@ -485,7 +484,7 @@ sysenter_audit:
 	jmp sysenter_do_call
 
 sysexit_audit:
-	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
+	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
 	jne syscall_exit_work
 	TRACE_IRQS_ON
 	ENABLE_INTERRUPTS(CLBR_ANY)
@@ -498,7 +497,7 @@ sysexit_audit:
 	DISABLE_INTERRUPTS(CLBR_ANY)
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
+	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx
 	jne syscall_exit_work
 	movl PT_EAX(%esp),%eax	/* reload syscall return value */
 	jmp sysenter_exit
@@ -523,8 +522,7 @@ ENTRY(system_call)
 	SAVE_ALL
 	GET_THREAD_INFO(%ebp)
 					# system call tracing in operation / emulation
-	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
-	testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
+	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
 	jnz syscall_trace_entry
 	cmpl $(nr_syscalls), %eax
 	jae syscall_badsys
@@ -538,7 +536,7 @@ syscall_exit:
 					# between sampling and the iret
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $_TIF_ALLWORK_MASK, %cx	# current->work
+	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
 	jne syscall_exit_work
 
 restore_all:
@@ -673,7 +671,7 @@ END(syscall_trace_entry)
 	# perform syscall exit tracing
 	ALIGN
 syscall_exit_work:
-	testb $_TIF_WORK_SYSCALL_EXIT, %cl
+	testl $_TIF_WORK_SYSCALL_EXIT, %ecx
 	jz work_pending
 	TRACE_IRQS_ON
 	ENABLE_INTERRUPTS(CLBR_ANY)	# could let syscall_trace_leave() call
Signature · 1 line
1.6.0.6
Applied
#1 lore raw
Quoted 4 lines · Jaswinder Singh Rajput

Hello Ingo,

Are these looks OK to you:

Quoted 8 lines

Subject: [PATCH] x86: entry_32.S fix compiling warnings

Fixed:
arch/x86/kernel/entry_32.S:446: Warning: 00000000080001d1 shortened to 00000000000001d1 arch/x86/kernel/entry_32.S:457: Warning: 000000000800feff shortened to 000000000000feff arch/x86/kernel/entry_32.S:527: Warning: 00000000080001d1 shortened to 00000000000001d1 arch/x86/kernel/entry_32.S:541: Warning: 000000000800feff shortened to 000000000000feff arch/x86/kernel/entry_32.S:676: Warning: 0000000008000091 shortened to 0000000000000091

ah, indeed - that's TIF_SYSCALL_FTRACE.

It's in fact faster to check 32 bit mask not a 16 bit mask.

Applied, thanks.

Ingo

#2 lore raw

[tip:tracing/syscalls] x86: entry_32.S fix compile warnings - fix work mask bit width

In reply to Jaswinder Singh Rajput
Commit-ID:  95baa1a17ff80183317d815189fe1f12fdb653bc
Gitweb:     http://git.kernel.org/tip/95baa1a17ff80183317d815189fe1f12fdb653bc
Author:     Jaswinder Singh Rajput <[email protected]>
AuthorDate: Sat, 14 Mar 2009 12:08:13 +0530
Commit:     Ingo Molnar <[email protected]>
CommitDate: Sat, 14 Mar 2009 08:16:01 +0100

x86: entry_32.S fix compile warnings - fix work mask bit width

Fix:

arch/x86/kernel/entry_32.S:446: Warning: 00000000080001d1 shortened to 00000000000001d1 arch/x86/kernel/entry_32.S:457: Warning: 000000000800feff shortened to 000000000000feff arch/x86/kernel/entry_32.S:527: Warning: 00000000080001d1 shortened to 00000000000001d1 arch/x86/kernel/entry_32.S:541: Warning: 000000000800feff shortened to 000000000000feff arch/x86/kernel/entry_32.S:676: Warning: 0000000008000091 shortened to 0000000000000091

TIF_SYSCALL_FTRACE is 0x08000000 and until now we checked the first 16 bits of the work mask - bit 27 falls outside of that.

Update the entry_32.S code to check the full 32-bit mask.

Cc Frederic Weisbecker <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc "H. Peter Anvin" <[email protected]>

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/entry_32.S |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
arch/x86/kernel/entry_32.S +8 -10
index 899e893..82cf555 100644
@@ -442,8 +442,7 @@ sysenter_past_esp:
 
 	GET_THREAD_INFO(%ebp)
 
-	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
-	testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
+	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
 	jnz sysenter_audit
 sysenter_do_call:
 	cmpl $(nr_syscalls), %eax
@@ -454,7 +453,7 @@ sysenter_do_call:
 	DISABLE_INTERRUPTS(CLBR_ANY)
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $_TIF_ALLWORK_MASK, %cx
+	testl $_TIF_ALLWORK_MASK, %ecx
 	jne sysexit_audit
 sysenter_exit:
 /* if something modifies registers it must also disable sysexit */
@@ -468,7 +467,7 @@ sysenter_exit:
 
 #ifdef CONFIG_AUDITSYSCALL
 sysenter_audit:
-	testw $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
+	testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
 	jnz syscall_trace_entry
 	addl $4,%esp
 	CFI_ADJUST_CFA_OFFSET -4
@@ -485,7 +484,7 @@ sysenter_audit:
 	jmp sysenter_do_call
 
 sysexit_audit:
-	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
+	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
 	jne syscall_exit_work
 	TRACE_IRQS_ON
 	ENABLE_INTERRUPTS(CLBR_ANY)
@@ -498,7 +497,7 @@ sysexit_audit:
 	DISABLE_INTERRUPTS(CLBR_ANY)
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
+	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx
 	jne syscall_exit_work
 	movl PT_EAX(%esp),%eax	/* reload syscall return value */
 	jmp sysenter_exit
@@ -523,8 +522,7 @@ ENTRY(system_call)
 	SAVE_ALL
 	GET_THREAD_INFO(%ebp)
 					# system call tracing in operation / emulation
-	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
-	testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
+	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
 	jnz syscall_trace_entry
 	cmpl $(nr_syscalls), %eax
 	jae syscall_badsys
@@ -538,7 +536,7 @@ syscall_exit:
 					# between sampling and the iret
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $_TIF_ALLWORK_MASK, %cx	# current->work
+	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
 	jne syscall_exit_work
 
 restore_all:
@@ -673,7 +671,7 @@ END(syscall_trace_entry)
 	# perform syscall exit tracing
 	ALIGN
 syscall_exit_work:
-	testb $_TIF_WORK_SYSCALL_EXIT, %cl
+	testl $_TIF_WORK_SYSCALL_EXIT, %ecx
 	jz work_pending
 	TRACE_IRQS_ON
 	ENABLE_INTERRUPTS(CLBR_ANY)	# could let syscall_trace_leave() call
#3 lore raw

Re: [tip:tracing/syscalls] x86: entry_32.S fix compile warnings - fix work mask bit width

[Jaswinder Singh Rajput - Sat, Mar 14, 2009 at 07:18:32AM +0000]

| Commit-ID:  95baa1a17ff80183317d815189fe1f12fdb653bc
| Gitweb:     http://git.kernel.org/tip/95baa1a17ff80183317d815189fe1f12fdb653bc
| Author:     Jaswinder Singh Rajput <[email protected]>
| AuthorDate: Sat, 14 Mar 2009 12:08:13 +0530
| Commit:     Ingo Molnar <[email protected]>
| CommitDate: Sat, 14 Mar 2009 08:16:01 +0100
| 
| x86: entry_32.S fix compile warnings - fix work mask bit width
| 
| Fix:
| 
|  arch/x86/kernel/entry_32.S:446: Warning: 00000000080001d1 shortened to 00000000000001d1
|  arch/x86/kernel/entry_32.S:457: Warning: 000000000800feff shortened to 000000000000feff
|  arch/x86/kernel/entry_32.S:527: Warning: 00000000080001d1 shortened to 00000000000001d1
|  arch/x86/kernel/entry_32.S:541: Warning: 000000000800feff shortened to 000000000000feff
|  arch/x86/kernel/entry_32.S:676: Warning: 0000000008000091 shortened to 0000000000000091
| 
| TIF_SYSCALL_FTRACE is 0x08000000 and until now we checked the
| first 16 bits of the work mask - bit 27 falls outside of that.
| 
| Update the entry_32.S code to check the full 32-bit mask.
| 
| Signed-off-by: Jaswinder Singh Rajput <[email protected]>
| Cc: Frederic Weisbecker <[email protected]>
| Cc: Steven Rostedt <[email protected]>
| Cc: "H. Peter Anvin" <[email protected]>
| LKML-Reference: <[email protected]>
| Signed-off-by: Ingo Molnar <[email protected]>
| 
| 
| ---
|  arch/x86/kernel/entry_32.S |   18 ++++++++----------
|  1 files changed, 8 insertions(+), 10 deletions(-)
| 
...  
|  sysexit_audit:
| -	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
| +	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
							^^^^^

Better to point ecx here? :)

- Cyrill -

#4 lore raw

Re: [tip:tracing/syscalls] x86: entry_32.S fix compile warnings - fix work mask bit width

Quoted 40 lines · Cyrill Gorcunov

[Jaswinder Singh Rajput - Sat, Mar 14, 2009 at 07:18:32AM +0000]

| Commit-ID:  95baa1a17ff80183317d815189fe1f12fdb653bc
| Gitweb:     http://git.kernel.org/tip/95baa1a17ff80183317d815189fe1f12fdb653bc
| Author:     Jaswinder Singh Rajput <[email protected]>
| AuthorDate: Sat, 14 Mar 2009 12:08:13 +0530
| Commit:     Ingo Molnar <[email protected]>
| CommitDate: Sat, 14 Mar 2009 08:16:01 +0100
| 
| x86: entry_32.S fix compile warnings - fix work mask bit width
| 
| Fix:
| 
|  arch/x86/kernel/entry_32.S:446: Warning: 00000000080001d1 shortened to 00000000000001d1
|  arch/x86/kernel/entry_32.S:457: Warning: 000000000800feff shortened to 000000000000feff
|  arch/x86/kernel/entry_32.S:527: Warning: 00000000080001d1 shortened to 00000000000001d1
|  arch/x86/kernel/entry_32.S:541: Warning: 000000000800feff shortened to 000000000000feff
|  arch/x86/kernel/entry_32.S:676: Warning: 0000000008000091 shortened to 0000000000000091
| 
| TIF_SYSCALL_FTRACE is 0x08000000 and until now we checked the
| first 16 bits of the work mask - bit 27 falls outside of that.
| 
| Update the entry_32.S code to check the full 32-bit mask.
| 
| Signed-off-by: Jaswinder Singh Rajput <[email protected]>
| Cc: Frederic Weisbecker <[email protected]>
| Cc: Steven Rostedt <[email protected]>
| Cc: "H. Peter Anvin" <[email protected]>
| LKML-Reference: <[email protected]>
| Signed-off-by: Ingo Molnar <[email protected]>
| 
| 
| ---
|  arch/x86/kernel/entry_32.S |   18 ++++++++----------
|  1 files changed, 8 insertions(+), 10 deletions(-)
| 
...  
|  sysexit_audit:
| -	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
| +	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
							^^^^^
Quoted 2 lines

Better to point ecx here? :)

Thanks Cyrill :-)

Subject: [PATCH] x86: entry_32.S fix compile warnings - fix work mask bit width - v2

Replace cx with ecx

---
 arch/x86/kernel/entry_32.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/entry_32.S +1 -1
index 82cf555..c929add 100644
@@ -484,7 +484,7 @@ sysenter_audit:
 	jmp sysenter_do_call
 
 sysexit_audit:
-	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
+	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx
 	jne syscall_exit_work
 	TRACE_IRQS_ON
 	ENABLE_INTERRUPTS(CLBR_ANY)
Signature · 1 line
1.6.0.6
#5 lore raw

[tip:tracing/syscalls] x86: entry_32.S fix compile warnings - fix work mask bit width

In reply to Jaswinder Singh Rajput
Commit-ID:  88200bc28da38bcda1cb1bd218216e83b426d8a8
Gitweb:     http://git.kernel.org/tip/88200bc28da38bcda1cb1bd218216e83b426d8a8
Author:     Jaswinder Singh Rajput <[email protected]>
AuthorDate: Sat, 14 Mar 2009 12:08:13 +0530
Commit:     Ingo Molnar <[email protected]>
CommitDate: Sat, 14 Mar 2009 09:42:51 +0100

x86: entry_32.S fix compile warnings - fix work mask bit width

Fix:

arch/x86/kernel/entry_32.S:446: Warning: 00000000080001d1 shortened to 00000000000001d1 arch/x86/kernel/entry_32.S:457: Warning: 000000000800feff shortened to 000000000000feff arch/x86/kernel/entry_32.S:527: Warning: 00000000080001d1 shortened to 00000000000001d1 arch/x86/kernel/entry_32.S:541: Warning: 000000000800feff shortened to 000000000000feff arch/x86/kernel/entry_32.S:676: Warning: 0000000008000091 shortened to 0000000000000091

TIF_SYSCALL_FTRACE is 0x08000000 and until now we checked the first 16 bits of the work mask - bit 27 falls outside of that.

Update the entry_32.S code to check the full 32-bit mask.

[ %cx => %ecx fix from Cyrill Gorcunov <[email protected]> ]

Cc Frederic Weisbecker <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc "H. Peter Anvin" <[email protected]>

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/entry_32.S |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
arch/x86/kernel/entry_32.S +8 -10
index 899e893..c929add 100644
@@ -442,8 +442,7 @@ sysenter_past_esp:
 
 	GET_THREAD_INFO(%ebp)
 
-	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
-	testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
+	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
 	jnz sysenter_audit
 sysenter_do_call:
 	cmpl $(nr_syscalls), %eax
@@ -454,7 +453,7 @@ sysenter_do_call:
 	DISABLE_INTERRUPTS(CLBR_ANY)
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $_TIF_ALLWORK_MASK, %cx
+	testl $_TIF_ALLWORK_MASK, %ecx
 	jne sysexit_audit
 sysenter_exit:
 /* if something modifies registers it must also disable sysexit */
@@ -468,7 +467,7 @@ sysenter_exit:
 
 #ifdef CONFIG_AUDITSYSCALL
 sysenter_audit:
-	testw $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
+	testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
 	jnz syscall_trace_entry
 	addl $4,%esp
 	CFI_ADJUST_CFA_OFFSET -4
@@ -485,7 +484,7 @@ sysenter_audit:
 	jmp sysenter_do_call
 
 sysexit_audit:
-	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
+	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx
 	jne syscall_exit_work
 	TRACE_IRQS_ON
 	ENABLE_INTERRUPTS(CLBR_ANY)
@@ -498,7 +497,7 @@ sysexit_audit:
 	DISABLE_INTERRUPTS(CLBR_ANY)
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx
+	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx
 	jne syscall_exit_work
 	movl PT_EAX(%esp),%eax	/* reload syscall return value */
 	jmp sysenter_exit
@@ -523,8 +522,7 @@ ENTRY(system_call)
 	SAVE_ALL
 	GET_THREAD_INFO(%ebp)
 					# system call tracing in operation / emulation
-	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
-	testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
+	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
 	jnz syscall_trace_entry
 	cmpl $(nr_syscalls), %eax
 	jae syscall_badsys
@@ -538,7 +536,7 @@ syscall_exit:
 					# between sampling and the iret
 	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
-	testw $_TIF_ALLWORK_MASK, %cx	# current->work
+	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
 	jne syscall_exit_work
 
 restore_all:
@@ -673,7 +671,7 @@ END(syscall_trace_entry)
 	# perform syscall exit tracing
 	ALIGN
 syscall_exit_work:
-	testb $_TIF_WORK_SYSCALL_EXIT, %cl
+	testl $_TIF_WORK_SYSCALL_EXIT, %ecx
 	jz work_pending
 	TRACE_IRQS_ON
 	ENABLE_INTERRUPTS(CLBR_ANY)	# could let syscall_trace_leave() call