Page MenuHomeFreeBSD
Differential D14637

Remove very old and unused signal information codes.
ClosedPublic
Actions

Authored by jhb on Mar 10 2018, 12:03 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Feb 25, 8:43 AM
Unknown Object (File)
Feb 20 2025, 7:59 PM
Unknown Object (File)
Feb 20 2025, 2:09 AM
Unknown Object (File)
Feb 18 2025, 4:23 AM
Unknown Object (File)
Feb 17 2025, 10:34 PM
Unknown Object (File)
Feb 12 2025, 8:50 AM
Unknown Object (File)
Feb 12 2025, 3:53 AM
Unknown Object (File)
Feb 4 2025, 1:07 AM
View All 65 Files
Subscribers
imp
rpokala

Details

Reviewers
bz
kib
gnn
Commits
rS331650: Remove very old and unused signal information codes.
Summary

These have been supplanted by the MI signal information codes in
<sys/signal.h> since 7.0. The FPE_*_TRAP ones were deprecated even
earlier in 1999.

Test Plan
  • waiting on a tinderbox to finish, but I'm quite certain these aren't used anywhere

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jhb created this revision.Mar 10 2018, 12:03 AM
Harbormaster completed remote builds in B15462: Diff 40120.Mar 10 2018, 12:03 AM
kib added inline comments.Mar 10 2018, 12:30 AM
sys/x86/include/signal.h
48 ↗(On Diff #40120)

I do not object against this part, but the pollution might be relied upon by third-party software. I do not know.

sys/x86/include/trap.h
88 ↗(On Diff #40120)

At least BUS_PAGE_FAULT is used in kernel.

jhb added inline comments.Mar 12 2018, 5:17 PM
sys/x86/include/signal.h
48 ↗(On Diff #40120)

I can request an exp-run to check for this.

sys/x86/include/trap.h
88 ↗(On Diff #40120)

This is only for legacy binaries though (< 7.0), so I think we can just hide that specific use case under #ifdef _KERNEL. We could also make the tunable depend on #ifdef COMPAT_FREEBSD6? (And just always use SIGSEGV on kernels without COMPAT_FREEBSD6?) Alternatively, the compat shim could just use 'T_PAGEFLT' directly for ucode (this matches what the code did prior to the siginfo commit).

kib added inline comments.Mar 12 2018, 5:38 PM
sys/x86/include/signal.h
48 ↗(On Diff #40120)

Ok.

sys/x86/include/trap.h
88 ↗(On Diff #40120)

I do not see a reason to not use T_PAGEFLT directly.

jhb updated this revision to Diff 40252.Mar 13 2018, 4:57 PM
  • Use T_PAGEFLT directly for the legacy page fault signal code.
  • Use T_PAGEFLT on i386 as well.
  • Add <machine/trap.h> #include's.
Harbormaster completed remote builds in B15544: Diff 40252.Mar 13 2018, 4:57 PM
kib accepted this revision.Mar 13 2018, 5:49 PM
This revision is now accepted and ready to land.Mar 13 2018, 5:49 PM
Closed by commit rS331650: Remove very old and unused signal information codes. (authored by jhb). · Explain WhyMar 27 2018, 8:58 PM
This revision was automatically updated to reflect the committed changes.
Herald added a reviewer: gnn. · View Herald TranscriptMar 27 2018, 8:58 PM
Herald added subscribers: rpokala, imp. · View Herald Transcript

Revision Contents
Changeset List

PathSize
head/
sys/
amd64/
amd64/
5 lines
ia32/
1 line
linux/
1 line
linux32/
1 line
cddl/
contrib/
opensolaris/
uts/
intel/
dtrace/
1 line
dev/
dtrace/
amd64/
1 line
i386/
1 line
i386/
i386/
5 lines
linux/
1 line
x86/
include/
4 lines
24 lines

Diff 40821

View Options

head/sys/amd64/amd64/trap.c

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#define CAPH_IGNORE_EBADF 0x0001 #define CAPH_IGNORE_EBADF 0x0001
#define CAPH_READ 0x0002 #define CAPH_READ 0x0002
#define CAPH_WRITE 0x0004 #define CAPH_WRITE 0x0004
#define CAPH_LOOKUP 0x0008 #define CAPH_LOOKUP 0x0008
__BEGIN_DECLS __BEGIN_DECLS
static __inline int static const unsigned long caph_stream_cmds[] =
caph_limit_stream(int fd, int flags) { TIOCGETA, TIOCGWINSZ, FIODTYPE };
static const uint32_t caph_stream_fcntls = CAP_FCNTL_GETFL;
static __inline void
caph_stream_rights(cap_rights_t *rights, int flags)
markjUnsubmitted
Done
Inline Actions

I think the backslash is not needed.

markj: I think the backslash is not needed.
{ {
cap_rights_t rights;
unsigned long cmds[] = { TIOCGETA, TIOCGWINSZ, FIODTYPE };
cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT, cap_rights_init(rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT,
CAP_IOCTL, CAP_SEEK); CAP_IOCTL, CAP_SEEK);
if ((flags & CAPH_READ) != 0) if ((flags & CAPH_READ) != 0)
cap_rights_set(&rights, CAP_READ); cap_rights_set(rights, CAP_READ);
if ((flags & CAPH_WRITE) != 0) if ((flags & CAPH_WRITE) != 0)
cap_rights_set(&rights, CAP_WRITE); cap_rights_set(rights, CAP_WRITE);
if ((flags & CAPH_LOOKUP) != 0) if ((flags & CAPH_LOOKUP) != 0)
cap_rights_set(&rights, CAP_LOOKUP); cap_rights_set(rights, CAP_LOOKUP);
}
static __inline int
caph_limit_stream(int fd, int flags)
{
cap_rights_t rights;
caph_stream_rights(&rights, flags);
if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) { if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) {
if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0) if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0)
return (0); return (0);
return (-1); return (-1);
} }
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) < 0 && errno != ENOSYS) if (cap_ioctls_limit(fd, caph_stream_cmds,
nitems(caph_stream_cmds)) < 0 && errno != ENOSYS)
return (-1); return (-1);
if (cap_fcntls_limit(fd, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) if (cap_fcntls_limit(fd, caph_stream_fcntls) < 0 && errno != ENOSYS)
return (-1); return (-1);
return (0); return (0);
} }
static __inline int static __inline int
caph_limit_stdin(void) caph_limit_stdin(void)
{ {
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines
View Options

head/sys/amd64/ia32/ia32_signal.c

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#define CAPH_IGNORE_EBADF 0x0001 #define CAPH_IGNORE_EBADF 0x0001
#define CAPH_READ 0x0002 #define CAPH_READ 0x0002
#define CAPH_WRITE 0x0004 #define CAPH_WRITE 0x0004
#define CAPH_LOOKUP 0x0008 #define CAPH_LOOKUP 0x0008
__BEGIN_DECLS __BEGIN_DECLS
static __inline int static const unsigned long caph_stream_cmds[] =
caph_limit_stream(int fd, int flags) { TIOCGETA, TIOCGWINSZ, FIODTYPE };
static const uint32_t caph_stream_fcntls = CAP_FCNTL_GETFL;
static __inline void
caph_stream_rights(cap_rights_t *rights, int flags)
markjUnsubmitted
Done
Inline Actions

I think the backslash is not needed.

markj: I think the backslash is not needed.
{ {
cap_rights_t rights;
unsigned long cmds[] = { TIOCGETA, TIOCGWINSZ, FIODTYPE };
cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT, cap_rights_init(rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT,
CAP_IOCTL, CAP_SEEK); CAP_IOCTL, CAP_SEEK);
if ((flags & CAPH_READ) != 0) if ((flags & CAPH_READ) != 0)
cap_rights_set(&rights, CAP_READ); cap_rights_set(rights, CAP_READ);
if ((flags & CAPH_WRITE) != 0) if ((flags & CAPH_WRITE) != 0)
cap_rights_set(&rights, CAP_WRITE); cap_rights_set(rights, CAP_WRITE);
if ((flags & CAPH_LOOKUP) != 0) if ((flags & CAPH_LOOKUP) != 0)
cap_rights_set(&rights, CAP_LOOKUP); cap_rights_set(rights, CAP_LOOKUP);
}
static __inline int
caph_limit_stream(int fd, int flags)
{
cap_rights_t rights;
caph_stream_rights(&rights, flags);
if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) { if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) {
if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0) if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0)
return (0); return (0);
return (-1); return (-1);
} }
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) < 0 && errno != ENOSYS) if (cap_ioctls_limit(fd, caph_stream_cmds,
nitems(caph_stream_cmds)) < 0 && errno != ENOSYS)
return (-1); return (-1);
if (cap_fcntls_limit(fd, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) if (cap_fcntls_limit(fd, caph_stream_fcntls) < 0 && errno != ENOSYS)
return (-1); return (-1);
return (0); return (0);
} }
static __inline int static __inline int
caph_limit_stdin(void) caph_limit_stdin(void)
{ {
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines
View Options

head/sys/amd64/linux/linux_sysvec.c

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#define CAPH_IGNORE_EBADF 0x0001 #define CAPH_IGNORE_EBADF 0x0001
#define CAPH_READ 0x0002 #define CAPH_READ 0x0002
#define CAPH_WRITE 0x0004 #define CAPH_WRITE 0x0004
#define CAPH_LOOKUP 0x0008 #define CAPH_LOOKUP 0x0008
__BEGIN_DECLS __BEGIN_DECLS
static __inline int static const unsigned long caph_stream_cmds[] =
caph_limit_stream(int fd, int flags) { TIOCGETA, TIOCGWINSZ, FIODTYPE };
static const uint32_t caph_stream_fcntls = CAP_FCNTL_GETFL;
static __inline void
caph_stream_rights(cap_rights_t *rights, int flags)
markjUnsubmitted
Done
Inline Actions

I think the backslash is not needed.

markj: I think the backslash is not needed.
{ {
cap_rights_t rights;
unsigned long cmds[] = { TIOCGETA, TIOCGWINSZ, FIODTYPE };
cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT, cap_rights_init(rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT,
CAP_IOCTL, CAP_SEEK); CAP_IOCTL, CAP_SEEK);
if ((flags & CAPH_READ) != 0) if ((flags & CAPH_READ) != 0)
cap_rights_set(&rights, CAP_READ); cap_rights_set(rights, CAP_READ);
if ((flags & CAPH_WRITE) != 0) if ((flags & CAPH_WRITE) != 0)
cap_rights_set(&rights, CAP_WRITE); cap_rights_set(rights, CAP_WRITE);
if ((flags & CAPH_LOOKUP) != 0) if ((flags & CAPH_LOOKUP) != 0)
cap_rights_set(&rights, CAP_LOOKUP); cap_rights_set(rights, CAP_LOOKUP);
}
static __inline int
caph_limit_stream(int fd, int flags)
{
cap_rights_t rights;
caph_stream_rights(&rights, flags);
if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) { if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) {
if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0) if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0)
return (0); return (0);
return (-1); return (-1);
} }
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) < 0 && errno != ENOSYS) if (cap_ioctls_limit(fd, caph_stream_cmds,
nitems(caph_stream_cmds)) < 0 && errno != ENOSYS)
return (-1); return (-1);
if (cap_fcntls_limit(fd, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) if (cap_fcntls_limit(fd, caph_stream_fcntls) < 0 && errno != ENOSYS)
return (-1); return (-1);
return (0); return (0);
} }
static __inline int static __inline int
caph_limit_stdin(void) caph_limit_stdin(void)
{ {
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines
View Options

head/sys/amd64/linux32/linux32_sysvec.c

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
#define CAPH_IGNORE_EBADF 0x0001 #define CAPH_IGNORE_EBADF 0x0001
#define CAPH_READ 0x0002 #define CAPH_READ 0x0002
#define CAPH_WRITE 0x0004 #define CAPH_WRITE 0x0004
#define CAPH_LOOKUP 0x0008 #define CAPH_LOOKUP 0x0008
__BEGIN_DECLS __BEGIN_DECLS
static __inline int static const unsigned long caph_stream_cmds[] =
caph_limit_stream(int fd, int flags) { TIOCGETA, TIOCGWINSZ, FIODTYPE };
static const uint32_t caph_stream_fcntls = CAP_FCNTL_GETFL;
static __inline void
caph_stream_rights(cap_rights_t *rights, int flags)
markjUnsubmitted
Done
Inline Actions

I think the backslash is not needed.

markj: I think the backslash is not needed.
{ {
cap_rights_t rights;
unsigned long cmds[] = { TIOCGETA, TIOCGWINSZ, FIODTYPE };
cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT, cap_rights_init(rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT,
CAP_IOCTL, CAP_SEEK); CAP_IOCTL, CAP_SEEK);
if ((flags & CAPH_READ) != 0) if ((flags & CAPH_READ) != 0)
cap_rights_set(&rights, CAP_READ); cap_rights_set(rights, CAP_READ);
if ((flags & CAPH_WRITE) != 0) if ((flags & CAPH_WRITE) != 0)
cap_rights_set(&rights, CAP_WRITE); cap_rights_set(rights, CAP_WRITE);
if ((flags & CAPH_LOOKUP) != 0) if ((flags & CAPH_LOOKUP) != 0)
cap_rights_set(&rights, CAP_LOOKUP); cap_rights_set(rights, CAP_LOOKUP);
}
static __inline int
caph_limit_stream(int fd, int flags)
{
cap_rights_t rights;
caph_stream_rights(&rights, flags);
if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) { if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS) {
if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0) if (errno == EBADF && (flags & CAPH_IGNORE_EBADF) != 0)
return (0); return (0);
return (-1); return (-1);
} }
if (cap_ioctls_limit(fd, cmds, nitems(cmds)) < 0 && errno != ENOSYS) if (cap_ioctls_limit(fd, caph_stream_cmds,
nitems(caph_stream_cmds)) < 0 && errno != ENOSYS)
return (-1); return (-1);
if (cap_fcntls_limit(fd, CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) if (cap_fcntls_limit(fd, caph_stream_fcntls) < 0 && errno != ENOSYS)
return (-1); return (-1);
return (0); return (0);
} }
static __inline int static __inline int
caph_limit_stdin(void) caph_limit_stdin(void)
{ {
▲ Show 20 Lines • Show All 94 Lines • Show Last 20 Lines
View Options

head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c

Loading...
View Options

head/sys/cddl/dev/dtrace/amd64/dtrace_subr.c

Loading...
View Options

head/sys/cddl/dev/dtrace/i386/dtrace_subr.c

Loading...
View Options

head/sys/i386/i386/trap.c

Loading...
View Options

head/sys/i386/linux/linux_sysvec.c

Loading...
View Options

head/sys/x86/include/signal.h

Loading...
View Options

head/sys/x86/include/trap.h

Loading...