Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1220863 > unrolled thread

[tip:x86/headers] x86/headers: Remove <asm/sigcontext.h> references on the kernel side

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [tip:x86/headers] x86/headers: Remove <asm/sigcontext.h>   references on the kernel side tip-bot for Ingo Molnar <tipbot@zytor.com> - 2015-09-08 16:40 +0200
    Re: [tip:x86/headers] x86/headers: Remove <asm/sigcontext.h>  references on the kernel side Mikko Rapeli <mikko.rapeli@iki.fi> - 2015-09-08 22:20 +0200

#1220863 — [tip:x86/headers] x86/headers: Remove <asm/sigcontext.h> references on the kernel side

Commit-ID:  decb4c41159e1511197f2964da758fa7f2eeb741
Gitweb:     http://git.kernel.org/tip/decb4c41159e1511197f2964da758fa7f2eeb741
Author:     Ingo Molnar <mingo@kernel.org>
AuthorDate: Sat, 5 Sep 2015 09:32:43 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 8 Sep 2015 10:06:05 +0200

x86/headers: Remove <asm/sigcontext.h> references on the kernel side

Now that all type definitions are in the UAPI header, include it
directly, instead of through <asm/sigcontext.h>.

[ We still keep asm/sigcontext.h, so that uapi/asm/sigcontext32.h
  can include <asm/sigcontext.h>. ]

Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1441438363-9999-16-git-send-email-mingo@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/ia32/ia32_signal.c       | 2 +-
 arch/x86/include/asm/fpu/signal.h | 2 +-
 arch/x86/include/asm/ia32.h       | 2 +-
 arch/x86/include/asm/processor.h  | 2 +-
 arch/x86/include/asm/sigcontext.h | 2 ++
 arch/x86/include/asm/sigframe.h   | 2 +-
 arch/x86/include/asm/signal.h     | 2 +-
 arch/x86/math-emu/fpu_emu.h       | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 955ca03..5959042 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -26,7 +26,7 @@
 #include <asm/ptrace.h>
 #include <asm/ia32_unistd.h>
 #include <asm/user32.h>
-#include <asm/sigcontext.h>
+#include <uapi/asm/sigcontext.h>
 #include <asm/proto.h>
 #include <asm/vdso.h>
 #include <asm/sigframe.h>
diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h
index 856f4b3c..0e970d0 100644
--- a/arch/x86/include/asm/fpu/signal.h
+++ b/arch/x86/include/asm/fpu/signal.h
@@ -5,7 +5,7 @@
 #define _ASM_X86_FPU_SIGNAL_H
 
 #ifdef CONFIG_X86_64
-# include <asm/sigcontext.h>
+# include <uapi/asm/sigcontext.h>
 # include <asm/user32.h>
 struct ksignal;
 int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
index 16edda2..a9bdf55 100644
--- a/arch/x86/include/asm/ia32.h
+++ b/arch/x86/include/asm/ia32.h
@@ -10,7 +10,7 @@
  * 32 bit structures for IA32 support.
  */
 
-#include <asm/sigcontext.h>
+#include <uapi/asm/sigcontext.h>
 
 /* signal.h */
 
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 19577dd..bb911e7 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -11,7 +11,7 @@ struct vm86;
 #include <asm/math_emu.h>
 #include <asm/segment.h>
 #include <asm/types.h>
-#include <asm/sigcontext.h>
+#include <uapi/asm/sigcontext.h>
 #include <asm/current.h>
 #include <asm/cpufeature.h>
 #include <asm/page.h>
diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h
index 25815f0..e6cd2c4 100644
--- a/arch/x86/include/asm/sigcontext.h
+++ b/arch/x86/include/asm/sigcontext.h
@@ -1,6 +1,8 @@
 #ifndef _ASM_X86_SIGCONTEXT_H
 #define _ASM_X86_SIGCONTEXT_H
 
+/* This is a legacy header - all kernel code includes <uapi/asm/sigcontext.h> directly. */
+
 #include <uapi/asm/sigcontext.h>
 
 #endif /* _ASM_X86_SIGCONTEXT_H */
diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
index 867a757..34edd16 100644
--- a/arch/x86/include/asm/sigframe.h
+++ b/arch/x86/include/asm/sigframe.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_X86_SIGFRAME_H
 #define _ASM_X86_SIGFRAME_H
 
-#include <asm/sigcontext.h>
+#include <uapi/asm/sigcontext.h>
 #include <asm/siginfo.h>
 #include <asm/ucontext.h>
 #include <linux/compat.h>
diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
index c481be7..2138c9a 100644
--- a/arch/x86/include/asm/signal.h
+++ b/arch/x86/include/asm/signal.h
@@ -34,7 +34,7 @@ extern void do_signal(struct pt_regs *regs);
 
 #define __ARCH_HAS_SA_RESTORER
 
-#include <asm/sigcontext.h>
+#include <uapi/asm/sigcontext.h>
 
 #ifdef __i386__
 
diff --git a/arch/x86/math-emu/fpu_emu.h b/arch/x86/math-emu/fpu_emu.h
index 4dae511..afbc4d8 100644
--- a/arch/x86/math-emu/fpu_emu.h
+++ b/arch/x86/math-emu/fpu_emu.h
@@ -71,7 +71,7 @@
 
 #include "fpu_system.h"
 
-#include <asm/sigcontext.h>	/* for struct _fpstate */
+#include <uapi/asm/sigcontext.h>	/* for struct _fpstate */
 #include <asm/math_emu.h>
 #include <linux/linkage.h>
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1221066 — Re: [tip:x86/headers] x86/headers: Remove <asm/sigcontext.h> references on the kernel side

Hi,

Tested these changes on top of my uapi headers fix branch and
they compile without problems in userspace and thus fix the original issue.

Also abi-compliance-checker reports that these changes don't break anything
in i386 ABI (details at [2]):

"Test Info
Library Name	kernel
Version #1	headers_test_v04
Version #2	headers_test_v04+test_ingo_x86_cleanup
CPU Type	x86
GCC Version	5.2.1
Subject	Binary Compatibility
Test Results
Total Header Files	767
Total Shared Libraries	0 (not analyzed)
Total Symbols / Types	62 / 67
Verdict	Compatible"

or API:

"Test Info
Library Name	kernel
Version #1	headers_test_v04
Version #2	headers_test_v04+test_ingo_x86_cleanup
CPU Type	x86
GCC Version	5.2.1
Subject	Source Compatibility
Test Results
Total Header Files	767
Total Shared Libraries	0 (not analyzed)
Total Symbols / Types	96 / 101
Verdict	Compatible"

While abi-compliance-checker is still quite broken with kernel header files[3]
addition of new constants was correctly detected:

"Other Changes in Constants (3)
sigcontext.h
[−] _fpstate
	Change	Effect
1	The constant _fpstate with value _fpstate_32 has been added.	No effect.

[−] _fpstate_ia32
	Change	Effect
1	The constant _fpstate_ia32 with value _fpstate_32 has been added.	No effect.

[−] sigcontext_ia32
	Change	Effect
1	The constant sigcontext_ia32 with value sigcontext_32 has been added.	No effect."

So for 32 bit userspace side

Tested-by: Mikko Rapeli <mikko.rapeli@iki.fi>

-Mikko

[1] http://lvc.github.io/abi-compliance-checker/

[2] API/ABI check results
    https://mcfrisk.kapsi.fi/temp/headers_test_v04_to_headers_test_v04+test_ingo_x86_cleanup/

[3] abi checker still has some issues with kernel headers:
    https://mcfrisk.kapsi.fi/temp/headers_test_v04+test_ingo_x86_cleanup/log.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web