Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

define struct clone_args for linux-lts versions that don't have it #741

Merged
merged 1 commit into from
Jun 19, 2024
Merged

define struct clone_args for linux-lts versions that don't have it #741

merged 1 commit into from
Jun 19, 2024

Conversation

copy
Copy link
Contributor

@copy copy commented Jun 17, 2024

I've chosen to define this struct unconditionally, and rename it:

  • Renaming is necessary because, if we redefine struct clone_args, we'll get a compilation error if sched.h contains an older version of this struct
  • I believe it's not possible to detect if a struct is defined using just preprocessor macros, so a configure script would be needed
  • CLONE_PIDFD is not defined in the linux-lts headers, but it is defined in musl, so it can't be used to determine if struct clone_args is defined
  • The Linux syscall interface is backwards-compatible anyway

But I'm open to suggestions for other fixes.

Fixes #737

@copy
Copy link
Contributor Author

copy commented Jun 18, 2024

I realised that the original version caused a regression: Using the latest version of the struct unconditionally would break older kernels (at runtime). I've instead changed it to use the first version of the struct. The current code doesn't use any of the new fields (set_tid, set_tid_size and cgroup). If you'd like to check, sizeof caml_eio_clone_args now matches CLONE_ARGS_SIZE_VER0 from linux/sched.h.

talex5
talex5 approved these changes Jun 19, 2024
View reviewed changes
Copy link
Collaborator

@talex5 talex5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great - thanks!

@talex5 talex5 merged commit 642bdbe into ocaml-multicore:main Jun 19, 2024
5 checks passed
talex5 added a commit to talex5/opam-repository that referenced this pull request Nov 23, 2024
@talex5
[new release] eio (5 packages) (1.2)
106f265 
CHANGES:

Changes:

- Make `fork_action.h` a public header (@patricoferris ocaml-multicore/eio#769, reviewed by @talex5).
  Allows other libraries to add new actions.

- Record trace event when spawning processes (@talex5 ocaml-multicore/eio#749).
  Spawning a subprocess can take a long time in some cases, so show it clearly in the traces.

- Eio_unix.Net: make some return types more polymorphic (@talex5 ocaml-multicore/eio#744).

Bug fixes:

- Preserve backtraces in `fork_daemon` (@talex5 ocaml-multicore/eio#779).

- Eio.Path: always use "/" as separator (@talex5 ocaml-multicore/eio#743).

Linux backend:

- Allow `alloc_fixed_or_wait` to be cancelled (@talex5 ocaml-multicore/eio#753).

- Avoid triggering a (harmless) TSan warning (@talex5 ocaml-multicore/eio#754, reported by @avsm).

Windows backend:

- Unregister FDs on cancel (@talex5 ocaml-multicore/eio#756).
  Fixes `exception Unix.Unix_error(Unix.ENOTSOCK, "select", "")`.

- Work around problems in `Unix.getaddrinfo` (@talex5 ocaml-multicore/eio#780).
  Fixes e.g. `No addresses found for host name "127.0.0.1"`.

- Group `ECONNABORTED` with other connection reset errors (@talex5 ocaml-multicore/eio#783).

- Check `has_symlink` for tests (@create2000 ocaml-multicore/eio#771, reviewed by @patricoferris and @talex5).

- Improve `openat` error handling (@talex5 ocaml-multicore/eio#742, reported by @kentookura).
  Fixes `exception Unix.Unix_error(Unix.ENOENT, "openat", "")`.

Documentation:

- examples/fs: show how to read files while scanning (@talex5 ocaml-multicore/eio#745).

- Add example to `Buf_read.seq` documentation (@talex5 ocaml-multicore/eio#739, requested by @darrenldl and @rizo).

Build and test:

- Fix tests on OpenBSD (@talex5 ocaml-multicore/eio#782).

- Add advice about using AI for code generation (@patricoferris ocaml-multicore/eio#765, reviewed by @avsm and @talex5).

- Minor code cleanups (@talex5 ocaml-multicore/eio#755).

- Define `struct clone_args` for linux-lts versions that don't have it (@copy ocaml-multicore/eio#741, reviewed by @talex5).

- eio_linux: refactor fixed buffer code (@talex5 ocaml-multicore/eio#752).
@talex5 talex5 mentioned this pull request Nov 23, 2024
Merged
talex5 added a commit to talex5/opam-repository that referenced this pull request Nov 23, 2024
@talex5
[new release] eio (5 packages) (1.2)
2a50305 
CHANGES:

Changes:

- Make `fork_action.h` a public header (@patricoferris ocaml-multicore/eio#769, reviewed by @talex5).
  Allows other libraries to add new actions.

- Record trace event when spawning processes (@talex5 ocaml-multicore/eio#749).
  Spawning a subprocess can take a long time in some cases, so show it clearly in the traces.

- Eio_unix.Net: make some return types more polymorphic (@talex5 ocaml-multicore/eio#744).

Bug fixes:

- Preserve backtraces in `fork_daemon` (@talex5 ocaml-multicore/eio#779).

- Eio.Path: always use "/" as separator (@talex5 ocaml-multicore/eio#743).

Linux backend:

- Allow `alloc_fixed_or_wait` to be cancelled (@talex5 ocaml-multicore/eio#753).

- Avoid triggering a (harmless) TSan warning (@talex5 ocaml-multicore/eio#754, reported by @avsm).

Windows backend:

- Unregister FDs on cancel (@talex5 ocaml-multicore/eio#756).
  Fixes `exception Unix.Unix_error(Unix.ENOTSOCK, "select", "")`.

- Work around problems in `Unix.getaddrinfo` (@talex5 ocaml-multicore/eio#780).
  Fixes e.g. `No addresses found for host name "127.0.0.1"`.

- Group `ECONNABORTED` with other connection reset errors (@talex5 ocaml-multicore/eio#783).

- Check `has_symlink` for tests (@create2000 ocaml-multicore/eio#771, reviewed by @patricoferris and @talex5).

- Improve `openat` error handling (@talex5 ocaml-multicore/eio#742, reported by @kentookura).
  Fixes `exception Unix.Unix_error(Unix.ENOENT, "openat", "")`.

Documentation:

- examples/fs: show how to read files while scanning (@talex5 ocaml-multicore/eio#745).

- Add example to `Buf_read.seq` documentation (@talex5 ocaml-multicore/eio#739, requested by @darrenldl and @rizo).

Build and test:

- Fix tests on OpenBSD (@talex5 ocaml-multicore/eio#782).

- Add advice about using AI for code generation (@patricoferris ocaml-multicore/eio#765, reviewed by @avsm and @talex5).

- Minor code cleanups (@talex5 ocaml-multicore/eio#755).

- Define `struct clone_args` for linux-lts versions that don't have it (@copy ocaml-multicore/eio#741, reviewed by @talex5).

- eio_linux: refactor fixed buffer code (@talex5 ocaml-multicore/eio#752).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@talex5 talex5 talex5 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fails to build with musl-gcc w/ linux-lts headers (no struct clone_args)
2 participants
@copy @talex5