Skip to content
This repository has been archived by the owner on Jan 1, 2021. It is now read-only.

Remove haveged in favor of backported upstream kernel commit #1403

Merged
merged 1 commit into from
Nov 14, 2019
Merged

Remove haveged in favor of backported upstream kernel commit #1403

merged 1 commit into from
Nov 14, 2019

Conversation

tianon
Copy link
Contributor

@tianon tianon commented Nov 13, 2019 •
edited
Loading

Quoting the Dockerfile comment:

apply kernel entropy patch from 5.4; this same patch was backported in Debian in 5.3.9-1

specifically, this solves the problem of early-boot entropy (SSH key generation, for example), avoiding the need for userspace solutions like haveged

Refs #1322

@tianon
Remove haveged in favor of backported upstream kernel commit
ab6b28e 
Quoting the `Dockerfile` comment:

> apply kernel entropy patch from 5.4; this same patch was backported in Debian in 5.3.9-1
>
>   - https://git.kernel.org/linus/50ee7529ec4500c88f8664560770a7a1b65db72b
>   - https://salsa.debian.org/kernel-team/linux/commit/c323c453b2485a33bfb33635a07f3a50bc1db1ee
>   - https://lists.debian.org/debian-boot/2019/11/msg00077.html
>
> specifically, this solves the problem of early-boot entropy (SSH key generation, for example), avoiding the need for userspace solutions like haveged
@tianon tianon merged commit 054e7b5 into boot2docker:master Nov 14, 2019
@tianon tianon deleted the ditch-haveged branch November 14, 2019 21:52
@ailispaw ailispaw mentioned this pull request Nov 15, 2019
Open
@legal90
Copy link
Contributor

legal90 commented Nov 27, 2019 •
edited
Loading

@tianon Do you have any plans to port it to 19.03.x releases? Or is the next release from master coming soon?
It seems it could fix the issue appeared recently with the parallels driver: Parallels/docker-machine-parallels#83 (comment)
Thanks! 👍

@tianon
Copy link
Contributor Author

tianon commented Nov 27, 2019

I wasn't planning to given that haveged was our solution there, but I guess it's something we could consider. I'm wary of it simply because I haven't been able to do any heavy testing of it, so didn't want to interrupt the 19.03.x releases stability with it yet -- if you're willing to make a build and do some testing to ensure it works OK (and really does fix the problem described in that issue), I'm amenable. 👍

@legal90
Copy link
Contributor

legal90 commented Dec 2, 2019

@tianon Thanks!
I have built boot2docker.iso from this PR branch (ref ab6b28e) and can confirm that the issue Parallels/docker-machine-parallels#83 is fixed there. VM restarts successfully every time and dockerd starts very fast there. 👍

tianon added a commit that referenced this pull request Dec 4, 2019
@tianon
Remove haveged in favor of backported upstream kernel commit
8be24bc 
Quoting the `Dockerfile` comment:

> apply kernel entropy patch from 5.4; this same patch was backported in Debian in 5.3.9-1
>
>   - https://git.kernel.org/linus/50ee7529ec4500c88f8664560770a7a1b65db72b
>   - https://salsa.debian.org/kernel-team/linux/commit/c323c453b2485a33bfb33635a07f3a50bc1db1ee
>   - https://lists.debian.org/debian-boot/2019/11/msg00077.html
>
> specifically, this solves the problem of early-boot entropy (SSH key generation, for example), avoiding the need for userspace solutions like haveged

(cherry picked from commit ab6b28e)

See #1403 (comment) for the justification behind backporting this change.
@tianon
Copy link
Contributor Author

tianon commented Dec 4, 2019

Nice! Backported in 8be24bc, so should be included in whatever the next release is (whether that's 19.03.x or something newer) 👍

@tianon
Copy link
Contributor Author

tianon commented Dec 4, 2019

Ah darn, it fails to build (should've done a build test before I committed): https://github.com/boot2docker/boot2docker/commit/8be24bcf79c8b7e1c200a86175fc8896be3256d8/checks#step:6:2862

So I guess we'd need to also update the kernel there, which might have a wider impact, but is probably worthwhile.

tianon added a commit that referenced this pull request Dec 4, 2019
@tianon
Update kernel to 4.19 (specifically 4.19.87)
cb60095 
This is techinically a cherry-pick/backport of c312ab6.

This is in support of 8be24bc (a cherry-pick of ab6b28e).

See #1403 (comment) for the justification behind backporting this change.
@tianon
Copy link
Contributor Author

tianon commented Dec 4, 2019

Ok, resolved in cb60095. 👍

@legal90
Copy link
Contributor

legal90 commented Jun 24, 2020 •
edited by tianon
Loading

Hi @tianon
Does this patch have any chance to be released? Maybe at least as an RC / unstable release ?

I see that is b2d has been deprecated (#1408), but this PR and its port to the branch 19.03.x is important for those users who still want to run Docker Machine with Parallels Desktop.

@legal90 legal90 mentioned this pull request Jun 24, 2020
Closed
@tianon
Copy link
Contributor Author

tianon commented Jun 30, 2020

Yeah, that's fair -- I've pushed out https://github.com/boot2docker/boot2docker/releases/tag/v19.03.12, which will be the final release and includes an updated kernel (which includes this change).

@tianon tianon mentioned this pull request Jun 30, 2020
Merged
@legal90
Copy link
Contributor

legal90 commented Jun 30, 2020 •
edited
Loading

Thank you, @tianon, for all the work you've done on boo2docker !

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@yosifkit yosifkit yosifkit 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.
3 participants
@tianon @legal90 @yosifkit