Skip to content

Update rust-sel4 commit from TS fork to mainline#531

Merged
midnightveil merged 5 commits into
seL4:mainfrom
au-ts:rust_sel4_update_to_main
Jun 29, 2026
Merged

Update rust-sel4 commit from TS fork to mainline#531
midnightveil merged 5 commits into
seL4:mainfrom
au-ts:rust_sel4_update_to_main

Conversation

@dreamliner787-9

@dreamliner787-9 dreamliner787-9 commented Jun 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

This required a few changes to how the spec is packed into the initialiser ELF from seL4/rust-sel4#345.

Do not merge until:

@dreamliner787-9 dreamliner787-9 force-pushed the rust_sel4_update_to_main branch from d5a8b1e to d9b1e0a Compare June 22, 2026 04:16
@dreamliner787-9 dreamliner787-9 mentioned this pull request Jun 22, 2026
Open
midnightveil
midnightveil reviewed Jun 26, 2026
View reviewed changes
Comment thread tool/microkit/src/elf.rs Outdated
midnightveil
midnightveil reviewed Jun 26, 2026
View reviewed changes
Comment thread tool/microkit/src/elf.rs Outdated
midnightveil
midnightveil reviewed Jun 26, 2026
View reviewed changes
Comment thread tool/microkit/src/elf.rs Outdated
@midnightveil

midnightveil commented Jun 29, 2026

Copy link
Copy Markdown
Collaborator

rust-seL4 PR has been merged now, so you should be able to update to that commit.

midnightveil
midnightveil reviewed Jun 29, 2026
View reviewed changes
Comment thread tool/microkit/src/elf.rs
execute: bool,
vaddr: u64,
data: ElfSegmentData,
meta_phdr_type_maybe: Option<u32>,

@midnightveil midnightveil Jun 29, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This is weird? Why do it like this

@dreamliner787-9 dreamliner787-9 Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It's for the caller to say "create an additional program header for this segment with this type in addition to the loadable program header".

@midnightveil midnightveil Jun 29, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Well, yes. But why this optional argument to creating a segment? It feels weird

@dreamliner787-9 dreamliner787-9 Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Because you don't need to extra phdr in all cases, see the diff to loader.rs for example

@dreamliner787-9
tool/elf: decouple program headers from segments
2f2954b 
Previously, the ELF code treats program headers = segments. While this
worked originally, it broke for cases that requires >= 2 program
headers to refer to the same segment.

Now, when the ELF is parsed, the code will create a 1-1 mapping of
segments to program headers like before. But the allow for additional
program headers to be inserted.

Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
@dreamliner787-9
tool/elf: refactored program headers table mgmt
60260e9 
Added `pub fn phdrs_table(&self) -> Vec<(ElfProgramHeader64, usize)>` to
ELF code.

Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
@dreamliner787-9
tool/elf: + segment with multiple program headers
39c4af3 
Modified `pub fn add_segment()` to allow for an additional program
header in the ELF to describe the segment with a user defined type
identifier.

Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
@dreamliner787-9 dreamliner787-9 force-pushed the rust_sel4_update_to_main branch from d9b1e0a to 835f47b Compare June 29, 2026 05:32
@midnightveil

midnightveil commented Jun 29, 2026

Copy link
Copy Markdown
Collaborator

Object allocation simulator in allocation.rs is updated with the new strategy

Does this need to be done?

@dreamliner787-9

dreamliner787-9 commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Object allocation simulator in allocation.rs is updated with the new strategy

Does this need to be done?

Yes I'm doing it right now

@dreamliner787-9
Switch rust-sel4 to mainline commit
67e4362 
Which also required changes to how the spec is packed into the
intialiser.

Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
@dreamliner787-9
tool/elf: type_ -> r#type
eeaf7c0 
Updated all instances of struct member name `type_` to `r#type`.

Signed-off-by: Bill Nguyen <bill.nguyen@unsw.edu.au>
@dreamliner787-9 dreamliner787-9 force-pushed the rust_sel4_update_to_main branch from 835f47b to eeaf7c0 Compare June 29, 2026 05:44
@dreamliner787-9

dreamliner787-9 commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

This is ready from my side.

@midnightveil midnightveil merged commit b58bef3 into seL4:main Jun 29, 2026
11 checks passed
@midnightveil midnightveil deleted the rust_sel4_update_to_main branch June 29, 2026 06:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@midnightveil midnightveil midnightveil 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.

2 participants

@dreamliner787-9 @midnightveil