Skip to content

Actually run multicore in SMP example and re-enable in CI #288

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

Open
dreamliner787-9 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Actually run multicore in SMP example and re-enable in CI #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
461388a
examples/smp: actually run on multiple cores
dreamliner787-9 Jul 1, 2026
ba32698
ci: re-enable SMP example
dreamliner787-9 Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ci/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,7 @@ def listify(s: str | Sequence[str]) -> Sequence[str]:
"odroidc4",
"maaxboard",
],
# Disable until https://github.com/au-ts/libvmm/issues/233 is resolved.
"tests_exclude": [
{ "config": "smp-debug" },
{ "config": "smp-release" },
],
"tests_exclude": [],
},
"virtio": {
"configs": ["debug", "release"],
Expand Down
10 changes: 3 additions & 7 deletions examples/smp/board/maaxboard/smp.system
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,10 @@
<program_image path="vmm.elf" />
<map mr="guest_ram" vaddr="0x40000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
<virtual_machine name="linux" >
<!-- Due to https://github.com/seL4/seL4/issues/1645 we are placing all 4 VCPUs on
1 physical CPU, this should be changed to 1 VCPU per core once the issue is fixed
for true SMP.
-->
<vcpu id="0" cpu="0" />
<vcpu id="1" cpu="0" />
<vcpu id="2" cpu="0" />
<vcpu id="3" cpu="0" />
<vcpu id="1" cpu="1" />
<vcpu id="2" cpu="2" />
<vcpu id="3" cpu="3" />
<map mr="guest_ram" vaddr="0x40000000" perms="rwx" />
<map mr="uart" vaddr="0x30860000" perms="rw" cached="false" />
<!-- The guest needs to view what is actually the vCPU interface as the CPU interface. -->
Expand Down
10 changes: 3 additions & 7 deletions examples/smp/board/odroidc4/smp.system
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,10 @@
<program_image path="vmm.elf" />
<map mr="guest_ram" vaddr="0x20000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
<virtual_machine name="linux" >
<!-- Due to https://github.com/seL4/seL4/issues/1645 we are placing all 4 VCPUs on
1 physical CPU, this should be changed to 1 VCPU per core once the issue is fixed
for true SMP.
-->
<vcpu id="0" cpu="0" />
<vcpu id="1" cpu="0" />
<vcpu id="2" cpu="0" />
<vcpu id="3" cpu="0" />
<vcpu id="1" cpu="1" />
<vcpu id="2" cpu="2" />
<vcpu id="3" cpu="3" />
<map mr="guest_ram" vaddr="0x20000000" perms="rwx" />
<map mr="bus1" vaddr="0xff600000" perms="rw" cached="false" />
<map mr="bus2" vaddr="0xff800000" perms="rw" cached="false" />
Expand Down
10 changes: 3 additions & 7 deletions examples/smp/board/qemu_virt_aarch64/smp.system
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,10 @@
-->
<map mr="guest_ram" vaddr="0x40000000" perms="rw" setvar_vaddr="guest_ram_vaddr" />
<virtual_machine name="linux" >
<!-- Due to https://github.com/seL4/seL4/issues/1645 we are placing all 4 VCPUs on
1 physical CPU, this should be changed to 1 VCPU per core once the issue is fixed
for true SMP.
-->
<vcpu id="0" cpu="0" />
<vcpu id="1" cpu="0" />
<vcpu id="2" cpu="0" />
<vcpu id="3" cpu="0" />
<vcpu id="1" cpu="1" />
<vcpu id="2" cpu="2" />
<vcpu id="3" cpu="3" />
<!--
The device tree given to Linux specifies that RAM will start
at 0x40000000.
Expand Down
Loading