Add CRIU support for amdgpu dmabuf
Subsystems (4)
PATCH v15 1/1 Add CRIU support for amdgpu dmabuf
This patch series adds support for CRIU checkpointing of processes that share memory with the amdgpu dmabuf interface.
This v15 makes some adjustments to the uapi.
Accompanying CRIU changes:
https://github.com/checkpoint-restore/criu/pull/2613
PATCH v15 1/4 drm/amdgpu: Allow more flags to be set on gem create.
AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE is a flag that specifies that gem memory contains sensitive information and should be cleared to prevent snooping.
The COHERENT and UNCACHED gem create flags enable memory features related to sharing memory across devices.
For CRIU we need to re-create KFD BOs through the GEM_CREATE IOCTL, so allow those KFD specific flags here as well. This will also aid us in the future and allows to move the KFD components over using the render node for allocations.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +--------- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +1 -9
@@ -442,15 +442,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,int r;/* reject invalid gem flags */ -if (flags & ~(AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | -AMDGPU_GEM_CREATE_NO_CPU_ACCESS | -AMDGPU_GEM_CREATE_CPU_GTT_USWC | -AMDGPU_GEM_CREATE_VRAM_CLEARED | -AMDGPU_GEM_CREATE_VM_ALWAYS_VALID | -AMDGPU_GEM_CREATE_EXPLICIT_SYNC | -AMDGPU_GEM_CREATE_ENCRYPTED | -AMDGPU_GEM_CREATE_GFX12_DCC | -AMDGPU_GEM_CREATE_DISCARDABLE )) +if (flags & ~AMDGPU_GEM_CREATE_SETTABLE_MASK )return -EINVAL ;/* reject invalid gem domains */
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h +14 -0
@@ -71,4 +71,18 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,int amdgpu_gem_metadata_ioctl (struct drm_device *dev,void *data,struct drm_file *filp); +#define AMDGPU_GEM_CREATE_SETTABLE_MASK (AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED | \ + AMDGPU_GEM_CREATE_NO_CPU_ACCESS | \ + AMDGPU_GEM_CREATE_CPU_GTT_USWC | \ + AMDGPU_GEM_CREATE_VRAM_CLEARED | \ + AMDGPU_GEM_CREATE_VM_ALWAYS_VALID | \ + AMDGPU_GEM_CREATE_EXPLICIT_SYNC | \ + AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE | \ + AMDGPU_GEM_CREATE_ENCRYPTED | \ + AMDGPU_GEM_CREATE_GFX12_DCC | \ + AMDGPU_GEM_CREATE_DISCARDABLE | \ + AMDGPU_GEM_CREATE_COHERENT | \ + AMDGPU_GEM_CREATE_UNCACHED | \ + AMDGPU_GEM_CREATE_EXT_COHERENT) +#endif
Signature · 1 line
2.34.1
PATCH v15 2/4 drm/amdgpu: Add ioctl to get all gem handles for a process
In reply to David FrancisAdd new ioctl DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES.
This ioctl returns a list of bos with their handles, sizes, and flags and domains.
This ioctl is meant to be used during CRIU checkpoint and provide information needed to reconstruct the bos in CRIU restore.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 80 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 2 + include/uapi/drm/amdgpu_drm.h | 34 +++++++++++ 4 files changed, 117 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -0
@@ -3031,6 +3031,7 @@ const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {DRM_IOCTL_DEF_DRV (AMDGPU_USERQ , amdgpu_userq_ioctl,DRM_AUTH |DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (AMDGPU_USERQ_SIGNAL , amdgpu_userq_signal_ioctl,DRM_AUTH |DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (AMDGPU_USERQ_WAIT , amdgpu_userq_wait_ioctl,DRM_AUTH |DRM_RENDER_ALLOW ), + DRM_IOCTL_DEF_DRV(AMDGPU_GEM_LIST_HANDLES, amdgpu_gem_list_handles_ioctl, DRM_AUTH|DRM_RENDER_ALLOW), }; static const struct drm_driver amdgpu_kms_driver = {
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +80 -0
86 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h +2 -0
@@ -67,6 +67,8 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);int amdgpu_gem_op_ioctl (struct drm_device *dev,void *data,struct drm_file *filp); +int amdgpu_gem_list_handles_ioctl (struct drm_device *dev,void *data, +struct drm_file *filp);int amdgpu_gem_metadata_ioctl (struct drm_device *dev,void *data,struct drm_file *filp);
include/uapi/drm/amdgpu_drm.h +34 -0
@@ -57,6 +57,7 @@ extern "C" {#define DRM_AMDGPU_USERQ 0x16#define DRM_AMDGPU_USERQ_SIGNAL 0x17#define DRM_AMDGPU_USERQ_WAIT 0x18 +#define DRM_AMDGPU_GEM_LIST_HANDLES 0x19#define DRM_IOCTL_AMDGPU_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)#define DRM_IOCTL_AMDGPU_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)
@@ -77,6 +78,7 @@ extern "C" {#define DRM_IOCTL_AMDGPU_USERQ DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ, union drm_amdgpu_userq)#define DRM_IOCTL_AMDGPU_USERQ_SIGNAL DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_SIGNAL, struct drm_amdgpu_userq_signal)#define DRM_IOCTL_AMDGPU_USERQ_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_WAIT, struct drm_amdgpu_userq_wait) +#define DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_LIST_HANDLES, struct drm_amdgpu_gem_list_handles)/** * DOC: memory domains
@@ -811,6 +813,38 @@ struct drm_amdgpu_gem_op {__u64 value; }; +#define AMDGPU_GEM_LIST_HANDLES_FLAG_IS_IMPORT (1 << 0) + +struct drm_amdgpu_gem_list_handles { +/* User pointer to array of drm_amdgpu_gem_bo_info_entry */ +__u64 entries; + +/* IN: Size of entries buffer. OUT: Number of handles in process (if larger than size of buffer, must retry) */ +__u32 num_entries; + +__u32 padding; +}; + +struct drm_amdgpu_gem_list_handles_entry { +/* gem handle of buffer object */ +__u32 gem_handle; + +/* Currently just one flag: IS_IMPORT */ +__u32 flags; + +/* Size of bo */ +__u64 size; + +/* Preferred domains for GEM_CREATE */ +__u64 preferred_domains; + +/* GEM_CREATE flags for re-creation of buffer */ +__u64 alloc_flags; + +/* physical start_addr alignment in bytes for some HW requirements */ +__u64 alignment; +}; +#define AMDGPU_VA_OP_MAP 1#define AMDGPU_VA_OP_UNMAP 2#define AMDGPU_VA_OP_CLEAR 3
Signature · 1 line
2.34.1
Christian König
maintainerRe: [PATCH v15 2/4] drm/amdgpu: Add ioctl to get all gem handles for a process
Quoted 154 lines · David Francis
Add new ioctl
DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES.This ioctl returns a list of bos with their handles, sizes, and flags and domains.
This ioctl is meant to be used during CRIU checkpoint and provide information needed to reconstruct the bos in CRIU restore.
Signed-off-by David Francis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 80 +++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 2 + include/uapi/drm/amdgpu_drm.h | 34 +++++++++++ 4 files changed, 117 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0@@ -3031,6 +3031,7 @@ const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {DRM_IOCTL_DEF_DRV (AMDGPU_USERQ , amdgpu_userq_ioctl,DRM_AUTH |DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (AMDGPU_USERQ_SIGNAL , amdgpu_userq_signal_ioctl,DRM_AUTH |DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (AMDGPU_USERQ_WAIT , amdgpu_userq_wait_ioctl,DRM_AUTH |DRM_RENDER_ALLOW ), + DRM_IOCTL_DEF_DRV(AMDGPU_GEM_LIST_HANDLES, amdgpu_gem_list_handles_ioctl, DRM_AUTH|DRM_RENDER_ALLOW), }; static const struct drm_driver amdgpu_kms_driver = {drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +80
-0@@ -1024,6 +1024,86 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,return r; } +/** +* drm_amdgpu_gem_list_handles_ioctl - get information about a process' buffer objects +* +* @dev: drm device pointer +* @data: drm_amdgpu_gem_list_handles +* @filp: drm file pointer +* +* num_entries is set as an input to the size of the entries array. +* num_entries is sent back as output as the number of bos in the process. +* If that number is larger than the size of the array, the ioctl must +* be retried. +* +* Returns: +* 0 for success, -errno for errors. +*/ +int amdgpu_gem_list_handles_ioctl (struct drm_device *dev,void *data, +struct drm_file *filp) +{ +struct drm_amdgpu_gem_list_handles *args = data; +struct drm_amdgpu_gem_list_handles_entry *bo_entries; +struct drm_gem_object *gobj; +int id, ret =0 ; +int bo_index =0 ; +int num_bos =0 ; + +spin_lock (&filp->table_lock); +idr_for_each_entry (&filp->object_idr, gobj, id) + num_bos +=1 ; +spin_unlock (&filp->table_lock); + +if (args->num_entries < num_bos) { + args->num_entries = num_bos; +return 0 ; + } + +if (num_bos ==0 ) { + args->num_entries =0 ; +return 0 ; + } + + bo_entries =kvcalloc (num_bos,sizeof (*bo_entries),GFP_KERNEL ); +if (!bo_entries) +return -ENOMEM ; + +spin_lock (&filp->table_lock); +idr_for_each_entry (&filp->object_idr, gobj, id) { +struct amdgpu_bo *bo =gem_to_amdgpu_bo (gobj); +struct drm_amdgpu_gem_list_handles_entry *bo_entry; + +if (bo_index >= num_bos) { + ret = -EAGAIN ; +break ; + } + + bo_entry = &bo_entries[bo_index]; + + bo_entry->size =amdgpu_bo_size (bo); + bo_entry->alloc_flags = bo->flags &AMDGPU_GEM_CREATE_SETTABLE_MASK ; + bo_entry->preferred_domains = bo->preferred_domains; + bo_entry->gem_handle = id; + bo_entry->alignment = bo->tbo.page_alignment; + +if (bo->tbo.base.import_attach) + bo_entry->flags |=AMDGPU_GEM_LIST_HANDLES_FLAG_IS_IMPORT ; + + bo_index +=1 ; + } +spin_unlock (&filp->table_lock); + + args->num_entries = bo_index; + +if (!ret) + ret =copy_to_user (u64_to_user_ptr (args->entries), bo_entries, num_bos *sizeof (*bo_entries)); + +kvfree (bo_entries); + +return ret; +} + + static int amdgpu_gem_align_pitch(struct amdgpu_device *adev, int width, int cpp,drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h +2
-0@@ -67,6 +67,8 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, struct drm_file *filp);int amdgpu_gem_op_ioctl (struct drm_device *dev,void *data,struct drm_file *filp); +int amdgpu_gem_list_handles_ioctl (struct drm_device *dev,void *data, +struct drm_file *filp);int amdgpu_gem_metadata_ioctl (struct drm_device *dev,void *data,struct drm_file *filp);include/uapi/drm/amdgpu_drm.h +2
-0@@ -57,6 +57,7 @@ extern "C" {#define DRM_AMDGPU_USERQ 0x16#define DRM_AMDGPU_USERQ_SIGNAL 0x17#define DRM_AMDGPU_USERQ_WAIT 0x18 +#define DRM_AMDGPU_GEM_LIST_HANDLES 0x19#define DRM_IOCTL_AMDGPU_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_CREATE, union drm_amdgpu_gem_create)#define DRM_IOCTL_AMDGPU_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_MMAP, union drm_amdgpu_gem_mmap)@@ -77,6 +78,7 @@ extern "C" {#define DRM_IOCTL_AMDGPU_USERQ DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ, union drm_amdgpu_userq)#define DRM_IOCTL_AMDGPU_USERQ_SIGNAL DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_SIGNAL, struct drm_amdgpu_userq_signal)#define DRM_IOCTL_AMDGPU_USERQ_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_USERQ_WAIT, struct drm_amdgpu_userq_wait) +#define DRM_IOCTL_AMDGPU_GEM_LIST_HANDLES DRM_IOWR(DRM_COMMAND_BASE + DRM_AMDGPU_GEM_LIST_HANDLES, struct drm_amdgpu_gem_list_handles)/** * DOC: memory domains
include/uapi/drm/amdgpu_drm.h struct drm_amdgpu_gem_op { · line 822
Quoted 10 lines
include/uapi/drm/amdgpu_drm.h +7
-0@@ -811,6 +813,38 @@ struct drm_amdgpu_gem_op {__u64 value; }; +#define AMDGPU_GEM_LIST_HANDLES_FLAG_IS_IMPORT (1 << 0) + +struct drm_amdgpu_gem_list_handles { +/* User pointer to array of drm_amdgpu_gem_bo_info_entry */ +__u64 entries; + +/* IN: Size of entries buffer. OUT: Number of handles in process (if larger than size of buffer, must retry) */
Please drop the "IN" here, that is no longer an input only parameter.
With that fixed, feel free to add Reviewed-by: Christian König <[email protected]>
Regards,
Christian.
Quoted 28 lines
include/uapi/drm/amdgpu_drm.h +25
-0+__u32 num_entries; + +__u32 padding; +}; + +struct drm_amdgpu_gem_list_handles_entry { +/* gem handle of buffer object */ +__u32 gem_handle; + +/* Currently just one flag: IS_IMPORT */ +__u32 flags; + +/* Size of bo */ +__u64 size; + +/* Preferred domains for GEM_CREATE */ +__u64 preferred_domains; + +/* GEM_CREATE flags for re-creation of buffer */ +__u64 alloc_flags; + +/* physical start_addr alignment in bytes for some HW requirements */ +__u64 alignment; +}; +#define AMDGPU_VA_OP_MAP 1#define AMDGPU_VA_OP_UNMAP 2#define AMDGPU_VA_OP_CLEAR 3
PATCH v15 3/4 drm/amdgpu: Add mapping info option for GEM_OP ioctl
In reply to David FrancisAdd new GEM_OP_IOCTL option GET_MAPPING_INFO, which returns a list of mappings associated with a given bo, along with their positions and offsets.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 98 ++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 ++ include/uapi/drm/amdgpu_drm.h | 21 +++++- 3 files changed, 120 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +95 -3
@@ -948,6 +948,70 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,return r; } +/** +* amdgpu_gem_list_mappings - get information about a buffer's mappings +* +* @gobj: gem object +* @args: gem_op arguments +* @fpriv: drm file pointer +* +* num_entries is set as an input to the size of the user-allocated array of +* drm_amdgpu_gem_vm_entry stored at args->value. +* num_entries is sent back as output as the number of mappings the bo has. +* If that number is larger than the size of the array, the ioctl must +* be retried. +* +* Returns: +* 0 for success, -errno for errors. +*/ +static int amdgpu_gem_list_mappings (struct drm_gem_object *gobj,struct amdgpu_fpriv *fpriv, +struct drm_amdgpu_gem_op *args) +{ +struct amdgpu_vm *avm = &fpriv->vm; +struct amdgpu_bo *bo =gem_to_amdgpu_bo (gobj); +struct amdgpu_bo_va *bo_va =amdgpu_vm_bo_find (avm, bo); +struct drm_amdgpu_gem_vm_entry *vm_entries; +struct amdgpu_bo_va_mapping *mapping; +int num_mappings =0 ; +int ret; + +if (args->padding) +return -EINVAL ; + + vm_entries =kvcalloc (args->num_entries,sizeof (*vm_entries),GFP_KERNEL ); +if (!vm_entries) +return -ENOMEM ; + +amdgpu_vm_bo_va_for_each_valid_mapping (bo_va, mapping) { +if (num_mappings < args->num_entries) { + vm_entries[num_mappings].addr = mapping->start *AMDGPU_GPU_PAGE_SIZE ; + vm_entries[num_mappings].size = (mapping->last - mapping->start +1 ) *AMDGPU_GPU_PAGE_SIZE ; + vm_entries[num_mappings].offset = mapping->offset; + vm_entries[num_mappings].flags = mapping->flags; + } + num_mappings +=1 ; + } + +amdgpu_vm_bo_va_for_each_invalid_mapping (bo_va, mapping) { +if (num_mappings < args->num_entries) { + vm_entries[num_mappings].addr = mapping->start *AMDGPU_GPU_PAGE_SIZE ; + vm_entries[num_mappings].size = (mapping->last - mapping->start +1 ) *AMDGPU_GPU_PAGE_SIZE ; + vm_entries[num_mappings].offset = mapping->offset; + vm_entries[num_mappings].flags = mapping->flags; + } + num_mappings +=1 ; + } + +if (num_mappings >0 && num_mappings <= args->num_entries) + ret =copy_to_user (u64_to_user_ptr (args->value), vm_entries, num_mappings *sizeof (*vm_entries)); + + args->num_entries = num_mappings; + +kvfree (vm_entries); + +return ret; +} +int amdgpu_gem_op_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) {
@@ -955,6 +1019,8 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,struct drm_gem_object *gobj;struct amdgpu_vm_bo_base *base;struct amdgpu_bo *robj; +struct drm_exec exec; +struct amdgpu_fpriv *fpriv = filp->driver_priv;int r; gobj =drm_gem_object_lookup (filp, args->handle);
@@ -963,9 +1029,27 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, robj =gem_to_amdgpu_bo (gobj); - r =amdgpu_bo_reserve (robj, false); -if (unlikely (r)) - goto out; +if (args->op ==AMDGPU_GEM_OP_GET_MAPPING_INFO ) { +drm_exec_init (&exec,DRM_EXEC_INTERRUPTIBLE_WAIT | +DRM_EXEC_IGNORE_DUPLICATES ,0 ); + drm_exec_until_all_locked(&exec) { +if (gobj) { + r =drm_exec_lock_obj (&exec, gobj); +drm_exec_retry_on_contention (&exec); +if (r) + goto out_exec; + } + + r =amdgpu_vm_lock_pd (&fpriv->vm, &exec,0 ); +drm_exec_retry_on_contention (&exec); +if (r) + goto out_exec; + } + }else { + r =amdgpu_bo_reserve (robj, false); +if (unlikely (r)) + goto out; + }switch (args->op) {case AMDGPU_GEM_OP_GET_GEM_CREATE_INFO : {
@@ -1014,6 +1098,10 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,amdgpu_bo_unreserve (robj);break ; +case AMDGPU_GEM_OP_GET_MAPPING_INFO : + r =amdgpu_gem_list_mappings (gobj, fpriv, args); +drm_exec_fini (&exec); +break ;default :amdgpu_bo_unreserve (robj); r = -EINVAL ;
@@ -1022,6 +1110,10 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, out:drm_gem_object_put (gobj);return r; +out_exec: +drm_exec_fini (&exec); +drm_gem_object_put (gobj); +return r; }/**
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +5 -0
@@ -668,4 +668,9 @@ void amdgpu_vm_tlb_fence_create(struct amdgpu_device *adev,struct amdgpu_vm *vm, struct dma_fence **fence); +#define amdgpu_vm_bo_va_for_each_valid_mapping (bo_va, mapping) \ + list_for_each_entry(mapping, &bo_va->valids, list) +#define amdgpu_vm_bo_va_for_each_invalid_mapping (bo_va, mapping) \ + list_for_each_entry(mapping, &bo_va->invalids, list) +#endif
include/uapi/drm/amdgpu_drm.h +20 -1
@@ -802,6 +802,21 @@ union drm_amdgpu_wait_fences {#define AMDGPU_GEM_OP_GET_GEM_CREATE_INFO 0#define AMDGPU_GEM_OP_SET_PLACEMENT 1 +#define AMDGPU_GEM_OP_GET_MAPPING_INFO 2 + +struct drm_amdgpu_gem_vm_entry { +/* Start of mapping (in bytes) */ +__u64 addr; + +/* Size of mapping (in bytes) */ +__u64 size; + +/* Mapping offset */ +__u64 offset; + +/* flags needed to recreate mapping */ +__u64 flags; +};/* Sets or returns a value associated with a buffer. */ struct drm_amdgpu_gem_op {
@@ -809,8 +824,12 @@ struct drm_amdgpu_gem_op {__u32 handle;/** AMDGPU_GEM_OP_* */ __u32 op; -/** Input or return value */ +/** Input or return value. For MAPPING_INFO op: pointer to array of struct drm_amdgpu_gem_vm_entry */ __u64 value; +/** For MAPPING_INFO op: number of mappings (in/out) */ +__u32 num_entries; + +__u32 padding; };#define AMDGPU_GEM_LIST_HANDLES_FLAG_IS_IMPORT (1 << 0)
Signature · 1 line
2.34.1
Christian König
maintainerRe: [PATCH v15 3/4] drm/amdgpu: Add mapping info option for GEM_OP ioctl
Quoted 114 lines · David Francis
Add new
GEM_OP_IOCTLoptionGET_MAPPING_INFO, which returns a list of mappings associated with a given bo, along with their positions and offsets.Signed-off-by David Francis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 98 ++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 5 ++ include/uapi/drm/amdgpu_drm.h | 21 +++++- 3 files changed, 120 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +77
-3@@ -948,6 +948,70 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,return r; } +/** +* amdgpu_gem_list_mappings - get information about a buffer's mappings +* +* @gobj: gem object +* @args: gem_op arguments +* @fpriv: drm file pointer +* +* num_entries is set as an input to the size of the user-allocated array of +* drm_amdgpu_gem_vm_entry stored at args->value. +* num_entries is sent back as output as the number of mappings the bo has. +* If that number is larger than the size of the array, the ioctl must +* be retried. +* +* Returns: +* 0 for success, -errno for errors. +*/ +static int amdgpu_gem_list_mappings (struct drm_gem_object *gobj,struct amdgpu_fpriv *fpriv, +struct drm_amdgpu_gem_op *args) +{ +struct amdgpu_vm *avm = &fpriv->vm; +struct amdgpu_bo *bo =gem_to_amdgpu_bo (gobj); +struct amdgpu_bo_va *bo_va =amdgpu_vm_bo_find (avm, bo); +struct drm_amdgpu_gem_vm_entry *vm_entries; +struct amdgpu_bo_va_mapping *mapping; +int num_mappings =0 ; +int ret; + +if (args->padding) +return -EINVAL ; + + vm_entries =kvcalloc (args->num_entries,sizeof (*vm_entries),GFP_KERNEL ); +if (!vm_entries) +return -ENOMEM ; + +amdgpu_vm_bo_va_for_each_valid_mapping (bo_va, mapping) { +if (num_mappings < args->num_entries) { + vm_entries[num_mappings].addr = mapping->start *AMDGPU_GPU_PAGE_SIZE ; + vm_entries[num_mappings].size = (mapping->last - mapping->start +1 ) *AMDGPU_GPU_PAGE_SIZE ; + vm_entries[num_mappings].offset = mapping->offset; + vm_entries[num_mappings].flags = mapping->flags; + } + num_mappings +=1 ; + } + +amdgpu_vm_bo_va_for_each_invalid_mapping (bo_va, mapping) { +if (num_mappings < args->num_entries) { + vm_entries[num_mappings].addr = mapping->start *AMDGPU_GPU_PAGE_SIZE ; + vm_entries[num_mappings].size = (mapping->last - mapping->start +1 ) *AMDGPU_GPU_PAGE_SIZE ; + vm_entries[num_mappings].offset = mapping->offset; + vm_entries[num_mappings].flags = mapping->flags; + } + num_mappings +=1 ; + } + +if (num_mappings >0 && num_mappings <= args->num_entries) + ret =copy_to_user (u64_to_user_ptr (args->value), vm_entries, num_mappings *sizeof (*vm_entries)); + + args->num_entries = num_mappings; + +kvfree (vm_entries); + +return ret; +} +int amdgpu_gem_op_ioctl (struct drm_device *dev,void *data,struct drm_file *filp) {@@ -955,6 +1019,8 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,struct drm_gem_object *gobj;struct amdgpu_vm_bo_base *base;struct amdgpu_bo *robj; +struct drm_exec exec; +struct amdgpu_fpriv *fpriv = filp->driver_priv;int r; gobj =drm_gem_object_lookup (filp, args->handle);@@ -963,9 +1029,27 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, robj =gem_to_amdgpu_bo (gobj); - r =amdgpu_bo_reserve (robj, false); -if (unlikely (r)) - goto out; +if (args->op ==AMDGPU_GEM_OP_GET_MAPPING_INFO ) { +drm_exec_init (&exec,DRM_EXEC_INTERRUPTIBLE_WAIT | +DRM_EXEC_IGNORE_DUPLICATES ,0 ); + drm_exec_until_all_locked(&exec) { +if (gobj) { + r =drm_exec_lock_obj (&exec, gobj); +drm_exec_retry_on_contention (&exec); +if (r) + goto out_exec; + } +
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, · line 1053
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +10
-0+ r =amdgpu_vm_lock_pd (&fpriv->vm, &exec,0 ); +drm_exec_retry_on_contention (&exec); +if (r) + goto out_exec; + } + }else { + r =amdgpu_bo_reserve (robj, false); +if (unlikely (r)) + goto out; + }
Just simplify that into:
drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT | DRM_EXEC_IGNORE_DUPLICATES, 0);
drm_exec_until_all_locked(&exec) {
r = drm_exec_lock_obj(&exec, gobj);
drm_exec_retry_on_contention(&exec);
if (r)
goto out_exec;
switch(args->op) {
...
case AMDGPU_GEM_OP_GET_MAPPING_INFO:
r = amdgpu_vm_lock_pd(&fpriv->vm, &exec, 0);
drm_exec_retry_on_contention(&exec);
if (r)
goto out_exec;
...
}Regards,
Christian.
Quoted 79 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +8
-0switch (args->op) {case AMDGPU_GEM_OP_GET_GEM_CREATE_INFO : {@@ -1014,6 +1098,10 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data,amdgpu_bo_unreserve (robj);break ; +case AMDGPU_GEM_OP_GET_MAPPING_INFO : + r =amdgpu_gem_list_mappings (gobj, fpriv, args); +drm_exec_fini (&exec); +break ;default :amdgpu_bo_unreserve (robj); r = -EINVAL ;@@ -1022,6 +1110,10 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, out:drm_gem_object_put (gobj);return r; +out_exec: +drm_exec_fini (&exec); +drm_gem_object_put (gobj); +return r; }/** drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +5
-0@@ -668,4 +668,9 @@ void amdgpu_vm_tlb_fence_create(struct amdgpu_device *adev,struct amdgpu_vm *vm, struct dma_fence **fence); +#define amdgpu_vm_bo_va_for_each_valid_mapping (bo_va, mapping) \ + list_for_each_entry(mapping, &bo_va->valids, list) +#define amdgpu_vm_bo_va_for_each_invalid_mapping (bo_va, mapping) \ + list_for_each_entry(mapping, &bo_va->invalids, list) +#endif include/uapi/drm/amdgpu_drm.h +20
-1@@ -802,6 +802,21 @@ union drm_amdgpu_wait_fences {#define AMDGPU_GEM_OP_GET_GEM_CREATE_INFO 0#define AMDGPU_GEM_OP_SET_PLACEMENT 1 +#define AMDGPU_GEM_OP_GET_MAPPING_INFO 2 + +struct drm_amdgpu_gem_vm_entry { +/* Start of mapping (in bytes) */ +__u64 addr; + +/* Size of mapping (in bytes) */ +__u64 size; + +/* Mapping offset */ +__u64 offset; + +/* flags needed to recreate mapping */ +__u64 flags; +};/* Sets or returns a value associated with a buffer. */ struct drm_amdgpu_gem_op {@@ -809,8 +824,12 @@ struct drm_amdgpu_gem_op {__u32 handle;/** AMDGPU_GEM_OP_* */ __u32 op; -/** Input or return value */ +/** Input or return value. For MAPPING_INFO op: pointer to array of struct drm_amdgpu_gem_vm_entry */ __u64 value; +/** For MAPPING_INFO op: number of mappings (in/out) */ +__u32 num_entries; + +__u32 padding; };#define AMDGPU_GEM_LIST_HANDLES_FLAG_IS_IMPORT (1 << 0)
PATCH v15 4/4 drm/amdgpu: Allow kfd CRIU with no buffer objects
In reply to David FrancisThe kfd CRIU checkpoint ioctl would return an error if trying to checkpoint a process with no kfd buffer objects.
This is a normal case and should not be an error.
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +2 -2
@@ -2566,8 +2566,8 @@ static int criu_restore(struct file *filep,pr_debug ("CRIU restore (num_devices:%u num_bos:%u num_objects:%u priv_data_size:%llu)\n" , args->num_devices, args->num_bos, args->num_objects, args->priv_data_size); -if (!args->bos || !args->devices || !args->priv_data || !args->priv_data_size || - !args->num_devices || !args->num_bos) +if ((args->num_bos >0 && !args->bos) || !args->devices || !args->priv_data || + !args->priv_data_size || !args->num_devices)return -EINVAL ;mutex_lock (&p->mutex);
Signature · 1 line
2.34.1