Pull siginfo fix from Eric Biederman: "During the merge window an issue with si_perf and the siginfo ABI came up. The alpha and sparc siginfo structure layout had changed with the addition of SIGTRAP TRAP_PERF and the new field si_perf. The reason only alpha and sparc were affected is that they are the only architectures that use si_trapno. Looking deeper it was discovered that si_trapno is used for only a few select signals on alpha and sparc, and that none of the other _sigfault fields past si_addr are used at all. Which means technically no regression on alpha and sparc. While the alignment concerns might be dismissed the abuse of si_errno by SIGTRAP TRAP_PERF does have the potential to cause regressions in existing userspace. While we still have time before userspace starts using and depending on the new definition siginfo for SIGTRAP TRAP_PERF this set of changes cleans up siginfo_t. - The si_trapno field is demoted from magic alpha and sparc status and made an ordinary union member of the _sigfault member of siginfo_t. Without moving it of course. - si_perf is replaced with si_perf_data and si_perf_type ending the abuse of si_errno. - Unnecessary additions to signalfd_siginfo are removed" * 'for-v5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: signalfd: Remove SIL_PERF_EVENT fields from signalfd_siginfo signal: Deliver all of the siginfo perf data in _perf signal: Factor force_sig_perf out of perf_sigtrap signal: Implement SIL_FAULT_TRAPNO siginfo: Move si_trapno inside the union inside _si_fault
Showing the changes to include/uapi/linux (2 of 12 files). Show all
Unified · Split
| @@ -464,7 +464,7 @@ struct perf_event_attr { · 463 unmodified lines | ||
| 464 | 464 | |
| 465 | 465 | /* |
| 466 | 466 | * User provided data if sigtrap=1, passed back to user via |
| 467 | − * siginfo_t::si_perf, e.g. to permit user to identify the event. | |
| 467 | + * siginfo_t::si_perf_data, e.g. to permit user to identify the event. | |
| 468 | 468 | */ |
| 469 | 469 | __u64 sig_data; |
| 470 | 470 | }; |
| @@ -39,8 +39,6 @@ struct signalfd_siginfo { · 38 unmodified lines | ||
| 39 | 39 | __s32 ssi_syscall; |
| 40 | 40 | __u64 ssi_call_addr; |
| 41 | 41 | __u32 ssi_arch; |
| 42 | − __u32 __pad3; | |
| 43 | − __u64 ssi_perf; | |
| 44 | 42 | |
| 45 | 43 | /* |
| 46 | 44 | * Pad strcture to 128 bytes. Remember to update the |
| @@ -51,7 +49,7 @@ struct signalfd_siginfo { · 4 unmodified lines | ||
| 51 | 49 | * comes out of a read(2) and we really don't want to have |
| 52 | 50 | * a compat on read(2). |
| 53 | 51 | */ |
| 54 | − __u8 __pad[16]; | |
| 52 | + __u8 __pad[28]; | |
| 55 | 53 | }; |
| 56 | 54 | |
| 57 | 55 | |