Skip to content

fix: resolved issue with global notify #5

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

Merged
Bapt-Roux merged 1 commit into from
Jul 30, 2026
Merged

fix: resolved issue with global notify #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 23 additions & 20 deletions src/cpn/ucore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,16 @@ impl UCoreInner {
user_store: Default::default(),
}
}

/// Extract associated virtual Id if any
fn get_vid(&self, iop: &hpu_asm::IOp) -> Option<hpu_asm::VirtId> {
let hid = self
.config
.get()
.expect("UcoreConfig must be init first")
.node_id;
iop.mapping().virt_id(hpu_asm::PhysId(hid))
}
}

/// Internal structure used only by IrqAck task
Expand Down Expand Up @@ -769,8 +779,8 @@ impl UCore {

log!(|self| log::Category::Own, log::Verbosity::Debug => iop => "Will process following iop");

// Update ucore state
{
// Update ucore state and extract vid if any
let vid = {
// Mutex scope
let mut inner = self.inner.lock().unwrap();

Expand All @@ -790,15 +800,19 @@ impl UCore {
// Update ArgStore context
// And register new entry in DstNotify
inner.local_store.reset(iop.clone());
inner.dst_notifyq.push_back(Vec::new());
inner.dst_store.init_iop(&iop);

inner.cur_iid = iop.get_iid();
inner.iop_pdg.push_back(iop.clone());
event::Event::triggered(&forge_event_name!(|self| "NoIOpPending"), None);
}
let vid = inner.get_vid(&iop);
if vid.is_some() {
inner.dst_notifyq.push_back(Vec::new());
inner.iop_pdg.push_back(iop.clone());
event::Event::triggered(&forge_event_name!(|self| "NoIOpPending"), None);
}
vid
};

if let Some(vid) = self.get_vid(&iop) {
if let Some(id) = vid {
// Update context in HpuCore
let iop_pkt = {
let mut pld = IOpPayload::new(iop.clone(), has_restart);
Expand All @@ -813,7 +827,7 @@ impl UCore {
.expect("Issue with ucore iop context update");

// Retrieved DOp stream from memory
let dops = self.load_fw_as(&iop, vid).await;
let dops = self.load_fw_as(&iop, id).await;
// handle Dops
if !dops.is_empty() {
self.clone()
Expand Down Expand Up @@ -911,7 +925,7 @@ impl UCore {
assert_eq!(
iop.to_words(),
iop_pld.inner.to_words(),
"Mismatch between IOpPayload content and local store"
"Ucore {hid}: Mismatch between IOpPayload content and local store [{iop:?} vs {iop_pld:?}]",
);
// Generate execution report
self.dump_iop_report(&iop_pld);
Expand Down Expand Up @@ -1269,17 +1283,6 @@ impl UCore {
inner.config.init(fw_cfg)
}

/// Extract associated virtual Id if any
fn get_vid(&self, iop: &hpu_asm::IOp) -> Option<hpu_asm::VirtId> {
let inner = self.inner.lock().unwrap();
let hid = inner
.config
.get()
.expect("UcoreConfig must be init first")
.node_id;
iop.mapping().virt_id(hpu_asm::PhysId(hid))
}

/// Read DOp stream from Firmware memory
/// Read it as virtual node vid
async fn load_fw_as(&self, iop: &hpu_asm::IOp, vid: hpu_asm::VirtId) -> Vec<hpu_asm::DOp> {
Expand Down