Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-18 00:58:31 +00:00
Code Issues Projects Releases Wiki Activity

plugins/amdgpu: Consolidate vm_info collection

Browse source 
Instead of open coding the same ioctl twice we can put it in a loop from
which we break out once we have allocated enough space for all objects.

While at it we add error handling for the memory allocation.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-By: David Francis <David.Francis@amd.com>
---
v2:
 * s/for(;;)/while(1)/ (David)
This commit is contained in:
Tvrtko Ursulin 2026-02-19 17:37:52 +00:00 • committed by Andrei Vagin
parent 5659b3954b
commit ea080673bb
1 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

48
plugins/amdgpu/amdgpu_plugin_drm.c
View file

@ -310,8 +310,7 @@ int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
for (int i = 0; i < num_bos; i++) {
int num_vm_entries = 8;
struct drm_amdgpu_gem_vm_entry *vm_info_entries;
struct drm_amdgpu_gem_op vm_info_args = { 0 };
struct drm_amdgpu_gem_vm_entry *vm_info_entries = NULL;
DrmBoEntry *boinfo = rd->bo_entries[i];
struct drm_amdgpu_gem_list_handles_entry handle_entry = list_handles_entries[i];
union drm_amdgpu_gem_mmap mmap_args = { 0 };
@ -341,42 +340,37 @@ int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
boinfo->offset = mmap_args.out.addr_ptr;
vm_info_entries = xzalloc(sizeof(struct drm_amdgpu_gem_vm_entry) * num_vm_entries);
if (!vm_info_entries) {
ret = -ENOMEM;
goto exit;
}
vm_info_args.handle = handle_entry.gem_handle;
vm_info_args.num_entries = num_vm_entries;
vm_info_args.value = (uintptr_t)vm_info_entries;
vm_info_args.op = AMDGPU_GEM_OP_GET_MAPPING_INFO;
ret = drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_OP, &vm_info_args);
if (ret) {
pr_perror("Failed to call vm info ioctl");
xfree(vm_info_entries);
goto exit;
}
while (1) {
struct drm_amdgpu_gem_op vm_info_args = {
.handle = handle_entry.gem_handle,
.num_entries = num_vm_entries,
.op = AMDGPU_GEM_OP_GET_MAPPING_INFO,
};
if (vm_info_args.num_entries > num_vm_entries) {
num_vm_entries = vm_info_args.num_entries;
xfree(vm_info_entries);
vm_info_entries = xzalloc(sizeof(struct drm_amdgpu_gem_vm_entry) * num_vm_entries);
if (vm_info_entries)
xfree(vm_info_entries);
vm_info_entries = xzalloc(sizeof(*vm_info_entries) *
num_vm_entries);
if (!vm_info_entries) {
ret = -ENOMEM;
goto exit;
}
vm_info_args.handle = handle_entry.gem_handle;
vm_info_args.num_entries = num_vm_entries;
vm_info_args.value = (uintptr_t)vm_info_entries;
vm_info_args.op = AMDGPU_GEM_OP_GET_MAPPING_INFO;
ret = drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_OP, &vm_info_args);
ret = drmIoctl(fd, DRM_IOCTL_AMDGPU_GEM_OP,
&vm_info_args);
if (ret) {
pr_perror("Failed to call vm info ioctl");
xfree(vm_info_entries);
goto exit;
}
} else {
num_vm_entries = vm_info_args.num_entries;
if (vm_info_args.num_entries <= num_vm_entries) {
num_vm_entries = vm_info_args.num_entries;
break;
} else {
num_vm_entries = vm_info_args.num_entries;
}
}
boinfo->num_of_vms = num_vm_entries;