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

plugin/amdgpu: Don't print error when restoring drm file

Browse source 
When the amdgpu plugin is called for restore of a file img,
we don't initially know if it's a kfd or drm file. So we first
try to open a kfd file, and if that fails, we assume it's
a drm file. That failure leads to a lot of error messages like

Error amdgpu_plugin: amdgpu-kfd-141.img: Failed to open for read

For this normal behaviour.

Add an option on open_img_file to suppress this error when
we aren't sure if the file we're trying to open exists.

Signed-off-by: David Francis <David.Francis@amd.com>
This commit is contained in:
David Francis 2026-03-11 14:10:00 -04:00 • committed by Andrei Vagin
parent bd4cd4e9ee
commit bce0a3c756
5 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/amdgpu/amdgpu_plugin.c
View file

@ -849,7 +849,7 @@ void *dump_bo_contents(void *_thread_data)
}
snprintf(img_path, sizeof(img_path), IMG_KFD_PAGES_FILE, thread_data->id, thread_data->gpu_id);
bo_contents_fp = open_img_file(img_path, true, &image_size);
bo_contents_fp = open_img_file(img_path, true, &image_size, true);
if (!bo_contents_fp) {
pr_perror("Cannot fopen %s", img_path);
ret = -EIO;
@ -923,7 +923,7 @@ void *restore_bo_contents(void *_thread_data)
SDMA_LINEAR_COPY_MAX_SIZE - 1;
snprintf(img_path, sizeof(img_path), IMG_KFD_PAGES_FILE, thread_data->id, thread_data->gpu_id);
bo_contents_fp = open_img_file(img_path, false, &image_size);
bo_contents_fp = open_img_file(img_path, false, &image_size, true);
if (!bo_contents_fp) {
pr_perror("Cannot fopen %s", img_path);
ret = -errno;
@ -1140,7 +1140,7 @@ int amdgpu_restore_init(void)
if (d) {
while ((dir = readdir(d)) != NULL) {
if (strncmp("amdgpu-kfd-", dir->d_name, strlen("amdgpu-kfd-")) == 0) {
img_fp = open_img_file(dir->d_name, false, &img_size);
img_fp = open_img_file(dir->d_name, false, &img_size, true);
if (!img_fp)
return -EINVAL;
@ -1165,7 +1165,7 @@ int amdgpu_restore_init(void)
xfree(buf);
}
if (strncmp("amdgpu-renderD-", dir->d_name, strlen("amdgpu-renderD-")) == 0) {
img_fp = open_img_file(dir->d_name, false, &img_size);
img_fp = open_img_file(dir->d_name, false, &img_size, true);
if (!img_fp)
return -EINVAL;
@ -1837,7 +1837,7 @@ int amdgpu_plugin_restore_file(int id, bool *retry_needed)
snprintf(img_path, sizeof(img_path), IMG_KFD_FILE, id);
img_fp = open_img_file(img_path, false, &img_size);
img_fp = open_img_file(img_path, false, &img_size, false);
if (!img_fp) {
struct tp_node *tp_node;
uint32_t target_gpu_id;
@ -1849,7 +1849,7 @@ int amdgpu_plugin_restore_file(int id, bool *retry_needed)
*/
snprintf(img_path, sizeof(img_path), IMG_DRM_FILE, id);
img_fp = open_img_file(img_path, false, &img_size);
img_fp = open_img_file(img_path, false, &img_size, true);
if (!img_fp) {
ret = amdgpu_plugin_dmabuf_restore(id);
if (ret == 1) {
@ -2231,7 +2231,7 @@ FILE *get_bo_contents_fp(int id, int gpu_id, size_t tot_size)
FILE *bo_contents_fp = NULL;
snprintf(img_path, sizeof(img_path), IMG_KFD_PAGES_FILE, id, gpu_id);
bo_contents_fp = open_img_file(img_path, false, &image_size);
bo_contents_fp = open_img_file(img_path, false, &image_size, true);
if (!bo_contents_fp) {
pr_perror("Cannot fopen %s", img_path);
return NULL;

2
plugins/amdgpu/amdgpu_plugin_dmabuf.c
View file

@ -106,7 +106,7 @@ int amdgpu_plugin_dmabuf_restore(int id)
snprintf(path, sizeof(path), IMG_DMABUF_FILE, id);
/* Read serialized metadata */
img_fp = open_img_file(path, false, &img_size);
img_fp = open_img_file(path, false, &img_size, true);
if (!img_fp) {
pr_err("Failed to open dmabuf metadata file: %s\n", path);
return -EINVAL;

4
plugins/amdgpu/amdgpu_plugin_drm.c
View file

@ -209,7 +209,7 @@ static int restore_bo_contents_drm(int drm_render_minor, CriuRenderNode *rd, int
snprintf(img_path, sizeof(img_path), IMG_DRM_PAGES_FILE, rd->id, drm_render_minor, i);
bo_contents_fp = open_img_file(img_path, false, &image_size);
bo_contents_fp = open_img_file(img_path, false, &image_size, true);
if (!bo_contents_fp) {
ret = -EINVAL;
break;
@ -382,7 +382,7 @@ int amdgpu_plugin_drm_dump_file(int fd, int id, struct stat *drm)
drmPrimeHandleToFD(device_fd, boinfo->handle, 0, &dmabuf_fd);
snprintf(img_path, sizeof(img_path), IMG_DRM_PAGES_FILE, rd->id, rd->drm_render_minor, i);
bo_contents_fp = open_img_file(img_path, true, &image_size);
bo_contents_fp = open_img_file(img_path, true, &image_size, true);
posix_memalign(&buffer, sysconf(_SC_PAGE_SIZE), handle_entry.size);

8
plugins/amdgpu/amdgpu_plugin_util.c
View file

@ -228,9 +228,10 @@ int write_fp(FILE *fp, const void *buf, const size_t buf_len)
* @param path The file path
* @param write False for read, true for write
* @param size Size of actual contents
* @param expect_present If true, the file not existing is an error
* @return FILE *if successful, NULL if failed
*/
FILE *open_img_file(char *path, bool write, size_t *size)
FILE *open_img_file(char *path, bool write, size_t *size, bool expect_present)
{
FILE *fp = NULL;
int fd, ret;
@ -241,7 +242,8 @@ FILE *open_img_file(char *path, bool write, size_t *size)
fd = openat(criu_get_image_dir(), path, write ? (O_WRONLY | O_CREAT) : O_RDONLY, 0600);
if (fd < 0) {
pr_err("%s: Failed to open for %s\n", path, write ? "write" : "read");
if (expect_present)
pr_err("%s: Failed to open for %s\n", path, write ? "write" : "read");
return NULL;
}
@ -300,7 +302,7 @@ int write_img_file(char *path, const void *buf, const size_t buf_len)
FILE *fp;
size_t len = buf_len;
fp = open_img_file(path, true, &len);
fp = open_img_file(path, true, &len, true);
if (!fp)
return -errno;

2
plugins/amdgpu/amdgpu_plugin_util.h
View file

@ -119,7 +119,7 @@ int read_fp(FILE *fp, void *buf, const size_t buf_len);
int write_fp(FILE *fp, const void *buf, const size_t buf_len);
int read_file(const char *file_path, void *buf, const size_t buf_len);
int write_img_file(char *path, const void *buf, const size_t buf_len);
FILE *open_img_file(char *path, bool write, size_t *size);
FILE *open_img_file(char *path, bool write, size_t *size, bool expect_present);
int record_dumped_fd(int fd, bool is_drm);
struct list_head *get_dumped_fds();