Skip to content

Commit 93c0f09

Browse files
LuBaolutursulin
authored andcommitted
iommu/vt-d: Use rcu_lock in get_resv_regions
Commit 5f64ce5 ("iommu/vt-d: Duplicate iommu_resv_region objects per device list") converted rcu_lock in get_resv_regions to dmar_global_lock to allow sleeping in iommu_alloc_resv_region(). This introduced possible recursive locking if get_resv_regions is called from within a section where intel_iommu_init() already holds dmar_global_lock. Especially after commit c919739 ("iommu/vt-d: Handle race between registration and device probe"), below lockdep splats could always be seen. ============================================ WARNING: possible recursive locking detected 6.0.0-rc4+ torvalds#325 Tainted: G I -------------------------------------------- swapper/0/1 is trying to acquire lock: ffffffffa8a18c90 (dmar_global_lock){++++}-{3:3}, at: intel_iommu_get_resv_regions+0x25/0x270 but task is already holding lock: ffffffffa8a18c90 (dmar_global_lock){++++}-{3:3}, at: intel_iommu_init+0x36d/0x6ea ... Call Trace: <TASK> dump_stack_lvl+0x48/0x5f __lock_acquire.cold.73+0xad/0x2bb lock_acquire+0xc2/0x2e0 ? intel_iommu_get_resv_regions+0x25/0x270 ? lock_is_held_type+0x9d/0x110 down_read+0x42/0x150 ? intel_iommu_get_resv_regions+0x25/0x270 intel_iommu_get_resv_regions+0x25/0x270 iommu_create_device_direct_mappings.isra.28+0x8d/0x1c0 ? iommu_get_dma_cookie+0x6d/0x90 bus_iommu_probe+0x19f/0x2e0 iommu_device_register+0xd4/0x130 intel_iommu_init+0x3e1/0x6ea ? iommu_setup+0x289/0x289 ? rdinit_setup+0x34/0x34 pci_iommu_init+0x12/0x3a do_one_initcall+0x65/0x320 ? rdinit_setup+0x34/0x34 ? rcu_read_lock_sched_held+0x5a/0x80 kernel_init_freeable+0x28a/0x2f3 ? rest_init+0x1b0/0x1b0 kernel_init+0x1a/0x130 ret_from_fork+0x1f/0x30 </TASK> This rolls back dmar_global_lock to rcu_lock to avoid the lockdep splat. Fixes: c919739 ("iommu/vt-d: Handle race between registration and device probe") Signed-off-by: Lu Baolu <[email protected]> Signed-off-by: Tvrtko Ursulin <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent a64d600 commit 93c0f09

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/iommu/intel/iommu.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4518,7 +4518,7 @@ static void intel_iommu_get_resv_regions(struct device *device,
45184518
struct device *i_dev;
45194519
int i;
45204520

4521-
down_read(&dmar_global_lock);
4521+
rcu_read_lock();
45224522
for_each_rmrr_units(rmrr) {
45234523
for_each_active_dev_scope(rmrr->devices, rmrr->devices_cnt,
45244524
i, i_dev) {
@@ -4537,14 +4537,14 @@ static void intel_iommu_get_resv_regions(struct device *device,
45374537

45384538
resv = iommu_alloc_resv_region(rmrr->base_address,
45394539
length, prot, type,
4540-
GFP_KERNEL);
4540+
GFP_ATOMIC);
45414541
if (!resv)
45424542
break;
45434543

45444544
list_add_tail(&resv->list, head);
45454545
}
45464546
}
4547-
up_read(&dmar_global_lock);
4547+
rcu_read_unlock();
45484548

45494549
#ifdef CONFIG_INTEL_IOMMU_FLOPPY_WA
45504550
if (dev_is_pci(device)) {

0 commit comments

Comments
 (0)