drm/amdkfd: register HMM dev memory to DMA-able range first
Subsystems (3)
PATCH 1/1 drm/amdkfd: register HMM dev memory to DMA-able range first
HMM device memory is allocated at the top of iomem_resource, when iomem_resource is larger than GPU device's dma mask, after devm_memremap_pages, max_pfn will also be update and exceed device's dma mask, when there are multiple card on system need to be init, ttm_device_init would be called with use_dma32=true, and this is not necessary at all. let's request dev memory region at DMA-able range first.
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +5 -1
@@ -1020,6 +1020,7 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev)struct amdgpu_kfd_dev *kfddev = &adev->kfd;struct dev_pagemap *pgmap;struct resource *res =NULL ; +struct resource temp_res = iomem_resource;unsigned long size;void *r;
@@ -1042,7 +1043,10 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) pgmap->range.end = adev->gmc.aper_base + adev->gmc.aper_size -1 ; pgmap->type =MEMORY_DEVICE_COHERENT ; }else { - res =devm_request_free_mem_region (adev->dev, &iomem_resource, size); + temp_res.end =dma_get_mask (adev->dev); + res =devm_request_free_mem_region (adev->dev, &temp_res, size); +if (IS_ERR (res)) + res =devm_request_free_mem_region (adev->dev, &iomem_resource, size);if (IS_ERR (res))return PTR_ERR (res); pgmap->range.start = res->start;
Signature · 1 line
2.25.1
Felix Kuehling
maintainerQuoted 9 lines · francisco_flynn
HMM device memory is allocated at the top of
iomem_resource, wheniomem_resourceis larger than GPU device's dma mask, afterdevm_memremap_pages,max_pfnwill also be update and exceed device's dma mask, when there are multiple card on system need to be init,ttm_device_initwould be called with use_dma32=true, and this is not necessary at all. let's request dev memory region at DMA-able range first.
That doesn't make sense to me. The addresses allocated here are not DMA addresses. They cannot be accessed by the GPU via DMA. They are purely fictional addresses for the purposes of creating struct pages for device-private memory. There should be no need to limit them by the GPU's DMA mask.
Regards,
Felix
Quoted 30 lines
Signed-off-by francisco_flynn <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +5
-1@@ -1020,6 +1020,7 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev)struct amdgpu_kfd_dev *kfddev = &adev->kfd;struct dev_pagemap *pgmap;struct resource *res =NULL ; +struct resource temp_res = iomem_resource;unsigned long size;void *r;@@ -1042,7 +1043,10 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) pgmap->range.end = adev->gmc.aper_base + adev->gmc.aper_size -1 ; pgmap->type =MEMORY_DEVICE_COHERENT ; }else { - res =devm_request_free_mem_region (adev->dev, &iomem_resource, size); + temp_res.end =dma_get_mask (adev->dev); + res =devm_request_free_mem_region (adev->dev, &temp_res, size); +if (IS_ERR (res)) + res =devm_request_free_mem_region (adev->dev, &iomem_resource, size);if (IS_ERR (res))return PTR_ERR (res); pgmap->range.start = res->start;
Quoted 11 lines · Felix Kuehling
Quoted 9 lines · francisco_flynn
HMM device memory is allocated at the top of
iomem_resource, wheniomem_resourceis larger than GPU device's dma mask, afterdevm_memremap_pages,max_pfnwill also be update and exceed device's dma mask, when there are multiple card on system need to be init,ttm_device_initwould be called with use_dma32=true, and this is not necessary at all. let's request dev memory region at DMA-able range first.That doesn't make sense to me. The addresses allocated here are not DMA addresses. They cannot be accessed by the GPU via DMA. They are purely fictional addresses for the purposes of creating struct pages for device-private memory. There should be no need to limit them by the GPU's DMA mask.
yes, this address is used by CPU to access VRAM. The patch is intended to cope with a special case, after checking the latest kernel code, i found this problem has been solved by this commit,
thanks for you reply.
Best regards,
flynn
Quoted 33 lines
Regards,
FelixQuoted 29 lines
Signed-off-by francisco_flynn <[email protected]>--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +5
-1@@ -1020,6 +1020,7 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev)struct amdgpu_kfd_dev *kfddev = &adev->kfd;struct dev_pagemap *pgmap;struct resource *res =NULL ; +struct resource temp_res = iomem_resource;unsigned long size;void *r;@@ -1042,7 +1043,10 @@ int kgd2kfd_init_zone_device(struct amdgpu_device *adev) pgmap->range.end = adev->gmc.aper_base + adev->gmc.aper_size -1 ; pgmap->type =MEMORY_DEVICE_COHERENT ; }else { - res =devm_request_free_mem_region (adev->dev, &iomem_resource, size); + temp_res.end =dma_get_mask (adev->dev); + res =devm_request_free_mem_region (adev->dev, &temp_res, size); +if (IS_ERR (res)) + res =devm_request_free_mem_region (adev->dev, &iomem_resource, size);if (IS_ERR (res))return PTR_ERR (res); pgmap->range.start = res->start;