• Lianbo Jiang's avatar
    iommu: use the __iommu_attach_device() directly for deferred attach · 3ab65729
    Lianbo Jiang authored
    Currently, because domain attach allows to be deferred from iommu
    driver to device driver, and when iommu initializes, the devices
    on the bus will be scanned and the default groups will be allocated.
    
    Due to the above changes, some devices could be added to the same
    group as below:
    
    [    3.859417] pci 0000:01:00.0: Adding to iommu group 16
    [    3.864572] pci 0000:01:00.1: Adding to iommu group 16
    [    3.869738] pci 0000:02:00.0: Adding to iommu group 17
    [    3.874892] pci 0000:02:00.1: Adding to iommu group 17
    
    But when attaching these devices, it doesn't allow that a group has
    more than one device, otherwise it will return an error. This conflicts
    with the deferred attaching. Unfortunately, it has two devices in the
    same group for my side, for example:
    
    [    9.627014] iommu_group_device_count(): device name[0]:0000:01:00.0
    [    9.633545] iommu_group_device_count(): device name[1]:0000:01:00.1
    ...
    [   10.255609] iommu_group_device_count(): device name[0]:0000:02:00.0
    [   10.262144] iommu_group_device_count(): device name[1]:0000:02:00.1
    
    Finally, which caused the failure of tg3 driver when tg3 driver calls
    the dma_alloc_coherent() to allocate coherent memory in the tg3_test_dma().
    
    [    9.660310] tg3 0000:01:00.0: DMA engine test failed, aborting
    [    9.754085] tg3: probe of 0000:01:00.0 failed with error -12
    [    9.997512] tg3 0000:01:00.1: DMA engine test failed, aborting
    [   10.043053] tg3: probe of 0000:01:00.1 failed with error -12
    [   10.288905] tg3 0000:02:00.0: DMA engine test failed, aborting
    [   10.334070] tg3: probe of 0000:02:00.0 failed with error -12
    [   10.578303] tg3 0000:02:00.1: DMA engine test failed, aborting
    [   10.622629] tg3: probe of 0000:02:00.1 failed with error -12
    
    In addition, the similar situations also occur in other drivers such
    as the bnxt_en driver. That can be reproduced easily in kdump kernel
    when SME is active.
    
    Let's move the handling currently in iommu_dma_deferred_attach() into
    the iommu core code so that it can call the __iommu_attach_device()
    directly instead of the iommu_attach_device(). The external interface
    iommu_attach_device() is not suitable for handling this situation.
    Signed-off-by: default avatarLianbo Jiang <lijiang@redhat.com>
    Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
    Link: https://lore.kernel.org/r/20210126115337.20068-3-lijiang@redhat.comSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
    3ab65729
dma-iommu.c 39.5 KB