]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
drm/amdkfd: Don't acquire buffers during CRIU queue restore.
authorDavid Francis <David.Francis@amd.com>
Tue, 30 Jun 2026 13:58:18 +0000 (09:58 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 8 Jul 2026 20:44:14 +0000 (16:44 -0400)
commit8a93f77aec65574b8152c88eb73613336f92f86b
tree9a4f7ae3be1f3461e8ae7cd47bdbda67111db607
parent3888a656e8143e4b40f01143648c768fecbfefc6
drm/amdkfd: Don't acquire buffers during CRIU queue restore.

kfd_criu_restore_queue's call of kfd_queue_acquire_buffers was
failing for multiple reasons
- The ctl_stack_size set by the CRIU plugin doesn't match
what is expected by acquire_buffers
- The svm buffer cannot be acquired at this point because
CRIU may not have restored it, or may have restored it
to a different address.

The only reason acquire_buffers was necessary here was to
avoid a null ptr dereference in init_user_queue.

Just put in a check for that dereference; it doesn't appear to
come up in real use cases right now. That is, there is no
usage of CRIU with shared MES.

This is a partial revert of
commit 20a5e7ffdfec ("drm/amdkfd: Properly acquire queue buffers in CRIU restore")

Fixes: 20a5e7ffdfec ("drm/amdkfd: Properly acquire queue buffers in CRIU restore")
Reviewed-by: David Yat Sin <david.yatsin@amd.com>
Signed-off-by: David Francis <David.Francis@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 1cafa8b29e029eac3ddf64604f891b35dbf6262b)
Cc: stable@vger.kernel.org
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c