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

plugins/amdgpu: Fix error handling in plugin init

Browse source 
The function was not closing the drm fd duplicated by the libdrm call,
could attempt to deinitialize the libdrm device which wasn't successfully
openened, and was using errno based log functions when libdrm functions
used return a negative errno. Fix it all.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
This commit is contained in:
Tvrtko Ursulin 2026-04-15 10:51:43 +01:00 • committed by Andrei Vagin
parent d96a2eb292
commit 47ab00240a
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
plugins/amdgpu/amdgpu_plugin.c
View file

@ -2196,34 +2196,33 @@ CR_PLUGIN_REGISTER_HOOK(CR_PLUGIN_HOOK__RESUME_DEVICES_LATE, amdgpu_plugin_resum
int init_dev(int dev_minor, amdgpu_device_handle *h_dev, uint64_t *max_copy_size)
{
int ret = 0;
int drm_fd = -1;
struct amdgpu_gpu_info gpu_info = { };
uint32_t major, minor;
struct amdgpu_gpu_info gpu_info = { 0 };
int drm_fd, ret;
drm_fd = open_drm_render_device(dev_minor);
if (drm_fd < 0) {
if (drm_fd < 0)
return drm_fd;
}
ret = amdgpu_device_initialize(drm_fd, &major, &minor, h_dev);
close(drm_fd);
if (ret) {
pr_perror("Failed to initialize device");
goto err;
pr_err("Failed to initialize device - %s\n", strerror(-ret));
return ret;
}
ret = amdgpu_query_gpu_info(*h_dev, &gpu_info);
if (ret) {
pr_perror("failed to query gpuinfo via libdrm");
goto err;
pr_err("failed to query gpuinfo via libdrm - %s\n",
strerror(-ret));
amdgpu_device_deinitialize(*h_dev);
return ret;
}
*max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ? SDMA_LINEAR_COPY_MAX_SIZE :
SDMA_LINEAR_COPY_MAX_SIZE - 1;
*max_copy_size = (gpu_info.family_id >= AMDGPU_FAMILY_AI) ?
SDMA_LINEAR_COPY_MAX_SIZE : SDMA_LINEAR_COPY_MAX_SIZE - 1;
return 0;
err:
amdgpu_device_deinitialize(*h_dev);
return ret;
}
FILE *get_bo_contents_fp(int id, int gpu_id, size_t tot_size)