From: Marco Elver <elver@google.com>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Florian Weimer <fweimer@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Peter Collingbourne <pcc@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Alexander Potapenko <glider@google.com>,
sparclinux <sparclinux@vger.kernel.org>,
linux-arch <linux-arch@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux API <linux-api@vger.kernel.org>,
kasan-dev <kasan-dev@googlegroups.com>
Subject: Re: [PATCH 2/3] signal: Implement SIL_FAULT_TRAPNO
Date: Sat, 1 May 2021 12:33:27 +0200 [thread overview]
Message-ID: <CANpmjNNhd+qAy7tPSu=08_y-BZiowKigVkOh6HnXsxhWYuFpJA@mail.gmail.com> (raw)
In-Reply-To: <m1o8dvs7s7.fsf_-_@fess.ebiederm.org>
On Sat, 1 May 2021 at 00:54, Eric W. Biederman <ebiederm@xmission.com> wrote:
>
> Now that si_trapno is part of the union in _si_fault and available on
> all architectures, add SIL_FAULT_TRAPNO and update siginfo_layout to
> return SIL_FAULT_TRAPNO when si_trapno is actually used.
>
> Update the code that uses siginfo_layout to deal with SIL_FAULT_TRAPNO
> and have the same code ignore si_trapno in in all other cases.
>
> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
> ---
> fs/signalfd.c | 7 ++-----
> include/linux/signal.h | 1 +
> kernel/signal.c | 36 ++++++++++++++----------------------
> 3 files changed, 17 insertions(+), 27 deletions(-)
>
> diff --git a/fs/signalfd.c b/fs/signalfd.c
> index 040a1142915f..126c681a30e7 100644
> --- a/fs/signalfd.c
> +++ b/fs/signalfd.c
> @@ -123,15 +123,12 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo,
> */
> case SIL_FAULT:
> new.ssi_addr = (long) kinfo->si_addr;
> -#ifdef __ARCH_SI_TRAPNO
> + case SIL_FAULT_TRAPNO:
> + new.ssi_addr = (long) kinfo->si_addr;
> new.ssi_trapno = kinfo->si_trapno;
> -#endif
> break;
> case SIL_FAULT_MCEERR:
> new.ssi_addr = (long) kinfo->si_addr;
> -#ifdef __ARCH_SI_TRAPNO
> - new.ssi_trapno = kinfo->si_trapno;
> -#endif
> new.ssi_addr_lsb = (short) kinfo->si_addr_lsb;
> break;
> case SIL_PERF_EVENT:
> diff --git a/include/linux/signal.h b/include/linux/signal.h
> index 1e98548d7cf6..5160fd45e5ca 100644
> --- a/include/linux/signal.h
> +++ b/include/linux/signal.h
> @@ -40,6 +40,7 @@ enum siginfo_layout {
> SIL_TIMER,
> SIL_POLL,
> SIL_FAULT,
> + SIL_FAULT_TRAPNO,
> SIL_FAULT_MCEERR,
> SIL_FAULT_BNDERR,
> SIL_FAULT_PKUERR,
> diff --git a/kernel/signal.c b/kernel/signal.c
> index c3017aa8024a..7b2d61cb7411 100644
> --- a/kernel/signal.c
> +++ b/kernel/signal.c
> @@ -1194,6 +1194,7 @@ static inline bool has_si_pid_and_uid(struct kernel_siginfo *info)
> case SIL_TIMER:
> case SIL_POLL:
> case SIL_FAULT:
> + case SIL_FAULT_TRAPNO:
> case SIL_FAULT_MCEERR:
> case SIL_FAULT_BNDERR:
> case SIL_FAULT_PKUERR:
> @@ -2527,6 +2528,7 @@ static void hide_si_addr_tag_bits(struct ksignal *ksig)
> {
> switch (siginfo_layout(ksig->sig, ksig->info.si_code)) {
> case SIL_FAULT:
> + case SIL_FAULT_TRAPNO:
> case SIL_FAULT_MCEERR:
> case SIL_FAULT_BNDERR:
> case SIL_FAULT_PKUERR:
> @@ -3206,6 +3208,12 @@ enum siginfo_layout siginfo_layout(unsigned sig, int si_code)
> if ((sig == SIGBUS) &&
> (si_code >= BUS_MCEERR_AR) && (si_code <= BUS_MCEERR_AO))
> layout = SIL_FAULT_MCEERR;
> + else if (IS_ENABLED(ALPHA) &&
> + ((sig == SIGFPE) ||
> + ((sig == SIGTRAP) && (si_code == TRAP_UNK))))
> + layout = SIL_FAULT_TRAPNO;
> + else if (IS_ENABLED(SPARC) && (sig == SIGILL) && (si_code == ILL_ILLTRP))
> + layout = SIL_FAULT_TRAPNO;
The breakage isn't apparent here, but in later patches. These need to
become CONFIG_SPARC and CONFIG_ALPHA.
> else if ((sig == SIGSEGV) && (si_code == SEGV_BNDERR))
> layout = SIL_FAULT_BNDERR;
> #ifdef SEGV_PKUERR
> @@ -3317,30 +3325,22 @@ void copy_siginfo_to_external32(struct compat_siginfo *to,
> break;
> case SIL_FAULT:
> to->si_addr = ptr_to_compat(from->si_addr);
> -#ifdef __ARCH_SI_TRAPNO
> + break;
> + case SIL_FAULT_TRAPNO:
> + to->si_addr = ptr_to_compat(from->si_addr);
> to->si_trapno = from->si_trapno;
> -#endif
> break;
> case SIL_FAULT_MCEERR:
> to->si_addr = ptr_to_compat(from->si_addr);
> -#ifdef __ARCH_SI_TRAPNO
> - to->si_trapno = from->si_trapno;
> -#endif
> to->si_addr_lsb = from->si_addr_lsb;
> break;
> case SIL_FAULT_BNDERR:
> to->si_addr = ptr_to_compat(from->si_addr);
> -#ifdef __ARCH_SI_TRAPNO
> - to->si_trapno = from->si_trapno;
> -#endif
> to->si_lower = ptr_to_compat(from->si_lower);
> to->si_upper = ptr_to_compat(from->si_upper);
> break;
> case SIL_FAULT_PKUERR:
> to->si_addr = ptr_to_compat(from->si_addr);
> -#ifdef __ARCH_SI_TRAPNO
> - to->si_trapno = from->si_trapno;
> -#endif
> to->si_pkey = from->si_pkey;
> break;
> case SIL_PERF_EVENT:
> @@ -3401,30 +3401,22 @@ static int post_copy_siginfo_from_user32(kernel_siginfo_t *to,
> break;
> case SIL_FAULT:
> to->si_addr = compat_ptr(from->si_addr);
> -#ifdef __ARCH_SI_TRAPNO
> + break;
> + case SIL_FAULT_TRAPNO:
> + to->si_addr = compat_ptr(from->si_addr);
> to->si_trapno = from->si_trapno;
> -#endif
> break;
> case SIL_FAULT_MCEERR:
> to->si_addr = compat_ptr(from->si_addr);
> -#ifdef __ARCH_SI_TRAPNO
> - to->si_trapno = from->si_trapno;
> -#endif
> to->si_addr_lsb = from->si_addr_lsb;
> break;
> case SIL_FAULT_BNDERR:
> to->si_addr = compat_ptr(from->si_addr);
> -#ifdef __ARCH_SI_TRAPNO
> - to->si_trapno = from->si_trapno;
> -#endif
> to->si_lower = compat_ptr(from->si_lower);
> to->si_upper = compat_ptr(from->si_upper);
> break;
> case SIL_FAULT_PKUERR:
> to->si_addr = compat_ptr(from->si_addr);
> -#ifdef __ARCH_SI_TRAPNO
> - to->si_trapno = from->si_trapno;
> -#endif
> to->si_pkey = from->si_pkey;
> break;
> case SIL_PERF_EVENT:
> --
> 2.30.1
next prev parent reply other threads:[~2021-05-01 10:33 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 7:48 siginfo_t ABI break on sparc64 from si_addr_lsb move 3y ago Marco Elver
2021-04-29 17:23 ` Eric W. Biederman
2021-04-29 18:46 ` Marco Elver
2021-04-29 20:48 ` Arnd Bergmann
2021-04-30 17:08 ` Eric W. Biederman
2021-04-30 19:07 ` Marco Elver
2021-04-30 20:15 ` Eric W. Biederman
2021-04-30 23:50 ` Marco Elver
2021-04-30 22:49 ` [RFC][PATCH 0/3] signal: Move si_trapno into the _si_fault union Eric W. Biederman
2021-04-30 22:50 ` [PATCH 1/3] siginfo: Move si_trapno inside the union inside _si_fault Eric W. Biederman
2021-05-01 10:31 ` Marco Elver
2021-05-02 18:27 ` Eric W. Biederman
2021-04-30 22:54 ` [PATCH 2/3] signal: Implement SIL_FAULT_TRAPNO Eric W. Biederman
2021-04-30 23:19 ` Eric W. Biederman
2021-05-01 10:33 ` Marco Elver [this message]
2021-05-02 18:24 ` Eric W. Biederman
2021-04-30 22:55 ` [PATCH 3/3] signal: Use dedicated helpers to send signals with si_trapno set Eric W. Biederman
2021-05-01 10:33 ` Marco Elver
2021-04-30 22:56 ` [PATCH 4/3] signal: Remove __ARCH_SI_TRAPNO Eric W. Biederman
2021-04-30 23:23 ` Is perf_sigtrap synchronous? Eric W. Biederman
2021-05-01 0:28 ` Marco Elver
2021-04-30 23:42 ` [PATCH 5/3] signal: Rename SIL_PERF_EVENT SIL_FAULT_PERF_EVENT for consistency Eric W. Biederman
2021-05-01 10:35 ` Marco Elver
2021-04-30 23:43 ` [PATCH 6/3] signal: Factor force_sig_perf out of perf_sigtrap Eric W. Biederman
2021-05-01 10:45 ` Marco Elver
2021-04-30 23:43 ` [PATCH 7/3] signal: Deliver all of the perf_data in si_perf Eric W. Biederman
2021-05-01 10:47 ` Marco Elver
2021-05-02 18:39 ` Eric W. Biederman
2021-05-02 19:13 ` Marco Elver
2021-05-03 12:44 ` Peter Zijlstra
2021-05-03 19:38 ` Eric W. Biederman
2021-05-03 19:53 ` Marco Elver
2021-04-30 23:47 ` [RFC][PATCH 0/3] signal: Move si_trapno into the _si_fault union Eric W. Biederman
2021-05-01 0:37 ` Marco Elver
2021-05-01 15:16 ` Eric W. Biederman
2021-05-01 16:24 ` Marco Elver
2021-05-03 20:25 ` [PATCH 00/12] signal: sort out si_trapno and si_perf Eric W. Biederman
2021-05-03 20:38 ` [PATCH 01/12] sparc64: Add compile-time asserts for siginfo_t offsets Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 02/12] arm: " Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 03/12] arm64: " Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 04/12] siginfo: Move si_trapno inside the union inside _si_fault Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 05/12] signal: Implement SIL_FAULT_TRAPNO Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 06/12] signal: Use dedicated helpers to send signals with si_trapno set Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 07/12] signal: Remove __ARCH_SI_TRAPNO Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 08/12] signal: Rename SIL_PERF_EVENT SIL_FAULT_PERF_EVENT for consistency Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 09/12] signal: Factor force_sig_perf out of perf_sigtrap Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 10/12] signal: Redefine signinfo so 64bit fields are possible Eric W. Beiderman
2021-05-03 21:04 ` Eric W. Biederman
2021-05-03 22:47 ` Marco Elver
2021-05-04 3:42 ` Eric W. Biederman
2021-05-04 4:03 ` Peter Collingbourne
2021-05-04 9:52 ` Marco Elver
2021-05-04 16:16 ` Eric W. Biederman
2021-05-03 20:38 ` [PATCH 11/12] signal: Deliver all of the siginfo perf data in _perf Eric W. Beiderman
2021-05-03 20:38 ` [PATCH 12/12] signalfd: Remove SIL_FAULT_PERF_EVENT fields from signalfd_siginfo Eric W. Beiderman
2021-05-04 21:13 ` [PATCH v3 00/12] signal: sort out si_trapno and si_perf Eric W. Biederman
2021-05-04 22:05 ` Marco Elver
2021-05-05 14:12 ` Eric W. Biederman
2021-05-05 14:10 ` [PATCH v3 01/12] sparc64: Add compile-time asserts for siginfo_t offsets Eric W. Beiderman
2021-05-05 14:10 ` [PATCH v3 02/12] arm: " Eric W. Beiderman
2021-05-05 14:10 ` [PATCH v3 03/12] arm64: " Eric W. Beiderman
2021-05-05 14:10 ` [PATCH v3 04/12] signal: Verify the alignment and size of siginfo_t Eric W. Beiderman
2021-05-05 17:24 ` Marco Elver
2021-05-05 14:10 ` [PATCH v3 05/12] siginfo: Move si_trapno inside the union inside _si_fault Eric W. Beiderman
2021-05-05 14:10 ` [PATCH v3 06/12] signal: Implement SIL_FAULT_TRAPNO Eric W. Beiderman
2021-05-05 17:25 ` Marco Elver
2021-05-05 14:10 ` [PATCH v3 07/12] signal: Use dedicated helpers to send signals with si_trapno set Eric W. Beiderman
2021-05-05 17:25 ` Marco Elver
2021-05-05 14:10 ` [PATCH v3 08/12] signal: Remove __ARCH_SI_TRAPNO Eric W. Beiderman
2021-05-05 17:25 ` Marco Elver
2021-05-05 14:10 ` [PATCH v3 09/12] signal: Rename SIL_PERF_EVENT SIL_FAULT_PERF_EVENT for consistency Eric W. Beiderman
2021-05-05 17:26 ` Marco Elver
2021-05-05 14:10 ` [PATCH v3 10/12] signal: Factor force_sig_perf out of perf_sigtrap Eric W. Beiderman
2021-05-05 17:26 ` Marco Elver
2021-05-06 10:54 ` Peter Zijlstra
2021-05-05 14:11 ` [PATCH v3 11/12] signal: Deliver all of the siginfo perf data in _perf Eric W. Beiderman
2021-05-05 17:27 ` Marco Elver
2021-05-05 14:11 ` [PATCH v3 12/12] signalfd: Remove SIL_FAULT_PERF_EVENT fields from signalfd_siginfo Eric W. Beiderman
2021-05-05 17:27 ` Marco Elver
2021-05-05 17:28 ` [PATCH v3 00/12] signal: sort out si_trapno and si_perf Marco Elver
2021-05-06 7:00 ` Geert Uytterhoeven
2021-05-06 10:43 ` Marco Elver
2021-05-06 15:28 ` Eric W. Biederman
2021-05-06 15:14 ` Eric W. Biederman
2021-05-14 4:54 ` [GIT PULL] siginfo: ABI fixes for v5.13-rc2 Eric W. Biederman
2021-05-14 19:14 ` Linus Torvalds
2021-05-14 21:15 ` Eric W. Biederman
2021-05-14 22:38 ` Eric W. Biederman
2021-05-16 7:40 ` Ingo Molnar
2021-05-17 15:29 ` Eric W. Biederman
2021-05-21 14:59 ` [GIT PULL] siginfo: ABI fixes for v5.13-rc3 Eric W. Biederman
2021-05-21 16:34 ` pr-tracker-bot
2021-05-17 19:56 ` [PATCH v4 0/5] siginfo: ABI fixes for TRAP_PERF Eric W. Biederman
2021-05-17 19:57 ` [PATCH v4 1/5] siginfo: Move si_trapno inside the union inside _si_fault Eric W. Beiderman
2021-05-17 19:57 ` [PATCH v4 2/5] signal: Implement SIL_FAULT_TRAPNO Eric W. Beiderman
2021-05-17 19:57 ` [PATCH v4 3/5] signal: Factor force_sig_perf out of perf_sigtrap Eric W. Beiderman
2021-05-17 19:57 ` [PATCH v4 4/5] signal: Deliver all of the siginfo perf data in _perf Eric W. Beiderman
2021-05-17 19:57 ` [PATCH v4 5/5] signalfd: Remove SIL_PERF_EVENT fields from signalfd_siginfo Eric W. Beiderman
2021-05-17 20:53 ` [PATCH v4 0/5] siginfo: ABI fixes for TRAP_PERF Marco Elver
2021-05-18 3:46 ` Eric W. Biederman
2021-05-18 6:44 ` Marco Elver
2021-05-01 16:26 ` [RFC][PATCH 0/3] signal: Move si_trapno into the _si_fault union Marco Elver
2021-07-15 18:09 ` [PATCH 0/6] Final si_trapno bits Eric W. Biederman
2021-07-15 18:11 ` [PATCH 1/6] sparc64: Add compile-time asserts for siginfo_t offsets Eric W. Biederman
2021-07-15 18:11 ` [PATCH 2/6] arm: " Eric W. Biederman
2021-07-15 18:11 ` [PATCH 3/6] arm64: " Eric W. Biederman
2021-07-15 18:12 ` [PATCH 4/6] signal/sparc: si_trapno is only used with SIGILL ILL_ILLTRP Eric W. Biederman
2021-07-16 11:49 ` Marco Elver
2021-07-15 18:12 ` [PATCH 5/6] signal/alpha: si_trapno is only used with SIGFPE and SIGTRAP TRAP_UNK Eric W. Biederman
2021-07-16 11:48 ` Marco Elver
2021-07-15 18:13 ` [PATCH 6/6] signal: Remove the generic __ARCH_SI_TRAPNO support Eric W. Biederman
2021-07-16 11:48 ` Marco Elver
2021-07-16 11:50 ` [PATCH 0/6] Final si_trapno bits Marco Elver
2021-07-16 16:08 ` Eric W. Biederman
2021-07-16 17:15 ` Marco Elver
2021-07-16 16:06 ` [PATCH 7/7] signal: Verify the alignment and size of siginfo_t Eric W. Biederman
2021-07-16 16:07 ` [PATCH 8/6] signal: Rename SIL_PERF_EVENT SIL_FAULT_PERF_EVENT for consistency Eric W. Biederman
2021-04-30 20:43 ` siginfo_t ABI break on sparc64 from si_addr_lsb move 3y ago Arnd Bergmann
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='CANpmjNNhd+qAy7tPSu=08_y-BZiowKigVkOh6HnXsxhWYuFpJA@mail.gmail.com' \
--to=elver@google.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=dvyukov@google.com \
--cc=ebiederm@xmission.com \
--cc=fweimer@redhat.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=pcc@google.com \
--cc=peterz@infradead.org \
--cc=sparclinux@vger.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).