• Lu Baolu's avatar
    iommu/vt-d: Remove unnecessary locking in intel_irq_remapping_alloc() · c7d62452
    Lu Baolu authored
    The global rwsem dmar_global_lock was introduced by commit 3a5670e8
    ("iommu/vt-d: Introduce a rwsem to protect global data structures"). It
    is used to protect DMAR related global data from DMAR hotplug operations.
    
    Using dmar_global_lock in intel_irq_remapping_alloc() is unnecessary as
    the DMAR global data structures are not touched there. Remove it to avoid
    below lockdep warning.
    
     ======================================================
     WARNING: possible circular locking dependency detected
     6.3.0-rc2 #468 Not tainted
     ------------------------------------------------------
     swapper/0/1 is trying to acquire lock:
     ff1db4cb40178698 (&domain->mutex){+.+.}-{3:3},
       at: __irq_domain_alloc_irqs+0x3b/0xa0
    
     but task is already holding lock:
     ffffffffa0c1cdf0 (dmar_global_lock){++++}-{3:3},
       at: intel_iommu_init+0x58e/0x880
    
     which lock already depends on the new lock.
    
     the existing dependency chain (in reverse order) is:
    
     -> #1 (dmar_global_lock){++++}-{3:3}:
            lock_acquire+0xd6/0x320
            down_read+0x42/0x180
            intel_irq_remapping_alloc+0xad/0x750
            mp_irqdomain_alloc+0xb8/0x2b0
            irq_domain_alloc_irqs_locked+0x12f/0x2d0
            __irq_domain_alloc_irqs+0x56/0xa0
            alloc_isa_irq_from_domain.isra.7+0xa0/0xe0
            mp_map_pin_to_irq+0x1dc/0x330
            setup_IO_APIC+0x128/0x210
            apic_intr_mode_init+0x67/0x110
            x86_late_time_init+0x24/0x40
            start_kernel+0x41e/0x7e0
            secondary_startup_64_no_verify+0xe0/0xeb
    
     -> #0 (&domain->mutex){+.+.}-{3:3}:
            check_prevs_add+0x160/0xef0
            __lock_acquire+0x147d/0x1950
            lock_acquire+0xd6/0x320
            __mutex_lock+0x9c/0xfc0
            __irq_domain_alloc_irqs+0x3b/0xa0
            dmar_alloc_hwirq+0x9e/0x120
            iommu_pmu_register+0x11d/0x200
            intel_iommu_init+0x5de/0x880
            pci_iommu_init+0x12/0x40
            do_one_initcall+0x65/0x350
            kernel_init_freeable+0x3ca/0x610
            kernel_init+0x1a/0x140
            ret_from_fork+0x29/0x50
    
     other info that might help us debug this:
    
     Possible unsafe locking scenario:
    
            CPU0                    CPU1
            ----                    ----
       lock(dmar_global_lock);
                                    lock(&domain->mutex);
                                    lock(dmar_global_lock);
       lock(&domain->mutex);
    
                    *** DEADLOCK ***
    
    Fixes: 9dbb8e34 ("irqdomain: Switch to per-domain locking")
    Reviewed-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
    Tested-by: default avatarJason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
    Link: https://lore.kernel.org/r/20230314051836.23817-1-baolu.lu@linux.intel.com
    Link: https://lore.kernel.org/r/20230329134721.469447-2-baolu.lu@linux.intel.comSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
    c7d62452
irq_remapping.c 37.5 KB