drm/amdgpu: Generalize KFD dmabuf import
Subsystems (3)
Felix Kuehling
maintainerPATCH 1/2 drm/amdgpu: Generalize KFD dmabuf import
Use proper amdgpu_gem_prime_import function to handle all kinds of imports. Remember the dmabuf reference to enable proper multi-GPU attachment to multiple VMs without erroneously re-exporting the underlying BO multiple times.
Signed-off-by Felix Kuehling <[email protected]>
--- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +28 -17
@@ -2000,30 +2000,34 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct amdgpu_device *adev,struct amdgpu_bo *bo;int ret; -if (dma_buf->ops != &amdgpu_dmabuf_ops) -/* Can't handle non-graphics buffers */ -return -EINVAL ; - - obj = dma_buf->priv; -if (drm_to_adev (obj->dev) != adev) -/* Can't handle buffers from other devices */ -return -EINVAL ; + obj =amdgpu_gem_prime_import (adev_to_drm (adev), dma_buf); +if (IS_ERR (obj)) +return PTR_ERR (obj); +if (obj->import_attach) { +/* Import takes an extra reference if it creates a dynamic +* dmabuf attachment. Release that reference to avoid +* leaking it. FIXME: I think this is a bug. +*/ +dma_buf_put (dma_buf); + } bo =gem_to_amdgpu_bo (obj);if (!(bo->preferred_domains & (AMDGPU_GEM_DOMAIN_VRAM | -AMDGPU_GEM_DOMAIN_GTT ))) +AMDGPU_GEM_DOMAIN_GTT ))) {/* Only VRAM and GTT BOs are supported */ -return -EINVAL ; + ret = -EINVAL ; + goto err_put_obj; + } *mem =kzalloc (sizeof (struct kgd_mem ),GFP_KERNEL ); -if (!*mem) -return -ENOMEM ; +if (!*mem) { + ret = -ENOMEM ; + goto err_put_obj; + } ret =drm_vma_node_allow (&obj->vma_node, drm_priv); -if (ret) { -kfree (mem); -return ret; - } +if (ret) + goto err_free_mem;if (size) *size =amdgpu_bo_size (bo);
@@ -2040,7 +2044,8 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct amdgpu_device *adev, | KFD_IOC_ALLOC_MEM_FLAGS_WRITABLE |KFD_IOC_ALLOC_MEM_FLAGS_EXECUTABLE ; -drm_gem_object_get (&bo->tbo.base); +get_dma_buf (dma_buf); + (*mem)->dmabuf = dma_buf; (*mem)->bo = bo; (*mem)->va = va; (*mem)->domain = (bo->preferred_domains & AMDGPU_GEM_DOMAIN_VRAM) ?
@@ -2052,6 +2057,12 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct amdgpu_device *adev, (*mem)->is_imported = true;return 0 ; + +err_free_mem: +kfree (mem); +err_put_obj: +drm_gem_object_put (obj); +return ret; }/* Evict a userptr BO by stopping the queues if necessary
Signature · 1 line
2.32.0
Felix Kuehling
maintainerPATCH 2/2 drm/amdkfd: Implement DMA buf fd export for RDMA
Exports a DMA buf fd of a given KFD buffer handle. This is intended for the new upstreamable RDMA solution coming to UCX and libfabric.
The corresponding user mode change (Thunk API and kfdtest) is here:
https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/commits/fxkamd/dmabuf
Signed-off-by Felix Kuehling <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 45 +++++++++++---- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 55 +++++++++++++++++++ include/uapi/linux/kfd_ioctl.h | 14 ++++- 4 files changed, 104 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +2 -0
@@ -294,6 +294,8 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct amdgpu_device *adev, uint64_t va, void *drm_priv, struct kgd_mem **mem, uint64_t *size, uint64_t *mmap_offset); +int amdgpu_amdkfd_gpuvm_export_dmabuf (struct kgd_mem *mem, +struct dma_buf **dmabuf);int amdgpu_amdkfd_get_tile_config (struct amdgpu_device *adev,struct tile_config *config);void amdgpu_amdkfd_ras_poison_consumption_handler (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +35 -10
63 lines not on this page · raw message
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +55 -0
67 lines not on this page · raw message
include/uapi/linux/kfd_ioctl.h +12 -2
@@ -32,9 +32,10 @@* - 1.4 - Indicate new SRAM EDC bit in device properties * - 1.5 - Add SVM API * - 1.6 - Query clear flags in SVM get_attr API +* - 1.7 - Add DMA buf export ioctl */ #define KFD_IOCTL_MAJOR_VERSION 1 -#define KFD_IOCTL_MINOR_VERSION 6 +#define KFD_IOCTL_MINOR_VERSION 7struct kfd_ioctl_get_version_args {__u32 major_version;/* from KFD */
@@ -450,6 +451,12 @@ struct kfd_ioctl_import_dmabuf_args {__u32 dmabuf_fd;/* to KFD */ }; +struct kfd_ioctl_export_dmabuf_args { +__u64 handle;/* to KFD */ +__u32 flags;/* to KFD */ +__u32 dmabuf_fd;/* from KFD */ +}; +/* * KFD SMI(System Management Interface) events */
@@ -742,7 +749,10 @@ struct kfd_ioctl_set_xnack_mode_args {#define AMDKFD_IOC_SET_XNACK_MODE \ AMDKFD_IOWR(0x21, struct kfd_ioctl_set_xnack_mode_args) +#define AMDKFD_IOC_EXPORT_DMABUF \ + AMDKFD_IOWR(0x22, struct kfd_ioctl_export_dmabuf_args) +#define AMDKFD_COMMAND_START 0x01 -#define AMDKFD_COMMAND_END 0x22 +#define AMDKFD_COMMAND_END 0x23#endif
Signature · 1 line
2.32.0