github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 15:32:30 +00:00
Code Issues Projects Releases Wiki Activity

agent/uevent: Consolidate event matching logic

Browse Source 
The event matching logic in Uevent::process_add() is split into two parts.
The first checks if we care about the event at all, the second checks
whether the event is relevant to a particular watcher.

However, we're going to be adding more types of watchers in future, which
will make the global filter too restrictive.  Fold the two bits of logic
together into a per-watcher filter function.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2021-03-04 15:03:49 +11:00
parent d2caff6c55
commit b8b322482c
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/agent/src/uevent.rs
View File

@ -66,19 +66,6 @@ impl Uevent {
return; return;
} }
let pci_root_bus_path = create_pci_root_bus_path();
// Check whether this is a block device hot-add event.
if !(self.subsystem == "block"
&& {
self.devpath.starts_with(pci_root_bus_path.as_str())
|| self.devpath.starts_with(ACPI_DEV_PATH) // NVDIMM/PMEM devices
}
&& !self.devname.is_empty())
{
return;
}
let mut sb = sandbox.lock().await; let mut sb = sandbox.lock().await;
// Record the event by sysfs path // Record the event by sysfs path
@ -87,20 +74,36 @@ impl Uevent {
// Notify watchers that are interested in the udev event. // Notify watchers that are interested in the udev event.
for watch in &mut sb.uevent_watchers { for watch in &mut sb.uevent_watchers {
if let Some((dev_addr, _)) = watch { if let Some((dev_addr, _)) = watch {
let pci_root_bus_path = create_pci_root_bus_path();
let pci_p = format!("{}{}", pci_root_bus_path, dev_addr); let pci_p = format!("{}{}", pci_root_bus_path, dev_addr);
let pmem_suffix = format!("/{}/{}", SCSI_BLOCK_SUFFIX, self.devname);
if self.devpath.starts_with(pci_p.as_str()) || // blk block device let is_match = |uev: &Uevent| {
( // scsi block device let pmem_suffix = format!("/{}/{}", SCSI_BLOCK_SUFFIX, uev.devname);
dev_addr.ends_with(SCSI_BLOCK_SUFFIX) &&
self.devpath.contains(dev_addr.as_str()) uev.subsystem == "block"
) || && {
( // nvdimm/pmem device uev.devpath.starts_with(pci_root_bus_path.as_str())
self.devpath.starts_with(ACPI_DEV_PATH) && || uev.devpath.starts_with(ACPI_DEV_PATH) // NVDIMM/PMEM devices
self.devpath.ends_with(pmem_suffix.as_str()) && }
dev_addr.ends_with(pmem_suffix.as_str()) && !uev.devname.is_empty()
) && {
{ // blk block device
uev.devpath.starts_with(pci_p.as_str())
// scsi block device
|| (
dev_addr.ends_with(SCSI_BLOCK_SUFFIX) &&
uev.devpath.contains(dev_addr.as_str())
)
// nvdimm/pmem device
|| (
uev.devpath.starts_with(ACPI_DEV_PATH) &&
uev.devpath.ends_with(pmem_suffix.as_str()) &&
dev_addr.ends_with(pmem_suffix.as_str())
)
}
};
if is_match(&self) {
let (_, sender) = watch.take().unwrap(); let (_, sender) = watch.take().unwrap();
let _ = sender.send(self.clone()); let _ = sender.send(self.clone());
} }