drm/amdgpu: Take IOMMU remapping into account for p2p checks
Subsystems (2)
PATCH 1/1 drm/amdgpu: Take IOMMU remapping into account for p2p checks
when trying to enable p2p the amdgpu_device_is_peer_accessible() checks the condition where address_mask overlaps the aper_base and hence returns 0, due to which the p2p disables for this platform
IOMMU should remap the BAR addresses so the device can access them. Hence check if iommu_remap and return true.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 30 +++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -1138,6 +1138,8 @@ struct amdgpu_device {bool ram_is_direct_mapped; +bool iommu_remap; +struct list_head ras_list;struct ip_discovery_top *ip_top;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +24 -6
@@ -3950,6 +3950,9 @@ static void amdgpu_device_check_iommu_direct_map(struct amdgpu_device *adev) domain =iommu_get_domain_for_dev (adev->dev);if (!domain || domain->type ==IOMMU_DOMAIN_IDENTITY ) adev->ram_is_direct_mapped = true; + +if (!domain || domain->type !=IOMMU_DOMAIN_IDENTITY ) + adev->iommu_remap = true; }static const struct attribute *amdgpu_dev_attributes[] = {
@@ -6127,6 +6130,19 @@ bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, struct amdgpu_device *peer_adev) {#ifdef CONFIG_HSA_AMD_P2P +/** +* There are chances when we are in amdgpu_device_init +* and either of adev have not called amdgpu_device_check_iommu_direct_map, +* Hence check if iommu_remap is available or not. +*/ +if (!adev->iommu_remap) +amdgpu_device_check_iommu_direct_map (adev); +if (!peer_adev->iommu_remap) +amdgpu_device_check_iommu_direct_map (peer_adev); + +bool remap = adev->iommu_remap; +bool peer_remap = peer_adev->iommu_remap; +uint64_t address_mask = peer_adev->dev->dma_mask ? ~*peer_adev->dev->dma_mask : ~((1ULL <<32 ) -1 ); resource_size_t aper_limit =
@@ -6135,13 +6151,15 @@ bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, !adev->gmc.xgmi.connected_to_cpu && !(pci_p2pdma_distance (adev->pdev, peer_adev->dev, false) <0 ); -return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size && - adev->gmc.real_vram_size == adev->gmc.visible_vram_size && - !(adev->gmc.aper_base & address_mask || - aper_limit & address_mask)); -#else -return false; +if (remap && peer_remap) +return pcie_p2p && p2p_access; +else +return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size && + adev->gmc.real_vram_size == adev->gmc.visible_vram_size && + !(adev->gmc.aper_base & address_mask || + aper_limit & address_mask));#endif +return false; }int amdgpu_device_baco_enter (struct drm_device *dev)
Signature · 1 line
2.34.1
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static void amdgpu_device_check_iommu_direct_map(struct amdgpu_device *adev)
Quoted 32 lines · Rahul Jain
when trying to enable p2p the
amdgpu_device_is_peer_accessible()checks the condition whereaddress_maskoverlaps theaper_baseand hence returns 0, due to which the p2p disables for this platformIOMMU should remap the BAR addresses so the device can access them. Hence check if
iommu_remapand return true.Signed-off-by Rahul Jain <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 30 +++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +2
-0@@ -1138,6 +1138,8 @@ struct amdgpu_device {bool ram_is_direct_mapped; +bool iommu_remap; +struct list_head ras_list;struct ip_discovery_top *ip_top;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0@@ -3950,6 +3950,9 @@ static void amdgpu_device_check_iommu_direct_map(struct amdgpu_device *adev)
We may want to rename amdgpu_device_check_iommu_direct_map() to amdgpu_device_check_iommu() since we are getting several pieces of data now.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c static void amdgpu_device_check_iommu_direct_map(struct amdgpu_device *adev) · line 3955
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-0domain =iommu_get_domain_for_dev (adev->dev);if (!domain || domain->type ==IOMMU_DOMAIN_IDENTITY ) adev->ram_is_direct_mapped = true; + +if (!domain || domain->type !=IOMMU_DOMAIN_IDENTITY ) + adev->iommu_remap = true;
This is wrong, it should be:
if (domain && (domain->type == IOMMU_DOMAIN_DMA || domain->type == IOMMU_DOMAIN_DMA_FQ))
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-0}static const struct attribute *amdgpu_dev_attributes[] = {@@ -6127,6 +6130,19 @@ bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, struct amdgpu_device *peer_adev) {
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, · line 6141
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +9
-0#ifdef CONFIG_HSA_AMD_P2P +/** +* There are chances when we are in amdgpu_device_init +* and either of adev have not called amdgpu_device_check_iommu_direct_map, +* Hence check if iommu_remap is available or not. +*/ +if (!adev->iommu_remap) +amdgpu_device_check_iommu_direct_map (adev); +if (!peer_adev->iommu_remap) +amdgpu_device_check_iommu_direct_map (peer_adev);
This is ugly. We should fix this up so we guarantee that amdgpu_device_check_iommu_direct_map() has been called by this point or just check this explicitly everywhere rather than caching it in the adev structure.
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, · line 6144
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-0+ +bool remap = adev->iommu_remap; +bool peer_remap = peer_adev->iommu_remap;
Need to declare variables before code. Also this function looks at whether peer_adev can access adev via DMA, so we only need to look at peer_adev for DMA remapping.
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +1
-5+uint64_t address_mask = peer_adev->dev->dma_mask ? ~*peer_adev->dev->dma_mask : ~((1ULL <<32 ) -1 ); resource_size_t aper_limit =@@ -6135,13 +6151,15 @@ bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, !adev->gmc.xgmi.connected_to_cpu && !(pci_p2pdma_distance (adev->pdev, peer_adev->dev, false) <0 ); -return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size && - adev->gmc.real_vram_size == adev->gmc.visible_vram_size && - !(adev->gmc.aper_base & address_mask || - aper_limit & address_mask)); -#else
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, · line 6162
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +8
-1-return false; +if (remap && peer_remap) +return pcie_p2p && p2p_access; +else +return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size && + adev->gmc.real_vram_size == adev->gmc.visible_vram_size && + !(adev->gmc.aper_base & address_mask || + aper_limit & address_mask));#endif +return false;
This needs to be fixed up:
if (peer_remap)
/* IOMMU is remapping DMA for peer_adev so all accesses
should be within peer_adev's DMA mask */
return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size &&
adev->gmc.real_vram_size == adev->gmc.visible_vram_size);
else
/* No IOMMU remapping so make sure the adev's aperture
fits into peer_adev's dma mask */
return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size &&
adev->gmc.real_vram_size ==
adev->gmc.visible_vram_size &&
!(adev->gmc.aper_base & address_mask ||
aper_limit & address_mask));Alex
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0
-1}int amdgpu_device_baco_enter (struct drm_device *dev) --2.34.1