linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot for H. Peter Anvin" <hpa@linux.intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
	bruce.j.beare@intel.com, arnd@arndb.de, tglx@linutronix.de,
	hjl.rools@gmail.com, hpa@linux.intel.com
Subject: [tip:x86/urgent] x32, siginfo: Provide proper overrides for x32 siginfo_t
Date: Mon, 23 Apr 2012 16:50:29 -0700	[thread overview]
Message-ID: <tip-045b09a0be388ece1469aa02f17252e57c95093e@git.kernel.org> (raw)
In-Reply-To: <CAMe9rOqF6Kh6-NK7oP0Fpzkd4SBAWU+G53hwBbSD4iA2UzyxuA@mail.gmail.com>

Commit-ID:  045b09a0be388ece1469aa02f17252e57c95093e
Gitweb:     http://git.kernel.org/tip/045b09a0be388ece1469aa02f17252e57c95093e
Author:     H. Peter Anvin <hpa@linux.intel.com>
AuthorDate: Mon, 23 Apr 2012 16:34:12 -0700
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 23 Apr 2012 16:36:45 -0700

x32, siginfo: Provide proper overrides for x32 siginfo_t

Provide the proper override macros for x32 siginfo_t.  The combination
of a special type here and an overall alignment constraint actually
ends up with all the types being properly aligned, but the hack is
needed to keep the substructures inside siginfo_t from adding padding.

Note: use __attribute__((aligned())) since __aligned() is not exported
to user space.

Reported-by: H.J. Lu <hjl.rools@gmail.com>
Cc: Bruce J. Beare <bruce.j.beare@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Link: http://lkml.kernel.org/r/CAMe9rOqF6Kh6-NK7oP0Fpzkd4SBAWU%2BG53hwBbSD4iA2UzyxuA@mail.gmail.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/include/asm/siginfo.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/siginfo.h b/arch/x86/include/asm/siginfo.h
index fc1aa55..073d445 100644
--- a/arch/x86/include/asm/siginfo.h
+++ b/arch/x86/include/asm/siginfo.h
@@ -2,7 +2,13 @@
 #define _ASM_X86_SIGINFO_H
 
 #ifdef __x86_64__
-# define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))
+# ifdef __ILP32__ /* x32 */
+typedef long long __kernel_si_clock_t __attribute__((aligned(4)));
+#  define __ARCH_SI_CLOCK_T		__kernel_si_clock_t;
+#  define __ARCH_SI_ATTRIBUTES		__attribute__((aligned(8)))
+# else /* x86-64 */
+#  define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))
+# endif
 #endif
 
 #include <asm-generic/siginfo.h>

  parent reply	other threads:[~2012-04-23 23:50 UTC|newest]

Thread overview: 106+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-20  0:07 [PATCH 00/30] RFC: x32 support H. Peter Anvin
2012-02-20  0:07 ` [PATCH 01/30] x86: Factor out TIF_IA32 from 32-bit address space H. Peter Anvin
2012-02-20  0:07 ` [PATCH 02/30] x86-64: Use explicit sizes in sigcontext.h, prepare for x32 H. Peter Anvin
2012-02-20  0:51   ` Linus Torvalds
2012-02-20  0:56     ` H. Peter Anvin
2012-02-22 12:22       ` Arnd Bergmann
2012-02-22 18:14         ` H. Peter Anvin
2012-02-22 21:23           ` Arnd Bergmann
2012-02-22 21:55             ` H. Peter Anvin
2012-02-24  2:33             ` H. Peter Anvin
2012-03-06  5:25               ` H. Peter Anvin
2012-02-20  0:07 ` [PATCH 03/30] sysinfo: Move struct sysinfo to a separate header file H. Peter Anvin
2012-02-20  0:07 ` [PATCH 04/30] posix_types: Introduce __kernel_[u]long_t H. Peter Anvin
2012-02-20  0:07 ` [PATCH 05/30] x32: Create posix_types_x32.h H. Peter Anvin
2012-02-20  0:07 ` [PATCH 06/30] sysinfo: Use explicit types in <linux/sysinfo.h> H. Peter Anvin
2012-02-20 12:12   ` Geert Uytterhoeven
2012-02-20 17:29     ` H. Peter Anvin
2012-02-20 20:01       ` Geert Uytterhoeven
2012-02-20 20:44         ` H. Peter Anvin
2012-02-20  0:07 ` [PATCH 07/30] compat: Introduce COMPAT_USE_64BIT_TIME H. Peter Anvin
2012-02-20  0:07 ` [PATCH 08/30] compat: Use COMPAT_USE_64BIT_TIME in the lp driver H. Peter Anvin
2012-02-20  0:56   ` Linus Torvalds
2012-02-20  0:59     ` H. Peter Anvin
2012-02-20  2:22     ` [PATCH 0/7] COMPAT_USE_64BIT_TIME v2 H. Peter Anvin
2012-02-20  2:22       ` [PATCH 1/7] compat: Introduce COMPAT_USE_64BIT_TIME H. Peter Anvin
2012-02-20  2:22       ` [PATCH 2/7] compat: Add helper functions to read/write struct timeval, timespec H. Peter Anvin
2012-02-20  2:22       ` [PATCH 3/7] compat: Handle COMPAT_USE_64BIT_TIME in the lp driver H. Peter Anvin
2012-02-20  2:22       ` [PATCH 4/7] compat: Use COMPAT_USE_64BIT_TIME in the input subsystem H. Peter Anvin
2012-02-20  2:22       ` [PATCH 5/7] compat: Use COMPAT_USE_64BIT_TIME in the Bluetooth subsystem H. Peter Anvin
2012-02-20  2:22       ` [PATCH 6/7] compat: Use COMPAT_USE_64BIT_TIME in net/compat.c H. Peter Anvin
2012-02-20  2:22       ` [PATCH 7/7] compat: Handle COMPAT_USE_64BIT_TIME in net/socket.c H. Peter Anvin
2012-02-20  2:42       ` [PATCH 0/7] COMPAT_USE_64BIT_TIME v2 H. Peter Anvin
2012-02-20  6:22         ` H. Peter Anvin
2012-02-20  0:07 ` [PATCH 09/30] compat: Use COMPAT_USE_64BIT_TIME in the input subsystem H. Peter Anvin
2012-02-20  0:07 ` [PATCH 10/30] compat: Use COMPAT_USE_64BIT_TIME in the Bluetooth subsystem H. Peter Anvin
2012-02-21 19:05   ` Gustavo Padovan
2012-02-21 19:15     ` H. Peter Anvin
2012-02-22 13:47     ` Jiri Kosina
2012-02-22 14:45       ` Gustavo Padovan
2012-02-20  0:07 ` [PATCH 11/30] aio: Use __kernel_ulong_t to define aio_context_t H. Peter Anvin
2012-02-20  0:07 ` [PATCH 12/30] compat: Create compat_sys_p{read,write}v64 H. Peter Anvin
2012-02-20  0:07 ` [PATCH 13/30] elf: Allow core dump-related fields to be overridden H. Peter Anvin
2012-02-20  0:07 ` [PATCH 14/30] x86-64: Add prototype for old_rsp to a header file H. Peter Anvin
2012-02-20  0:07 ` [PATCH 15/30] x32: Add a thread flag for x32 processes H. Peter Anvin
2012-02-20  0:07 ` [PATCH 16/30] x86-64, ia32: Drop sys32_rt_sigprocmask H. Peter Anvin
2012-02-20  0:07 ` [PATCH 17/30] x32: Add x32 system calls to syscall/syscall_64.tbl H. Peter Anvin
2012-02-20  0:07 ` [PATCH 18/30] x32: Generate <asm/unistd_x32.h> H. Peter Anvin
2012-02-20  0:07 ` [PATCH 19/30] x32: Generate <asm/unistd_64_x32.h> H. Peter Anvin
2012-02-20  0:07 ` [PATCH 20/30] x86: Move some signal-handling definitions to a common header H. Peter Anvin
2012-02-20  0:07 ` [PATCH 21/30] x32: Export setup/restore_sigcontext from signal.c H. Peter Anvin
2012-02-20  0:08 ` [PATCH 22/30] x32: Add struct ucontext_x32 H. Peter Anvin
2012-02-20  0:08 ` [PATCH 23/30] x32: Add rt_sigframe_x32 H. Peter Anvin
2012-02-20  0:08 ` [PATCH 24/30] x32: Handle the x32 system call flag H. Peter Anvin
2012-02-20  0:08 ` [PATCH 25/30] x86: Add #ifdef CONFIG_COMPAT to <asm/sys_ia32.h> H. Peter Anvin
2012-02-20  0:08 ` [PATCH 26/30] x32: Signal-related system calls H. Peter Anvin
2012-02-20  0:08 ` [PATCH 27/30] x32: Handle process creation H. Peter Anvin
2012-02-20  0:08 ` [PATCH 28/30] x32: If configured, add x32 system calls to system call tables H. Peter Anvin
2012-02-20  0:08 ` [PATCH 29/30] x32: Allow x32 to be configured H. Peter Anvin
2012-02-20  0:08 ` [PATCH 30/30] x32: Add x32 VDSO support H. Peter Anvin
2012-02-21  0:12   ` Andy Lutomirski
2012-02-21  3:58     ` H. Peter Anvin
2012-02-21 16:52       ` Andrew Lutomirski
2012-02-21 17:51         ` H. Peter Anvin
2012-02-21 18:54           ` Andrew Lutomirski
2012-02-21 19:03             ` H. Peter Anvin
2012-02-21 19:29               ` Andrew Lutomirski
2012-02-21 19:37                 ` H. Peter Anvin
2012-02-21 19:40                   ` Andrew Lutomirski
2012-02-21 19:49                     ` H. Peter Anvin
2012-02-21 19:51                       ` Andrew Lutomirski
2012-02-21 19:56                         ` H. Peter Anvin
2012-02-23  4:49     ` [tip:x86/x32] x32: Drop non-__vdso weak symbols from the x32 VDSO tip-bot for H. Peter Anvin
2012-02-23 10:55       ` Ingo Molnar
2012-02-23 14:36         ` H. Peter Anvin
2012-02-27 22:21 ` [tip:x86/x32] x32: Warn and disable rather than error if binutils too old tip-bot for H. Peter Anvin
2012-02-28  9:49 ` [tip:x86/x32] x86/x32: Fix the binutils auto-detect tip-bot for Ingo Molnar
2012-03-06  0:56 ` [tip:x86/x32] x32: Provide separate is_ia32_task() and is_x32_task () predicates tip-bot for H. Peter Anvin
2012-03-06  0:56 ` [tip:x86/x32] x32: Switch to a 64-bit clock_t tip-bot for H. Peter Anvin
2012-03-06  0:57 ` [tip:x86/x32] x32: Add ptrace for x32 tip-bot for H.J. Lu
2012-03-14  5:58 ` [tip:x86/x32] x32: Fix stupid ia32/ x32 inversion in the siginfo format tip-bot for H. Peter Anvin
2012-03-14 21:43 ` [tip:x86/x32] x32: Fix alignment fail in struct compat_siginfo tip-bot for H. Peter Anvin
2012-03-14 23:17   ` H.J. Lu
2012-03-14 23:19     ` H. Peter Anvin
2012-03-15  0:33       ` H.J. Lu
2012-03-14 23:33     ` Derek Fawcus
2012-03-14 23:44       ` H. Peter Anvin
2012-04-18 17:38   ` H.J. Lu
2012-04-18 17:47     ` H. Peter Anvin
2012-04-18 18:01       ` H.J. Lu
2012-04-18 18:10         ` H. Peter Anvin
2012-04-18 18:15           ` H.J. Lu
2012-04-18 18:21             ` H. Peter Anvin
2012-04-18 18:33               ` H.J. Lu
2012-04-18 19:03                 ` H. Peter Anvin
2012-04-18 21:24                 ` H. Peter Anvin
2012-04-18 21:49                   ` H.J. Lu
2012-04-18 21:58                     ` H. Peter Anvin
2012-04-18 22:58                       ` H.J. Lu
2012-04-18 22:55                   ` H.J. Lu
2012-04-18 23:48                     ` H. Peter Anvin
2012-04-18 23:54                       ` H.J. Lu
2012-04-19  0:09                         ` H. Peter Anvin
2012-04-19  0:14                           ` H.J. Lu
2012-04-23 23:49     ` [tip:x86/urgent] asm-generic: Allow overriding clock_t and add attributes to siginfo_t tip-bot for H. Peter Anvin
2012-04-23 23:50     ` tip-bot for H. Peter Anvin [this message]
2012-04-24  1:19     ` [tip:x86/urgent] x32, siginfo: Provide proper overrides for x32 siginfo_t tip-bot for H. Peter Anvin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-045b09a0be388ece1469aa02f17252e57c95093e@git.kernel.org \
    --to=hpa@linux.intel.com \
    --cc=arnd@arndb.de \
    --cc=bruce.j.beare@intel.com \
    --cc=hjl.rools@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).