mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-29 23:16:39 +07:00
49cd53bf14
Stephen Rothwell reported this linux-next build failure:
http://lkml.kernel.org/r/20160226164406.065a1ffc@canb.auug.org.au
... caused by the Memory Protection Keys patches from the tip tree triggering
a newly introduced build-time sanity check on an ARM build, because they changed
the ABI of siginfo in an unexpected way.
If u64 has a natural alignment of 8 bytes (which is the case on most mainstream
platforms, with the notable exception of x86-32), then the leadup to the
_sifields union matters:
typedef struct siginfo {
int si_signo;
int si_errno;
int si_code;
union {
...
} _sifields;
} __ARCH_SI_ATTRIBUTES siginfo_t;
Note how the first 3 fields give us 12 bytes, so _sifields is not 8
naturally bytes aligned.
Before the _pkey field addition the largest element of _sifields (on
32-bit platforms) was 32 bits. With the u64 added, the minimum alignment
requirement increased to 8 bytes on those (rare) 32-bit platforms. Thus
GCC padded the space after si_code with 4 extra bytes, and shifted all
_sifields offsets by 4 bytes - breaking the ABI of all of those
remaining fields.
On 64-bit platforms this problem was hidden due to _sifields already
having numerous fields with natural 8 bytes alignment (pointers).
To fix this, we replace the u64 with an '__u32'. The __u32 does not
increase the minimum alignment requirement of the union, and it is
also large enough to store the 16-bit pkey we have today on x86.
Reported-by: Stehen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Stehen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dave Hansen <dave@sr71.net>
Cc: Helge Deller <deller@gmx.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-next@vger.kernel.org
Fixes: cd0ea35ff5 ("signals, pkeys: Notify userspace about protection key faults")
Link: http://lkml.kernel.org/r/20160301125451.02C7426D@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
131 lines
3.1 KiB
C
131 lines
3.1 KiB
C
/*
|
|
* Based on <asm-i386/siginfo.h>.
|
|
*
|
|
* Modified 1998-2002
|
|
* David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
|
|
*/
|
|
#ifndef _UAPI_ASM_IA64_SIGINFO_H
|
|
#define _UAPI_ASM_IA64_SIGINFO_H
|
|
|
|
|
|
#define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
|
|
|
|
#define HAVE_ARCH_SIGINFO_T
|
|
#define HAVE_ARCH_COPY_SIGINFO
|
|
#define HAVE_ARCH_COPY_SIGINFO_TO_USER
|
|
|
|
#include <asm-generic/siginfo.h>
|
|
|
|
typedef struct siginfo {
|
|
int si_signo;
|
|
int si_errno;
|
|
int si_code;
|
|
int __pad0;
|
|
|
|
union {
|
|
int _pad[SI_PAD_SIZE];
|
|
|
|
/* kill() */
|
|
struct {
|
|
pid_t _pid; /* sender's pid */
|
|
uid_t _uid; /* sender's uid */
|
|
} _kill;
|
|
|
|
/* POSIX.1b timers */
|
|
struct {
|
|
timer_t _tid; /* timer id */
|
|
int _overrun; /* overrun count */
|
|
char _pad[sizeof(__ARCH_SI_UID_T) - sizeof(int)];
|
|
sigval_t _sigval; /* must overlay ._rt._sigval! */
|
|
int _sys_private; /* not to be passed to user */
|
|
} _timer;
|
|
|
|
/* POSIX.1b signals */
|
|
struct {
|
|
pid_t _pid; /* sender's pid */
|
|
uid_t _uid; /* sender's uid */
|
|
sigval_t _sigval;
|
|
} _rt;
|
|
|
|
/* SIGCHLD */
|
|
struct {
|
|
pid_t _pid; /* which child */
|
|
uid_t _uid; /* sender's uid */
|
|
int _status; /* exit code */
|
|
clock_t _utime;
|
|
clock_t _stime;
|
|
} _sigchld;
|
|
|
|
/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
|
|
struct {
|
|
void __user *_addr; /* faulting insn/memory ref. */
|
|
int _imm; /* immediate value for "break" */
|
|
unsigned int _flags; /* see below */
|
|
unsigned long _isr; /* isr */
|
|
short _addr_lsb; /* lsb of faulting address */
|
|
union {
|
|
/* used when si_code=SEGV_BNDERR */
|
|
struct {
|
|
void __user *_lower;
|
|
void __user *_upper;
|
|
} _addr_bnd;
|
|
/* used when si_code=SEGV_PKUERR */
|
|
__u32 _pkey;
|
|
};
|
|
} _sigfault;
|
|
|
|
/* SIGPOLL */
|
|
struct {
|
|
long _band; /* POLL_IN, POLL_OUT, POLL_MSG (XPG requires a "long") */
|
|
int _fd;
|
|
} _sigpoll;
|
|
} _sifields;
|
|
} siginfo_t;
|
|
|
|
#define si_imm _sifields._sigfault._imm /* as per UNIX SysV ABI spec */
|
|
#define si_flags _sifields._sigfault._flags
|
|
/*
|
|
* si_isr is valid for SIGILL, SIGFPE, SIGSEGV, SIGBUS, and SIGTRAP provided that
|
|
* si_code is non-zero and __ISR_VALID is set in si_flags.
|
|
*/
|
|
#define si_isr _sifields._sigfault._isr
|
|
|
|
/*
|
|
* Flag values for si_flags:
|
|
*/
|
|
#define __ISR_VALID_BIT 0
|
|
#define __ISR_VALID (1 << __ISR_VALID_BIT)
|
|
|
|
/*
|
|
* SIGILL si_codes
|
|
*/
|
|
#define ILL_BADIADDR (__SI_FAULT|9) /* unimplemented instruction address */
|
|
#define __ILL_BREAK (__SI_FAULT|10) /* illegal break */
|
|
#define __ILL_BNDMOD (__SI_FAULT|11) /* bundle-update (modification) in progress */
|
|
#undef NSIGILL
|
|
#define NSIGILL 11
|
|
|
|
/*
|
|
* SIGFPE si_codes
|
|
*/
|
|
#define __FPE_DECOVF (__SI_FAULT|9) /* decimal overflow */
|
|
#define __FPE_DECDIV (__SI_FAULT|10) /* decimal division by zero */
|
|
#define __FPE_DECERR (__SI_FAULT|11) /* packed decimal error */
|
|
#define __FPE_INVASC (__SI_FAULT|12) /* invalid ASCII digit */
|
|
#define __FPE_INVDEC (__SI_FAULT|13) /* invalid decimal digit */
|
|
#undef NSIGFPE
|
|
#define NSIGFPE 13
|
|
|
|
/*
|
|
* SIGSEGV si_codes
|
|
*/
|
|
#define __SEGV_PSTKOVF (__SI_FAULT|4) /* paragraph stack overflow */
|
|
#undef NSIGSEGV
|
|
#define NSIGSEGV 4
|
|
|
|
#undef NSIGTRAP
|
|
#define NSIGTRAP 4
|
|
|
|
|
|
#endif /* _UAPI_ASM_IA64_SIGINFO_H */
|