Skip to content

Commit

Permalink
fix(xenclient): use a single transaction for device setup (#130)
Browse files Browse the repository at this point in the history
  • Loading branch information
@azenla
azenla authored May 5, 2024
1 parent 3187830 commit 51dff03
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 39 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
View file

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

8 changes: 7 additions & 1 deletion crates/xen/xencall/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,13 @@ impl XenCall {
index,
pirq,
);
let mut physdev = PhysdevMapPirq::default();
let mut physdev = PhysdevMapPirq {
domid: domid as u16,
typ: 0x1,
index: index as c_int,
pirq: pirq.map(|x| x as c_int).unwrap_or(index as c_int),
..Default::default()
};
physdev.domid = domid as u16;
physdev.typ = 0x1;
physdev.index = index as c_int;
Expand Down
1 change: 1 addition & 0 deletions crates/xen/xenclient/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ resolver = "2"
async-trait = { workspace = true }
elf = { workspace = true }
flate2 = { workspace = true }
indexmap = { workspace = true }
libc = { workspace = true }
log = { workspace = true }
krata-xencall = { path = "../xencall", version = "^0.0.10" }
Expand Down
90 changes: 54 additions & 36 deletions crates/xen/xenclient/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ use crate::boot::{ArchBootSetup, BootSetup};
use crate::elfloader::ElfImageLoader;
use crate::error::{Error, Result};
use boot::BootState;
use indexmap::IndexMap;
use log::{debug, trace, warn};
use pci::{PciBdf, XenPciBackend};
use sys::XEN_PAGE_SHIFT;
use tokio::time::timeout;

use std::collections::HashMap;
use std::path::PathBuf;
use std::str::FromStr;
use std::time::Duration;
Expand All @@ -36,7 +36,8 @@ use xencall::sys::{
};
use xencall::XenCall;
use xenstore::{
XsPermission, XsdClient, XsdInterface, XS_PERM_NONE, XS_PERM_READ, XS_PERM_READ_WRITE,
XsPermission, XsdClient, XsdInterface, XsdTransaction, XS_PERM_NONE, XS_PERM_READ,
XS_PERM_READ_WRITE,
};

pub mod pci;
Expand Down Expand Up @@ -145,6 +146,7 @@ pub struct CreatedDomain {
pub channels: Vec<CreatedChannel>,
}

#[allow(clippy::too_many_arguments)]
impl XenClient {
pub async fn open(current_domid: u32) -> Result<XenClient> {
let store = XsdClient::open().await?;
Expand Down Expand Up @@ -374,7 +376,10 @@ impl XenClient {
{
return Err(Error::IntroduceDomainFailed);
}

let tx = self.store.transaction().await?;
self.console_device_add(
&tx,
&DomainChannel {
typ: config
.use_console_backend
Expand All @@ -397,6 +402,7 @@ impl XenClient {
for (index, channel) in config.channels.iter().enumerate() {
let (Some(ring_ref), Some(evtchn)) = self
.console_device_add(
&tx,
channel,
&p2m,
&state,
Expand All @@ -415,6 +421,7 @@ impl XenClient {

for (index, disk) in config.disks.iter().enumerate() {
self.disk_device_add(
&tx,
&dom_path,
&backend_dom_path,
config.backend_domid,
Expand All @@ -427,6 +434,7 @@ impl XenClient {

for (index, filesystem) in config.filesystems.iter().enumerate() {
self.fs_9p_device_add(
&tx,
&dom_path,
&backend_dom_path,
config.backend_domid,
Expand All @@ -439,6 +447,7 @@ impl XenClient {

for (index, vif) in config.vifs.iter().enumerate() {
self.vif_device_add(
&tx,
&dom_path,
&backend_dom_path,
config.backend_domid,
Expand All @@ -451,6 +460,7 @@ impl XenClient {

for (index, pci) in config.pcis.iter().enumerate() {
self.pci_device_add(
&tx,
&dom_path,
&backend_dom_path,
config.backend_domid,
Expand All @@ -468,20 +478,21 @@ impl XenClient {
.evtchn_alloc_unbound(domid, config.backend_domid)
.await?;
let channel_path = format!("{}/evtchn/{}", dom_path, channel.name);
self.store
.write_string(&format!("{}/name", channel_path), &channel.name)
tx.write_string(&format!("{}/name", channel_path), &channel.name)
.await?;
self.store
.write_string(&format!("{}/channel", channel_path), &id.to_string())
tx.write_string(&format!("{}/channel", channel_path), &id.to_string())
.await?;
}

tx.commit().await?;

self.call.unpause_domain(domid).await?;
Ok(CreatedDomain { domid, channels })
}

async fn disk_device_add(
&self,
tx: &XsdTransaction,
dom_path: &str,
backend_dom_path: &str,
backend_domid: u32,
Expand Down Expand Up @@ -519,6 +530,7 @@ impl XenClient {
];

self.device_add(
tx,
"vbd",
id,
dom_path,
Expand All @@ -532,9 +544,10 @@ impl XenClient {
Ok(())
}

#[allow(clippy::too_many_arguments, clippy::unnecessary_unwrap)]
#[allow(clippy::unnecessary_unwrap)]
async fn console_device_add(
&self,
tx: &XsdTransaction,
channel: &DomainChannel,
p2m: &[u64],
state: &BootState,
Expand Down Expand Up @@ -587,6 +600,7 @@ impl XenClient {
}

self.device_add(
tx,
"console",
index as u64,
dom_path,
Expand All @@ -602,6 +616,7 @@ impl XenClient {

async fn fs_9p_device_add(
&self,
tx: &XsdTransaction,
dom_path: &str,
backend_dom_path: &str,
backend_domid: u32,
Expand All @@ -625,6 +640,7 @@ impl XenClient {
];

self.device_add(
tx,
"9pfs",
id,
dom_path,
Expand All @@ -640,6 +656,7 @@ impl XenClient {

async fn vif_device_add(
&self,
tx: &XsdTransaction,
dom_path: &str,
backend_dom_path: &str,
backend_domid: u32,
Expand Down Expand Up @@ -683,6 +700,7 @@ impl XenClient {
];

self.device_add(
tx,
"vif",
id,
dom_path,
Expand All @@ -696,9 +714,9 @@ impl XenClient {
Ok(())
}

#[allow(clippy::too_many_arguments)]
async fn pci_device_add(
&self,
tx: &XsdTransaction,
dom_path: &str,
backend_dom_path: &str,
backend_domid: u32,
Expand Down Expand Up @@ -729,7 +747,12 @@ impl XenClient {
}
}

// backend.reset(&device.bdf).await?;
if let Some(irq) = backend.read_irq(&device.bdf).await? {
let irq = self.call.map_pirq(domid, irq as isize, None).await?;
self.call.irq_permission(domid, irq, true).await?;
}

backend.reset(&device.bdf).await?;

self.call
.assign_device(
Expand All @@ -743,6 +766,10 @@ impl XenClient {
)
.await?;

if device.permissive {
backend.enable_permissive(&device.bdf).await?;
}

let id = 60;

if index == 0 {
Expand All @@ -759,6 +786,7 @@ impl XenClient {
];

self.device_add(
tx,
"pci",
id,
dom_path,
Expand All @@ -773,31 +801,26 @@ impl XenClient {

let backend_path = format!("{}/backend/{}/{}/{}", backend_dom_path, "pci", domid, id);

let transaction = self.store.transaction().await?;
tx.write_string(
format!("{}/key-{}", backend_path, index),
&device.bdf.to_string(),
)
.await?;
tx.write_string(
format!("{}/dev-{}", backend_path, index),
&device.bdf.to_string(),
)
.await?;

transaction
.write_string(
format!("{}/key-{}", backend_path, index),
&device.bdf.to_string(),
)
.await?;
transaction
.write_string(
format!("{}/dev-{}", backend_path, index),
&device.bdf.to_string(),
if let Some(vdefn) = device.bdf.vdefn {
tx.write_string(
format!("{}/vdefn-{}", backend_path, index),
&format!("{:#x}", vdefn),
)
.await?;

if let Some(vdefn) = device.bdf.vdefn {
transaction
.write_string(
format!("{}/vdefn-{}", backend_path, index),
&format!("{:#x}", vdefn),
)
.await?;
}

let mut options = HashMap::new();
let mut options = IndexMap::new();
options.insert("permissive", if device.permissive { "1" } else { "0" });
options.insert("rdm_policy", device.rdm_reserve_policy.to_option_str());
options.insert("msitranslate", if device.msi_translate { "1" } else { "0" });
Expand All @@ -811,17 +834,14 @@ impl XenClient {
.collect::<Vec<_>>()
.join(",");

transaction
.write_string(format!("{}/opts-{}", backend_path, index), &options)
tx.write_string(format!("{}/opts-{}", backend_path, index), &options)
.await?;

transaction.commit().await?;
Ok(())
}

#[allow(clippy::too_many_arguments)]
async fn device_add(
&self,
tx: &XsdTransaction,
typ: &str,
id: u64,
dom_path: &str,
Expand Down Expand Up @@ -866,7 +886,6 @@ impl XenClient {
},
];

let tx = self.store.transaction().await?;
tx.mknod(&frontend_path, frontend_perms).await?;
for (p, value) in &frontend_items {
let path = format!("{}/{}", frontend_path, *p);
Expand All @@ -880,7 +899,6 @@ impl XenClient {
let path = format!("{}/{}", backend_path, *p);
tx.write_string(&path, value).await?;
}
tx.commit().await?;
Ok(())
}

Expand Down
12 changes: 10 additions & 2 deletions crates/xen/xenclient/src/pci.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,13 @@ impl XenPciBackend {
Ok(resources)
}

pub async fn enable_permissive(&self, bdf: &PciBdf) -> Result<()> {
let mut path: PathBuf = self.path.clone();
path.push("permissive");
fs::write(path, bdf.to_string()).await?;
Ok(())
}

pub async fn has_slot(&self, bdf: &PciBdf) -> Result<bool> {
let mut slots_path = self.path.clone();
slots_path.push("slots");
Expand All @@ -128,8 +135,9 @@ impl XenPciBackend {

pub async fn reset(&self, bdf: &PciBdf) -> Result<()> {
let mut path: PathBuf = self.path.clone();
path.push("do_flr");
fs::write(&path, bdf.to_string()).await?;
path.push(bdf.to_string());
path.push("reset");
let _ = fs::write(path, "1\n").await;
Ok(())
}
}
Expand Down

0 comments on commit 51dff03

Please sign in to comment.