syscalls.master: switch to CAPENABLED flags
ClosedPublic
Actions

Authored by brooks on Jul 29 2021, 8:59 PM.

Details

Reviewers

kevans
emaste
rwatson

Commits

rGdf501bac6939: syscalls.master: switch to CAPENABLED flags

Summary

Switch the main syscall table to use CAPENABLED flags rather than
capabilities.conf. This avoid synchronization issues between
syscalls.master and capabilities.conf (e.g. when renaming a syscall
during development).

For now, move capabilities.conf to sys/compat/freebsd32 and use it
there. Use of sys/compat/freebsd32/syscalls.master should be replaced
by makesyscalls.lua enhancements to allow the main one to be used.

This change results in no changes to generated files after running
make sysent.

MFC after: 1 week
Sponsored by: DARPA

Test Plan

make sysent results in no changes.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 41318
Build 38207: arc lint + arc unit

Event Timeline

brooks created this revision.Jul 29 2021, 8:59 PM

Herald added a subscriber: imp. · View Herald TranscriptJul 29 2021, 8:59 PM

brooks requested review of this revision.Jul 29 2021, 8:59 PM

Harbormaster completed remote builds in B40744: Diff 92964.Jul 29 2021, 8:59 PM

brooks added a parent revision: D31349: makesyscalls.lua: add a CAPENABLED flag.Jul 29 2021, 8:59 PM

brooks added a child revision: D31351: syscalls.master: correct formatting issues.

brooks added reviewers: kevans, emaste, rwatson.Jul 29 2021, 9:01 PM

(I've looked at up to 166)

sys/kern/syscalls.master
194	This one was not enabled in capabilities.conf I believe? Although that might have been accidental I might argue for keeping it out (assuming I haven't missed something).
300	There are some comments in capabilities.conf that will be lost, perhaps we should move them here? e.g. `## Do allow sync(2) for now, but possibly shouldn't.` (Although perhaps some of the questions/XXXs have been resolved since.)
315	And comments like ## XXXRW: getpgid(2) needs scoping. It's not clear if it's worth scoping ## getppid(2). getpriority(2) needs scoping. getrusage(2) needs scoping. ## getsid(2) needs scoping.
351	this one also not in capabilities.conf? (and the other `COMPAT` entries)
477	`XXXRW: Kernel doesn't implement this, so drop?`
978	freebsd 4 fstatfs was not included
1113	(this one was explicitly enabled in capabilities.conf before)

Note: this was tested by running make sysent and verifying that nothing changed.

@rwatson might want to review the capabilities.conf XXXRW comments and see which ones should be pulled across.

sys/kern/syscalls.master
194	It's there as `lseek` (I added support for matching names without `o` or `freebsd#_` prefixes a while ago.) That being said, I think there's an argument we should remove all the COMPAT ones prior to FreeBSD 9 since no non broken program could be calling them in capability mode. I'd prefer to do that in a separate commit and due to the feature above it can't easily be done prior to this commit.
477	This one is probably with dropping. The whole syscall should have been dropped ages ago. It should become freebsd13_sstk at some point.

brooks edited the test plan for this revision. (Show Details)Jul 29 2021, 10:01 PM

emaste added inline comments.Jul 29 2021, 10:04 PM

sys/kern/syscalls.master
194	OK, as a second commit sounds good to me.

Please include in the commit message the note wrt no change in generated files from make sysent

This revision is now accepted and ready to land.Aug 4 2021, 2:53 PM

capabilities.conf is still in the tree so the XXXRW comments still exist somewhere - we can make sure they make it into syscalls.master or somewhere appropriate before handling compat32