mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-03 21:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(idm): reimplement packet processing algorithm (#330)

Browse Source 
* chore(xen): rewrite event channel code

* fix(idm): repair idm bugs on the file backend
This commit is contained in:
Alex Zenla
2024-08-13 16:18:27 -07:00
committed by GitHub
parent ffc9dcc0ea
commit 1cf03a460e
16 changed files with 273 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/runtime/src/channel.rs
View File

@ -8,14 +8,11 @@ use anyhow::{anyhow, Result};
use log::{debug, error};
use tokio::{
select,
sync::{
broadcast,
mpsc::{channel, Receiver, Sender},
},
sync::mpsc::{channel, Receiver, Sender},
task::JoinHandle,
time::sleep,
};
use xenevtchn::EventChannel;
use xenevtchn::EventChannelService;
use xengnt::{sys::GrantRef, GrantTab, MappedMemory};
use xenstore::{XsdClient, XsdInterface};
@ -43,7 +40,7 @@ pub struct ChannelService {
typ: String,
use_reserved_ref: Option<u64>,
backends: HashMap<u32, ChannelBackend>,
evtchn: EventChannel,
evtchn: EventChannelService,
store: XsdClient,
gnttab: GrantTab,
input_receiver: Receiver<(u32, Vec<u8>)>,
@ -64,7 +61,7 @@ impl ChannelService {
let (output_sender, output_receiver) = channel(GROUPED_CHANNEL_QUEUE_LEN);
debug!("opening Xen event channel");
let evtchn = EventChannel::open().await?;
let evtchn = EventChannelService::open().await?;
debug!("opening XenStore");
let store = XsdClient::open().await?;
debug!("opening GrantTab");
@ -234,7 +231,7 @@ impl ChannelBackend {
domid: u32,
id: u32,
store: XsdClient,
evtchn: EventChannel,
evtchn: EventChannelService,
gnttab: GrantTab,
output_sender: Sender<(u32, Option<Vec<u8>>)>,
use_reserved_ref: Option<u64>,
@ -273,7 +270,7 @@ pub struct KrataChannelBackendProcessor {
id: u32,
domid: u32,
store: XsdClient,
evtchn: EventChannel,
evtchn: EventChannelService,
gnttab: GrantTab,
}
@ -492,25 +489,18 @@ impl KrataChannelBackendProcessor {
},
x = channel.receiver.recv() => match x {
Ok(_) => {
Some(_) => {
unsafe {
let buffer = self.read_output_buffer(channel.local_port, &memory).await?;
if !buffer.is_empty() {
sender.send((self.domid, Some(buffer))).await?;
}
};
channel.unmask_sender.send(channel.local_port).await?;
channel.unmask().await?;
},
Err(error) => {
match error {
broadcast::error::RecvError::Closed => {
break;
},
error => {
return Err(anyhow!("failed to receive event notification: {}", error));
}
}
None => {
break;
}
}
};

2
crates/runtime/src/ip.rs
View File

@ -7,7 +7,7 @@ use std::{
use anyhow::{anyhow, Result};
use ipnetwork::{Ipv4Network, Ipv6Network};
use log::{debug, error, trace};
use log::{debug, error};
use tokio::sync::RwLock;
use uuid::Uuid;
use xenstore::{XsdClient, XsdInterface};

5
crates/runtime/src/power.rs
View File

@ -167,7 +167,10 @@ impl PowerManagementContext {
.set_cpufreq_gov(CpuId::All, policy)
.await
.unwrap_or_else(|error| {
info!("non-fatal error while setting scheduler policy: {:?}", error);
info!(
"non-fatal error while setting scheduler policy: {:?}",
error
);
});
Ok(())
}