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.

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

pass SUBREAPER to prctl patch and new desktop flavor #134

Merged
merged 3 commits into from
Nov 30, 2023

Conversation

crazy-max
Copy link
Collaborator

@crazy-max crazy-max commented May 9, 2023

Expected to fail with current qemu (7.1.0): https://github.com/tonistiigi/binfmt/actions/runs/4938696451/jobs/8832456122?pr=134#step:6:49

#9 [4/4] RUN /tini -s -- uname -a
#0 0.055 [FATAL tini (1)] PR_SET_CHILD_SUBREAPER is unavailable on this platform. Are you using Linux >= 3.4?

@tonistiigi has bisected it to: qemu/qemu@220717a

220717a6f46a99031a5b1af964bbf4dec1310440 is the first bad commit
commit 220717a6f46a99031a5b1af964bbf4dec1310440
Author: Richard Henderson <richard.henderson@linaro.org>
Date:   Mon Dec 27 07:01:23 2021 -0800

    linux-user: Disable more prctl subcodes

Create a list of subcodes that we want to pass on, a list of
subcodes that should not be passed on because they would affect
the running qemu itself, and a list that probably could be
implemented but require extra work. Do not pass on unknown subcodes.

moving the SUBREAPER constants from the EINVAL case to the prctl() case seems to fix the issue but might not be safe as the commit message suggests (edited)

series: https://lore.kernel.org/all/20211015041053.2769193-1-richard.henderson@linaro.org/T/

@crazy-max crazy-max force-pushed the e2e-tini branch 10 times, most recently from 8aedbe2 to 5698ada Compare May 11, 2023 16:45
Comment on lines 23 to 29
+ case PR_GET_CHILD_SUBREAPER:
+ case PR_SET_CHILD_SUBREAPER:
/* Some prctl options have no pointer arguments and we can pass on. */
return get_errno(prctl(option, arg2, arg3, arg4, arg5));

- case PR_GET_CHILD_SUBREAPER:
- case PR_SET_CHILD_SUBREAPER:
Copy link
Collaborator Author

@crazy-max crazy-max May 11, 2023

Choose a reason for hiding this comment

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

@tonistiigi @djs55 suggested patch looks to work indeed: https://github.com/tonistiigi/binfmt/actions/runs/4950685510/jobs/8854647906#step:8:9

Linux 90a30464b502 5.15.0-1037-azure #44-Ubuntu SMP Thu Apr 20 13:19:31 UTC 2023 aarch64 Linux

@crazy-max crazy-max force-pushed the e2e-tini branch 3 times, most recently from acdb7e6 to 6b66ebd Compare May 11, 2023 17:17
@crazy-max crazy-max marked this pull request as draft May 11, 2023 17:18
crazy-max and others added 2 commits November 30, 2023 17:39
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max crazy-max changed the title e2e: run tini pass SUBREAPER to prctl patch and new desktop flavor Nov 30, 2023
@crazy-max crazy-max marked this pull request as ready for review November 30, 2023 18:06
@crazy-max crazy-max merged commit 035ddb0 into tonistiigi:master Nov 30, 2023
19 checks passed
@crazy-max crazy-max deleted the e2e-tini branch November 30, 2023 18:23
crazy-max added a commit to crazy-max/binfmt that referenced this pull request Dec 23, 2023
pass SUBREAPER to prctl patch and new desktop flavor
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max crazy-max mentioned this pull request Jul 26, 2024
@crazy-max crazy-max mentioned this pull request Dec 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants