Skip to content

Commit

Permalink
Make pager a secure gate service, move object store code (#238)
Browse files Browse the repository at this point in the history
* Make pager a service with secure gates.

* Move object store into pager, cleanup old pager store.

* Adjust tracing levels.
  • Loading branch information
dbittman authored Jan 10, 2025
1 parent 7845083 commit d4f72af
Show file tree
Hide file tree
Showing 29 changed files with 176 additions and 1,116 deletions.
15 changes: 13 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 6 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ members = [
"src/bin/bootstrap",
"src/bin/devmgr",
"src/bin/etl_twizzler",
"src/bin/pager",
"src/bin/mnemosyne",
"src/bin/random_validation",
"src/bin/genrandom",
Expand Down Expand Up @@ -39,9 +38,11 @@ members = [
"src/rt/minimal",
"src/lib/logboi",
"src/srv/logboi-srv",
"src/srv/pager-srv",
"src/bin/logboi-test",
"src/lib/virtio-net",
"src/bin/object-store-test",
"src/lib/pager",
]

exclude = ["toolchain/src/rust"]
Expand All @@ -52,31 +53,21 @@ initrd = [
"crate:bootstrap",
"crate:init",
"crate:devmgr",
"crate:pager",
"crate:etl_twizzler",
"crate:virtio",
"lib:twz-rt",
"crate:monitor",
"crate:montest",
"lib:montest-lib",
"crate:mnemosyne",
"crate:stdfs_demo",
"crate:logboi-test",
"lib:logboi-srv",
"crate:random_validation",
"crate:virtio",
"lib:twz-rt",
"crate:monitor",
"crate:montest",
"lib:montest-lib",
"crate:mnemosyne",
"crate:stdfs_demo",
"crate:logboi-test",
"lib:logboi-srv",
"crate:randtest",
"crate:randtest",
"crate:genrandom",
"crate:object-store-test",
"lib:twz-rt",
"lib:montest-lib",
"lib:logboi-srv",
"lib:pager-srv",
#"third-party:hello-world-rs"
]

Expand Down
1 change: 1 addition & 0 deletions src/bin/init/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ polling = "3.6.0"
futures = "*"
twizzler-futures = { path = "../../lib/twizzler-futures" }
monitor-api = { path = "../../rt/monitor-api" }
pager = { path = "../../lib/pager" }
14 changes: 1 addition & 13 deletions src/bin/init/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,8 @@ fn initialize_pager() {
NewHandleFlags::empty(),
)
.unwrap();
let pager_comp = monitor_api::CompartmentLoader::new(
"pager",
"pager",
monitor_api::NewCompartmentFlags::EXPORT_GATES,
)
.args([
"pager",
&queue.object().id().raw().to_string(),
&queue2.object().id().raw().to_string(),
])
.load()
.expect("failed to start pager");

std::mem::forget(pager_comp);
pager::pager_start(queue.object().id(), queue2.object().id());
}

fn main() {
Expand Down
2 changes: 1 addition & 1 deletion src/bin/object-store-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = "0.1.0"
edition = "2021"

[dependencies]
object-store = { version = "0.1.0", path = "object-store" }
object-store = { version = "0.1.0", path = "../../srv/pager-srv/object-store" }
40 changes: 0 additions & 40 deletions src/bin/pager/src/nvme.rs

This file was deleted.

Loading

0 comments on commit d4f72af

Please sign in to comment.