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

Groups > linux.kernel > #1336626 > unrolled thread

[PATCH] signals, ia64, mips: update arch-specific siginfos with pkeys field

Started byDave Hansen <dave@sr71.net>
First post2016-02-17 19:20 +0100
Last post2016-02-18 21:30 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] signals, ia64, mips: update arch-specific siginfos with pkeys field Dave Hansen <dave@sr71.net> - 2016-02-17 19:20 +0100
    Re: [PATCH] signals, ia64, mips: update arch-specific siginfos with  pkeys field Ingo Molnar <mingo@kernel.org> - 2016-02-18 11:20 +0100
    [tip:mm/pkeys] signals, ia64, mips:   Update arch-specific siginfos with pkeys field tip-bot for Dave Hansen <tipbot@zytor.com> - 2016-02-18 21:30 +0100

#1336626 — [PATCH] signals, ia64, mips: update arch-specific siginfos with pkeys field

FromDave Hansen <dave@sr71.net>
Date2016-02-17 19:20 +0100
Subject[PATCH] signals, ia64, mips: update arch-specific siginfos with pkeys field
Message-ID<r3eRI-1IR-21@gated-at.bofh.it>
This fixes a compile error that Ingo was hitting with MIPS when the
x86 pkeys patch set is applied.

ia64 and mips have separate definitions for siginfo from the
generic one.  Patch them to have the pkey fields.

Note that this is exactly what we did for MPX as well.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: linux-mips@linux-mips.org
Cc: linux-ia64@vger.kernel.org
---

 b/arch/ia64/include/uapi/asm/siginfo.h |   13 +++++++++----
 b/arch/mips/include/uapi/asm/siginfo.h |   13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff -puN arch/ia64/include/uapi/asm/siginfo.h~pkeys-09-1-siginfo-for-mips-ia64 arch/ia64/include/uapi/asm/siginfo.h
--- a/arch/ia64/include/uapi/asm/siginfo.h~pkeys-09-1-siginfo-for-mips-ia64	2016-02-17 09:32:06.001815266 -0800
+++ b/arch/ia64/include/uapi/asm/siginfo.h	2016-02-17 09:32:06.010815672 -0800
@@ -63,10 +63,15 @@ typedef struct siginfo {
 			unsigned int _flags;	/* see below */
 			unsigned long _isr;	/* isr */
 			short _addr_lsb;	/* lsb of faulting address */
-			struct {
-				void __user *_lower;
-				void __user *_upper;
-			} _addr_bnd;
+			union {
+				/* used when si_code=SEGV_BNDERR */
+				struct {
+					void __user *_lower;
+					void __user *_upper;
+				} _addr_bnd;
+				/* used when si_code=SEGV_PKUERR */
+				u64 _pkey;
+			};
 		} _sigfault;
 
 		/* SIGPOLL */
diff -puN arch/mips/include/uapi/asm/siginfo.h~pkeys-09-1-siginfo-for-mips-ia64 arch/mips/include/uapi/asm/siginfo.h
--- a/arch/mips/include/uapi/asm/siginfo.h~pkeys-09-1-siginfo-for-mips-ia64	2016-02-17 09:32:06.003815357 -0800
+++ b/arch/mips/include/uapi/asm/siginfo.h	2016-02-17 09:32:06.010815672 -0800
@@ -86,10 +86,15 @@ typedef struct siginfo {
 			int _trapno;	/* TRAP # which caused the signal */
 #endif
 			short _addr_lsb;
-			struct {
-				void __user *_lower;
-				void __user *_upper;
-			} _addr_bnd;
+			union {
+				/* used when si_code=SEGV_BNDERR */
+				struct {
+					void __user *_lower;
+					void __user *_upper;
+				} _addr_bnd;
+				/* used when si_code=SEGV_PKUERR */
+				u64 _pkey;
+			};
 		} _sigfault;
 
 		/* SIGPOLL, SIGXFSZ (To do ...)	 */
_

[toc] | [next] | [standalone]

#1337221 — Re: [PATCH] signals, ia64, mips: update arch-specific siginfos with pkeys field

FromIngo Molnar <mingo@kernel.org>
Date2016-02-18 11:20 +0100
SubjectRe: [PATCH] signals, ia64, mips: update arch-specific siginfos with pkeys field
Message-ID<r3tQK-3ZS-1@gated-at.bofh.it>
In reply to#1336626
* Dave Hansen <dave@sr71.net> wrote:

> 
> This fixes a compile error that Ingo was hitting with MIPS when the
> x86 pkeys patch set is applied.
> 
> ia64 and mips have separate definitions for siginfo from the
> generic one.  Patch them to have the pkey fields.
> 
> Note that this is exactly what we did for MPX as well.
> 
> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: linux-mips@linux-mips.org
> Cc: linux-ia64@vger.kernel.org
> ---
> 
>  b/arch/ia64/include/uapi/asm/siginfo.h |   13 +++++++++----
>  b/arch/mips/include/uapi/asm/siginfo.h |   13 +++++++++----
>  2 files changed, 18 insertions(+), 8 deletions(-)

This solved the MIPS and IA64 build problems, but there's still one bug left: UML 
does not build:

 /home/mingo/tip/mm/gup.c: In function ‘check_vma_flags’:
 /home/mingo/tip/mm/gup.c:456:2: error: implicit declaration of function ‘arch_vma_access_permitted’ [-Werror=implicit-function-declaration]
   if (!arch_vma_access_permitted(vma, write, false, foreign))
 [...]

Please send a delta patch for this too.

Thanks,

	Ingo

[toc] | [prev] | [next] | [standalone]

#1337701 — [tip:mm/pkeys] signals, ia64, mips: Update arch-specific siginfos with pkeys field

Fromtip-bot for Dave Hansen <tipbot@zytor.com>
Date2016-02-18 21:30 +0100
Subject[tip:mm/pkeys] signals, ia64, mips: Update arch-specific siginfos with pkeys field
Message-ID<r3Dn4-2Bf-19@gated-at.bofh.it>
In reply to#1336626
Commit-ID:  b376cd0256f86db3078409dc51963b315c7843d8
Gitweb:     http://git.kernel.org/tip/b376cd0256f86db3078409dc51963b315c7843d8
Author:     Dave Hansen <dave@sr71.net>
AuthorDate: Wed, 17 Feb 2016 10:17:03 -0800
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 18 Feb 2016 09:32:42 +0100

signals, ia64, mips: Update arch-specific siginfos with pkeys field

ia64 and mips have separate definitions for siginfo from the
generic one.  Patch them to have the pkey fields.

Note that this is exactly what we did for MPX as well.

[ This fixes a compile error that Ingo was hitting with MIPS when the
  x86 pkeys patch set is applied. ]

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Petr Malat <oss@malat.biz>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-ia64@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20160217181703.E99B6656@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/ia64/include/uapi/asm/siginfo.h | 13 +++++++++----
 arch/mips/include/uapi/asm/siginfo.h | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/arch/ia64/include/uapi/asm/siginfo.h b/arch/ia64/include/uapi/asm/siginfo.h
index bce9bc1..0151cfa 100644
--- a/arch/ia64/include/uapi/asm/siginfo.h
+++ b/arch/ia64/include/uapi/asm/siginfo.h
@@ -63,10 +63,15 @@ typedef struct siginfo {
 			unsigned int _flags;	/* see below */
 			unsigned long _isr;	/* isr */
 			short _addr_lsb;	/* lsb of faulting address */
-			struct {
-				void __user *_lower;
-				void __user *_upper;
-			} _addr_bnd;
+			union {
+				/* used when si_code=SEGV_BNDERR */
+				struct {
+					void __user *_lower;
+					void __user *_upper;
+				} _addr_bnd;
+				/* used when si_code=SEGV_PKUERR */
+				u64 _pkey;
+			};
 		} _sigfault;
 
 		/* SIGPOLL */
diff --git a/arch/mips/include/uapi/asm/siginfo.h b/arch/mips/include/uapi/asm/siginfo.h
index 2cb7fde..6f4edf0 100644
--- a/arch/mips/include/uapi/asm/siginfo.h
+++ b/arch/mips/include/uapi/asm/siginfo.h
@@ -86,10 +86,15 @@ typedef struct siginfo {
 			int _trapno;	/* TRAP # which caused the signal */
 #endif
 			short _addr_lsb;
-			struct {
-				void __user *_lower;
-				void __user *_upper;
-			} _addr_bnd;
+			union {
+				/* used when si_code=SEGV_BNDERR */
+				struct {
+					void __user *_lower;
+					void __user *_upper;
+				} _addr_bnd;
+				/* used when si_code=SEGV_PKUERR */
+				u64 _pkey;
+			};
 		} _sigfault;
 
 		/* SIGPOLL, SIGXFSZ (To do ...)	 */

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web