diff options
| author | Joerg Roedel <jroedel@suse.de> | 2014-08-05 12:55:45 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2014-08-18 13:37:56 +0200 |
| commit | e7f9fa5498d91fcdc63d93007ba43f36b1a30538 (patch) | |
| tree | 6dbc2a2cb2e5f4406e594d6782ce53347e3e60e1 /drivers/iommu | |
| parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) | |
| download | linux-e7f9fa5498d91fcdc63d93007ba43f36b1a30538.tar.gz linux-e7f9fa5498d91fcdc63d93007ba43f36b1a30538.tar.bz2 linux-e7f9fa5498d91fcdc63d93007ba43f36b1a30538.zip | |
iommu/vt-d: Defer domain removal if device is assigned to a driver
When the BUS_NOTIFY_DEL_DEVICE event is received the device
might still be attached to a driver. In this case the domain
can't be released as the mappings might still be in use.
Defer the domain removal in this case until we receivce the
BUS_NOTIFY_UNBOUND_DRIVER event.
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: stable@vger.kernel.org # v3.15, v3.16
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index d1f5caad04f9..5619f264862d 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3869,6 +3869,14 @@ static int device_notifier(struct notifier_block *nb, action != BUS_NOTIFY_DEL_DEVICE) return 0; + /* + * If the device is still attached to a device driver we can't + * tear down the domain yet as DMA mappings may still be in use. + * Wait for the BUS_NOTIFY_UNBOUND_DRIVER event to do that. + */ + if (action == BUS_NOTIFY_DEL_DEVICE && dev->driver != NULL) + return 0; + domain = find_domain(dev); if (!domain) return 0; |