[PATCH v4 00/40] bsd-user: Upstream most of the remaining system calls
Warner Losh <[email protected]>
| Newsgroups | gmane.comp.emulators.qemu |
|---|---|
| Message-ID | <[email protected]> |
Upstream the file, thread, socket and remaining signal system calls (too numerous to list here). This series is an ambitous use of claude to help me upstream all the remaining system calls. I've batched them together in what I think are reasonable chunks, and had claude do the grunt work of copying the code over and attributing the commits from our complex branching history. The chopping up was a bit arbitrary, but I think it's good. The commit messages may be a little weak, but may also be OK. I've also double checked the style and made fixes upstream for them as well. Claude also reviewed all these changes and found a few bugs that I've fixed. I've personally read through them all and haven't found anything glaring. I fixed all the bugs that were found, in most cases differently than claude's suggestions. I've added 'Assisted-by: Claude...' to all these commits to reflect my leaning on Claude so hard. This use falls within the 'non-creative' use that the Qemu project has said is OK. If that's not the right thing to do, I can remove them. This leaves sysctl translation, the powerpc architecture support, coredumps and a transition to 'truss' based system call tracing. With these changes applied we'er down from a high of about 30k lines of diffs to only 5k (not counting genereted, but checked in files in blitz). The changes are 8k, so maybe a bit ambitious from that perspective as well. There's a few lines over 80 that I've not cleaned up. Let me know if that's a problem. The other warnings are about adding files, and there's no new MAINTAINERS entry needed. And the 'arch dependent defines should be avoided' are needed to cope with different FreeBSD build systems having different system calls. Note, this is called out below too, but in v2 I've folded back all the fixes based on some out-of-band feedback I recieved to do this the normal way and the qemu project isn't interested in the fixes to fixes. Note that in v3 I've added a rather long generated file. I generated it automatically looking at the type annocations in FreeBSD on the socket options in comments. I had to augment the annotations, so I can't just generate it within the build from the installed headers until it's merged from head and then merges to stable branches and then waiting for a release on each of them (6-9 months given FreeBSD's release schedule). Also note: there's a couple left over issues from v2, so if I've not taken care of them all, please gently remind me if you think action is still needed after my comments before. And in v3 I've added some random_seed fixes for fork/new threads since we're upstreaming those files. These should be correct now, but I'm looking for the correction. In v4, I've rebased to post 11.1.0 master, and fixed the issues that were highlighted in the last review. Some comments I rejected, for now, since they were refactoring code that's hard to test. I've also juggled many patch hunks between revisions so they all compile w/o warnings. I've created annotation in FreeBSD to allow us, in the future, to generate os-sockopt.h from the installed headers. It will take a while for that to work its way into all the supported releases, so in the mean time I'm committing the generated os-sockopt.h file. I've ignored the too-long-line warnings and errors for this file because there's no reason for this file to conform to style. Signed-off-by: Warner Losh <[email protected]> --- Changes in v4: - Fix the rebase errors in v3. - Rebase to post 11.1.0. - Fix overly large chunking with syscalls-defs.h by breaking it up - Tweak syscalls-defs.h with an eye toward diff reduction to blitz - Break out realpath fix - Various chunks shuffled to make each patch compile w/o warnings - better get/setsockopt implementaiton - Link to v3: https://lore.kernel.org/qemu-devel/[email protected] Changes in v3: - refactor get/setsockopt, including new generated file - add random_seed fixes to fork - move adding of .c files to meson.build to where we add the file. - Fix acl bounds checking - Fix indentation and other misc nits - copy_to/from_user needs to be abi_long - Fix toggling of the _ at the end of BSD_PROC_H - Fix leak in error paths in do_freebsd_ktimer_create - Don't write back on ktimer_gettime errors - Be more careful about EINTR returns - do_freebsd_ntp_adjtime needs to return failures from h2t_freebsd_timex - do_freebsd_ktimer_gettime shouldn't writeback on error - t2h_freebsd_umtx_time needs to unlock_user on error path - Prefer abi_long for all pointers in extattr - Remove accidentally duplicated prototypes. - Don't writeback the eventlist, we're just reading it - Add missing 'do' to the macro - Byte swap sival_ptr in convertion - Add missing get_errno call to safe___umtx_op - Don't write back if getsockopt fails - Write back correct number of bytes for do_bsd_recvfrom - Loop through cnt, not maxcnt for acl conversion - Fix getsockopt size computation - Return ret, not errno, since do_freebsd_new_thr doesn't touch errno - Fixed off by one in connectat: we need the bug compat fix here too - Fixed error in preadv: copy params backwards - Link to v2: https://lore.kernel.org/qemu-devel/[email protected] Changes in v2: - don't write offsets on errors for copy_file_range - pipe2: Check the raw system call value directly - setsockopt: Check target_to_host_ip_mreq return value - <several places>: Check return value of host_to_target_sockaddr - do_bsd_setsockopt: Read in the socket option - ntp_gettime: write back time on non-errors, not just 0 - do_freebsd_sigtimedwait check t2h_freebsd_timespec return - do_freebsd_swapcontext writing incorrectly, readonly data (0 to user_unlock) - do_thr_set_name needs get_errno() - Have ntp_adjtime write back the structure - kevent_freebsd11 no need to explicitly mask, datatypes do this for us - do_freebsd_setcontext just reads the mcontext, 0 in unlock_user - target_to_host_sigevent is read-only, so pass 0 in unlock_user - target_to_host_ip_mreq needs tswap32 for int32_t - use get_errno on kenv return values to report errors better - kevent: only copy the number of events returns, not whole buffer - Copy tolerance field of timex - freebsd_umtx_sem_wake use VERIFY_READ instead of write to read struct - Avoid double g2h_untagged mistakes in !_UMTX_OPTIMIZED - Fixed additional missing unlock in freebsd_rw_rdlock and freebsd_rw_wrlock in !_UMTX_OPTIMIZED - Squashed all the bug commit back to the appropriate earleir patch - Link to v1: https://lore.kernel.org/qemu-devel/[email protected] --- Warner Losh (40): bsd-user: Rename cpu_env to env throughout bsd-user bsd-user: Fix copy direciton in preadv bsd-user: Add bsd-signal.h with sigaction through sigreturn bsd-user: Add signal shims sigwait through kill and os-signal.h bsd-user: Add signal system call dispatch bsd-user: move sys/shm.h lines bsd-user: Remove mmap defines bsd-user: Use target_suseconds_t bsd-user: Move sys/uuid.h defines bsd-user: Fix realpathat for FreeBSD 15.0 and newer bsd-user: Add os-file.h with chflagsat, close_range, and more bsd-user: Add poll, poll2, lseek, pipe, and swap system call shims bsd-user: Add FreeBSD socket helpers and sockaddr conversion bsd-user: Add bsd-socket.h with bind through getsockname bsd-user: Add socket shims socketpair through shutdown bsd-user: Commit the generated os-sockopt.h files bsd-user: Implement both getsockopt and setsockopt bsd-user: Add FreeBSD socket system calls bsd-user: Add os-socket.[ch] sendmsg, recvmsg and cmsg bsd-user: Add socket system call dispatch bsd-user: Add os-time.h with clock and time-of-day functions bsd-user: Add utimes, futimes, and ktimer functions to os-time.h bsd-user: Add select, pselect, and ppoll to os-time.h bsd-user: Add kqueue and kevent functions to os-time.h bsd-user: Add sigtimedwait, itimer, and futimens to os-time.h bsd-user: Add os-time.c and time-related type definitions bsd-user: Add time system call dispatch bsd-user: Add cpu_copy and make init_task_state non-static bsd-user: Add os-thread.h with thr and context functions bsd-user: Add do_freebsd__umtx_op to os-thread.h bsd-user: Add thread system call dispatch bsd-user: Add os-extattr.h with file and fd extattr functions bsd-user: Add link and list extattr functions to os-extattr.h bsd-user: Add ACL system call shims to os-extattr.h bsd-user: Add os-extattr.c with ACL conversion functions bsd-user: Add extended attribute and ACL system call dispatch bsd-user: Add scheduler and cpuset functions to os-misc.h bsd-user: Add scheduler, cpuset, kmod, and misc syscall dispatch bsd-user: Move qemu_guest_random_seed_main to same as linux-user bsd-user Update random_seed on thread creation bsd-user/aarch64/target.h | 2 +- bsd-user/arm/target.h | 2 +- bsd-user/bsd-file.h | 168 +++- bsd-user/bsd-mem.h | 4 +- bsd-user/bsd-proc.h | 26 +- bsd-user/bsd-signal.h | 231 ++++++ bsd-user/bsd-socket.c | 98 +++ bsd-user/bsd-socket.h | 283 +++++++ bsd-user/freebsd/meson.build | 8 +- bsd-user/freebsd/os-extattr.c | 118 +++ bsd-user/freebsd/os-extattr.h | 661 ++++++++++++++++ bsd-user/freebsd/os-file.h | 129 ++++ bsd-user/freebsd/os-misc.h | 466 +++++++++++- bsd-user/freebsd/os-proc.c | 4 +- bsd-user/freebsd/os-proc.h | 26 +- bsd-user/freebsd/os-signal.h | 20 + bsd-user/freebsd/os-socket.c | 239 ++++++ bsd-user/freebsd/os-socket.h | 428 +++++++++++ bsd-user/freebsd/os-sockopt.h | 316 ++++++++ bsd-user/freebsd/os-stat.h | 8 +- bsd-user/freebsd/os-sys.c | 4 +- bsd-user/freebsd/os-syscall.c | 790 +++++++++++++++++-- bsd-user/freebsd/os-thread.c | 1684 +++++++++++++++++++++++++++++++++++++++++ bsd-user/freebsd/os-thread.h | 596 +++++++++++++++ bsd-user/freebsd/os-time.c | 347 +++++++++ bsd-user/freebsd/os-time.h | 989 ++++++++++++++++++++++++ bsd-user/freebsd/qemu-os.h | 48 ++ bsd-user/i386/target.h | 2 +- bsd-user/main.c | 38 +- bsd-user/meson.build | 1 + bsd-user/qemu-bsd.h | 8 + bsd-user/qemu.h | 48 +- bsd-user/riscv/target.h | 2 +- bsd-user/signal-common.h | 4 + bsd-user/signal.c | 67 ++ bsd-user/syscall_defs.h | 449 +++++++++-- bsd-user/x86_64/target.h | 2 +- 37 files changed, 8110 insertions(+), 206 deletions(-) --- base-commit: fa19879df1658f96ac07365fca8835b7decd6995 change-id: 20260504-misc-2026q2-a5af31ac032a Best regards, -- Warner Losh <[email protected]>