Skip to content

Commit 25f3bcf

Browse files
LuBaolujoergroedel
authored andcommitted
driver core: Add dma_cleanup callback in bus_type
The bus_type structure defines dma_configure() callback for bus drivers to configure DMA on the devices. This adds the paired dma_cleanup() callback and calls it during driver unbinding so that bus drivers can do some cleanup work. One use case for this paired DMA callbacks is for the bus driver to check for DMA ownership conflicts during driver binding, where multiple devices belonging to a same IOMMU group (the minimum granularity of isolation and protection) may be assigned to kernel drivers or user space respectively. Without this change, for example, the vfio driver has to listen to a bus BOUND_DRIVER event and then BUG_ON() in case of dma ownership conflict. This leads to bad user experience since careless driver binding operation may crash the system if the admin overlooks the group restriction. Aside from bad design, this leads to a security problem as a root user, even with lockdown=integrity, can force the kernel to BUG. With this change, the bus driver could check and set the DMA ownership in driver binding process and fail on ownership conflicts. The DMA ownership should be released during driver unbinding. Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Link: https://lore.kernel.org/r/20220418005000.897664-3-baolu.lu@linux.intel.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 1ea2a07 commit 25f3bcf

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

drivers/base/dd.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,8 @@ static int really_probe(struct device *dev, struct device_driver *drv)
671671
if (dev->bus)
672672
blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
673673
BUS_NOTIFY_DRIVER_NOT_BOUND, dev);
674+
if (dev->bus && dev->bus->dma_cleanup)
675+
dev->bus->dma_cleanup(dev);
674676
pinctrl_bind_failed:
675677
device_links_no_driver(dev);
676678
device_unbind_cleanup(dev);
@@ -1199,6 +1201,9 @@ static void __device_release_driver(struct device *dev, struct device *parent)
11991201

12001202
device_remove(dev);
12011203

1204+
if (dev->bus && dev->bus->dma_cleanup)
1205+
dev->bus->dma_cleanup(dev);
1206+
12021207
device_links_driver_cleanup(dev);
12031208
device_unbind_cleanup(dev);
12041209

include/linux/device/bus.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ struct fwnode_handle;
5959
* bus supports.
6060
* @dma_configure: Called to setup DMA configuration on a device on
6161
* this bus.
62+
* @dma_cleanup: Called to cleanup DMA configuration on a device on
63+
* this bus.
6264
* @pm: Power management operations of this bus, callback the specific
6365
* device driver's pm-ops.
6466
* @iommu_ops: IOMMU specific operations for this bus, used to attach IOMMU
@@ -103,6 +105,7 @@ struct bus_type {
103105
int (*num_vf)(struct device *dev);
104106

105107
int (*dma_configure)(struct device *dev);
108+
void (*dma_cleanup)(struct device *dev);
106109

107110
const struct dev_pm_ops *pm;
108111

0 commit comments

Comments
 (0)