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

Morello purecap kernel #369

Merged
merged 3 commits into from
Jul 13, 2023
Merged

Morello purecap kernel #369

merged 3 commits into from
Jul 13, 2023

Conversation

bsdjhb
Copy link
Contributor

@bsdjhb bsdjhb commented Jul 13, 2023

TL;DR: We haven't been testing the Morello purecap kernel in CI since the end of December as the tests are booting the hybrid kernel instead.

@bsdjhb bsdjhb force-pushed the morello_purecap_kernel branch 2 times, most recently from 0cec5d6 to b0e82d9 Compare July 13, 2023 18:54
@jrtc27
Copy link
Member

jrtc27 commented Jul 13, 2023

since the end of December

... 2021

@bsdjhb
Copy link
Contributor Author

bsdjhb commented Jul 13, 2023

since the end of December

... 2021

Oof, yeah, I had misparsed. The last dev run which used purecap Morello kernels was https://ctsrd-build.cl.cam.ac.uk/job/CheriBSD-pipeline/job/dev/93.

jrtc27 and others added 3 commits July 13, 2023 12:15
When booting an image with a non-default kernel on a platform using
loader rather than direct booting (e.g. Morello), expect needs to
interrupt the loader and select the alternate kernel before booting, but
we weren't checking we managed to do this, only that if we saw the
loader countdown we were able to interrupt it. Thus add a check to fail
if the boot gets to single user (mounting root) without having seen the
loader prompt.
Upstream FreeBSD changed the autoboot countdown string in September of
2019 (merged to CheriBSD in late December 2022).  The existing regex
didn't match the new string, so test boots requesting a non-default
kernel on Morello (e.g. the purecap kernel) have been booting the
default (hybrid) kernel instead.  This updates the regex to match on
the new string as well as the old.
@bsdjhb bsdjhb merged commit adb0223 into main Jul 13, 2023
4 checks passed
@bsdjhb bsdjhb deleted the morello_purecap_kernel branch July 13, 2023 20:55
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