mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Yury Norov <ynorov@caviumnetworks.com>
To: <catalin.marinas@arm.com>, <arnd@arndb.de>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>
Cc: <pinskia@gmail.com>, <ddaney.cavm@gmail.com>,
	<jan.dakinevich@gmail.com>, <Prasun.Kapoor@caviumnetworks.com>,
	<christoph.muellner@theobroma-systems.com>,
	<philipp.tomsich@theobroma-systems.com>, <broonie@kernel.org>,
	<andrey.konovalov@linaro.org>, <Nathan_Lynch@mentor.com>,
	<agraf@suse.de>, <bamvor.zhangjian@huawei.com>,
	<klimov.linux@gmail.com>, Andrew Pinski <apinski@cavium.com>,
	Yury Norov <ynorov@caviumnetworks.com>,
	Andrew Pinski <Andrew.Pinski@caviumnetworks.com>
Subject: [PATCH v6 05/17] arm64:ilp32: share signal structures between ILP32 and LP64 ABIs
Date: Tue, 3 Nov 2015 02:30:34 +0300	[thread overview]
Message-ID: <1446507046-24604-6-git-send-email-ynorov@caviumnetworks.com> (raw)
In-Reply-To: <1446507046-24604-1-git-send-email-ynorov@caviumnetworks.com>

From: Andrew Pinski <apinski@cavium.com>

Defines the macros which allow the signal structures to be the same between
ILP32 and LP64.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
Signed-off-by: Yury Norov <ynorov@caviumnetworks.com>
Signed-off-by: Andrew Pinski <Andrew.Pinski@caviumnetworks.com>
Reviewed-by: David Daney <david.daney@cavium.com>
---
 arch/arm64/include/uapi/asm/siginfo.h | 21 +++++++++++++++++++++
 arch/arm64/include/uapi/asm/signal.h  | 31 +++++++++++++++++++++++++++++++
 include/uapi/asm-generic/siginfo.h    | 17 +++++++++++++----
 include/uapi/asm-generic/signal.h     | 27 +++++++++++++++++++++++----
 4 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/include/uapi/asm/siginfo.h b/arch/arm64/include/uapi/asm/siginfo.h
index 5a74a08..d9ac7d4 100644
--- a/arch/arm64/include/uapi/asm/siginfo.h
+++ b/arch/arm64/include/uapi/asm/siginfo.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012 ARM Ltd.
+ * Copyright (C) 2015 Cavium Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -18,6 +19,26 @@
 
 #define __ARCH_SI_PREAMBLE_SIZE	(4 * sizeof(int))
 
+#ifdef __ILP32__
+# ifdef __AARCH64EB__
+#  define __SIGINFO_INNER(type, field)		\
+		int __pad#field;		\
+		type field
+# else
+#  define __SIGINFO_INNER(type, field)		\
+		type field;			\
+		int __pad#field
+# endif
+
+# undef __SIGINFO_VOIDPOINTER
+# define __SIGINFO_VOIDPOINTER(field)		\
+		__SIGINFO_INNER(void __user*, field)
+# undef __SIGINFO_BAND
+
+# define __SIGINFO_BAND(field)			\
+	__SIGINFO_INNER(long, field)
+#endif
+
 #include <asm-generic/siginfo.h>
 
 #endif
diff --git a/arch/arm64/include/uapi/asm/signal.h b/arch/arm64/include/uapi/asm/signal.h
index 991bf5d..5053af4 100644
--- a/arch/arm64/include/uapi/asm/signal.h
+++ b/arch/arm64/include/uapi/asm/signal.h
@@ -22,6 +22,37 @@
 #define MINSIGSTKSZ 5120
 #define SIGSTKSZ    16384
 
+/* For ILP32, sigset should be the same size fields as LP64 so use
+   unsigned long long. */
+#ifdef __ILP32__
+#define __SIGSET_INNER_TYPE __extension__ unsigned long long
+#define _NSIG_BPW 64
+
+# ifdef __AARCH64EB__
+#  define __SIGNAL_INNER(type, field)		\
+	__extension__ struct {			\
+		int __pad_##field;		\
+		type field;			\
+	} __attribute__((aligned(8)))
+# else
+#  define __SIGNAL_INNER(type, field)		\
+	__extension__ struct {			\
+		type field;			\
+		int __pad_##field;		\
+	} __attribute__((aligned(8)))
+# endif
+
+# define __SIGACTION_HANDLER(field)		\
+	__SIGNAL_INNER(__sighandler_t, field)
+
+#define __SIGACTION_FLAGS(field)		\
+	__extension__ unsigned long long field
+
+#define __SIGACTION_RESTORER(field)		\
+	__SIGNAL_INNER(__sigrestore_t, field)
+
+#endif
+
 #include <asm-generic/signal.h>
 
 #endif
diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index 1e35520..be640a9 100644
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -4,9 +4,17 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 
+#ifndef __SIGINFO_VOIDPOINTER
+#define __SIGINFO_VOIDPOINTER(field) void __user *field
+#endif
+
+#ifndef __SIGINFO_BAND
+#define __SIGINFO_BAND(field) __ARCH_SI_BAND_T field
+#endif
+
 typedef union sigval {
 	int sival_int;
-	void __user *sival_ptr;
+	__SIGINFO_VOIDPOINTER(sival_ptr);
 } sigval_t;
 
 /*
@@ -86,7 +94,7 @@ typedef struct siginfo {
 
 		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */
 		struct {
-			void __user *_addr; /* faulting insn/memory ref. */
+			__SIGINFO_VOIDPOINTER(_addr); /* faulting insn/memory ref. */
 #ifdef __ARCH_SI_TRAPNO
 			int _trapno;	/* TRAP # which caused the signal */
 #endif
@@ -99,13 +107,13 @@ typedef struct siginfo {
 
 		/* SIGPOLL */
 		struct {
-			__ARCH_SI_BAND_T _band;	/* POLL_IN, POLL_OUT, POLL_MSG */
+			__SIGINFO_BAND(_band);	/* POLL_IN, POLL_OUT, POLL_MSG */
 			int _fd;
 		} _sigpoll;
 
 		/* SIGSYS */
 		struct {
-			void __user *_call_addr; /* calling user insn */
+			__SIGINFO_VOIDPOINTER(_call_addr); /* calling user insn */
 			int _syscall;	/* triggering system call number */
 			unsigned int _arch;	/* AUDIT_ARCH_* of syscall */
 		} _sigsys;
@@ -290,6 +298,7 @@ typedef struct sigevent {
 		int _pad[SIGEV_PAD_SIZE];
 		 int _tid;
 
+		/* Note these two are handled only in userspace */
 		struct {
 			void (*_function)(sigval_t);
 			void *_attribute;	/* really pthread_attr_t */
diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h
index 3094618..92d8ce3 100644
--- a/include/uapi/asm-generic/signal.h
+++ b/include/uapi/asm-generic/signal.h
@@ -4,7 +4,9 @@
 #include <linux/types.h>
 
 #define _NSIG		64
+#ifndef _NSIG_BPW
 #define _NSIG_BPW	__BITS_PER_LONG
+#endif
 #define _NSIG_WORDS	(_NSIG / _NSIG_BPW)
 
 #define SIGHUP		 1
@@ -85,9 +87,13 @@
 #define SIGSTKSZ	8192
 #endif
 
+#ifndef __SIGSET_INNER_TYPE
+#define __SIGSET_INNER_TYPE unsigned long
+#endif
+
 #ifndef __ASSEMBLY__
 typedef struct {
-	unsigned long sig[_NSIG_WORDS];
+	__SIGSET_INNER_TYPE sig[_NSIG_WORDS];
 } sigset_t;
 
 /* not actually used, but required for linux/syscalls.h */
@@ -100,11 +106,24 @@ typedef unsigned long old_sigset_t;
 #endif
 
 #ifndef __KERNEL__
+
+#ifndef __SIGACTION_HANDLER
+#define __SIGACTION_HANDLER(field)	__sighandler_t field
+#endif
+
+#ifndef __SIGACTION_FLAGS
+#define __SIGACTION_FLAGS(field)	unsigned long field
+#endif
+
+#ifndef __SIGACTION_RESTORER
+#define __SIGACTION_RESTORER(field)	__sigrestore_t field
+#endif
+
 struct sigaction {
-	__sighandler_t sa_handler;
-	unsigned long sa_flags;
+	__SIGACTION_HANDLER(sa_handler);
+	__SIGACTION_FLAGS(sa_flags);
 #ifdef SA_RESTORER
-	__sigrestore_t sa_restorer;
+	__SIGACTION_RESTORER(sa_restorer);
 #endif
 	sigset_t sa_mask;		/* mask last for extensibility */
 };
-- 
2.1.4


  parent reply	other threads:[~2015-11-02 23:32 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-02 23:30 [RFC PATCH v6 00/17] ILP32 for ARM64 Yury Norov
2015-11-02 23:30 ` [PATCH v6 01/17] arm64:ilp32: add documentation on the ILP32 ABI " Yury Norov
2015-11-05 14:33   ` Arnd Bergmann
2015-11-02 23:30 ` [PATCH v6 02/17] arm64: ensure the kernel is compiled for LP64 Yury Norov
2015-11-02 23:30 ` [PATCH v6 03/17] arm64: rename COMPAT to AARCH32_EL0 in Kconfig Yury Norov
2015-11-02 23:30 ` [PATCH v6 04/17] arm64: change some CONFIG_COMPAT over to use CONFIG_AARCH32_EL0 instead Yury Norov
2015-11-02 23:30 ` Yury Norov [this message]
2015-11-02 23:30 ` [PATCH v6 06/17] arm64: introduce is_a32_task and is_a32_thread (for AArch32 compat) Yury Norov
2015-11-02 23:30 ` [PATCH v6 07/17] arm64:ilp32: add is_ilp32_compat_{task,thread} and TIF_32BIT_AARCH64 Yury Norov
2015-11-02 23:30 ` [PATCH v6 08/17] arm64:ilp32: share HWCAP between LP64 and ILP32 Yury Norov
2015-11-02 23:30 ` [PATCH v6 09/17] arm64:ilp32 use the native LP64 'start_thread' for ILP32 threads Yury Norov
2015-11-02 23:30 ` [PATCH v6 10/17] arm64:ilp32: support core dump generation for ILP32 Yury Norov
2015-11-02 23:30 ` [PATCH v6 11/17] ptrace: Allow compat to use the native siginfo Yury Norov
2015-11-05 13:53   ` Arnd Bergmann
2015-11-02 23:30 ` [PATCH v6 12/17] ilp32: common 32-bit wrappers Yury Norov
2015-11-02 23:30 ` [PATCH v6 13/17] arm64:ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it Yury Norov
2015-11-05 13:50   ` Arnd Bergmann
2015-11-11 17:54   ` Andreas Schwab
2015-11-11 20:40     ` Arnd Bergmann
2015-11-11 23:07       ` Andreas Schwab
2015-11-11 23:23         ` Arnd Bergmann
2015-11-12  8:58           ` Andreas Schwab
2015-11-12  9:22             ` Arnd Bergmann
2015-11-12  9:44               ` Andreas Schwab
2015-11-12 13:24                 ` Arnd Bergmann
2015-11-12 13:47                   ` Andreas Schwab
2015-11-13 15:34                     ` Arnd Bergmann
2015-11-13 15:38                       ` Andrew Pinski
2015-11-13 16:10                         ` Arnd Bergmann
2015-11-15 15:18                           ` Arnd Bergmann
2015-11-15 16:42                             ` Chris Metcalf
2015-11-16 10:16                               ` Joseph Myers
2015-11-16 11:00                                 ` Arnd Bergmann
2015-11-16 11:12                                   ` Joseph Myers
2015-11-16 11:40                                     ` Arnd Bergmann
2015-11-16 12:03                                       ` Joseph Myers
2015-11-16 12:12                                         ` Arnd Bergmann
2015-11-16 12:34                                           ` Joseph Myers
2015-11-16 13:15                                             ` Arnd Bergmann
2015-11-16 13:34                                               ` Andreas Schwab
2015-11-16 13:54                                                 ` Arnd Bergmann
2015-11-02 23:30 ` [PATCH v6 14/17] aarch64: ilp32: use generic stat64 structure Yury Norov
2015-11-05 14:03   ` Arnd Bergmann
2015-11-02 23:30 ` [PATCH v6 15/17] arm64:ilp32: use the native siginfo instead of the compat siginfo Yury Norov
2015-11-02 23:30 ` [PATCH v6 16/17] arm64:ilp32: change COMPAT_ELF_PLATFORM to report a a subplatform for ILP32 Yury Norov
2015-11-02 23:30 ` [PATCH v6 17/17] arm64:ilp32: add ARM64_ILP32 to Kconfig Yury Norov
2015-11-05 11:36 ` [RFC PATCH v6 00/17] ILP32 for ARM64 Andreas Schwab
2015-11-05 13:39   ` Andrew Pinski
2015-11-05 22:18     ` Yury Norov
2015-11-09 10:01       ` Andreas Schwab
2015-11-11  7:16         ` Zhangjian (Bamvor)
2015-11-11  8:44           ` Andreas Schwab
2015-11-09 13:23       ` Andreas Schwab
2015-11-09 14:21         ` Arnd Bergmann
2015-11-09 14:33           ` Andreas Schwab
2015-11-09 14:36             ` Arnd Bergmann
2015-11-09 14:52               ` pinskia
2015-11-09 15:50                 ` Yury Norov
2015-11-09 16:04                   ` Yury Norov
2015-12-01 22:55 ` Iosif Harutyunov
2015-12-03 17:05   ` Yury Norov

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=1446507046-24604-6-git-send-email-ynorov@caviumnetworks.com \
    --to=ynorov@caviumnetworks.com \
    --cc=Andrew.Pinski@caviumnetworks.com \
    --cc=Nathan_Lynch@mentor.com \
    --cc=Prasun.Kapoor@caviumnetworks.com \
    --cc=agraf@suse.de \
    --cc=andrey.konovalov@linaro.org \
    --cc=apinski@cavium.com \
    --cc=arnd@arndb.de \
    --cc=bamvor.zhangjian@huawei.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=christoph.muellner@theobroma-systems.com \
    --cc=ddaney.cavm@gmail.com \
    --cc=jan.dakinevich@gmail.com \
    --cc=klimov.linux@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=philipp.tomsich@theobroma-systems.com \
    --cc=pinskia@gmail.com \
    /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

all inboxes | Powered by JetHome®