drm/amdgpu: Checkpoint and Restore VRAM BOs without VA

Extend checkpoint logic to allow inclusion of VRAM BOs that
do not have a VA attached

Signed-off-by: Ramesh Errabolu <Ramesh.Errabolu@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index 9307f303c7fd03b9b5616b7c4d2bea6aa3a627eb..35b36cbe5aa2c06d68afdf0a3685d9558c86c4ff 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1846,7 +1846,7 @@ static uint32_t get_process_num_bos(struct kfd_process *p)
                idr_for_each_entry(&pdd->alloc_idr, mem, id) {
                        struct kgd_mem *kgd_mem = (struct kgd_mem *)mem;
 
-                       if ((uint64_t)kgd_mem->va > pdd->gpuvm_base)
+                       if (!kgd_mem->va || kgd_mem->va > pdd->gpuvm_base)
                                num_of_bos++;
                }
        }
@@ -1918,7 +1918,11 @@ static int criu_checkpoint_bos(struct kfd_process *p,
                        kgd_mem = (struct kgd_mem *)mem;
                        dumper_bo = kgd_mem->bo;
 
-                       if ((uint64_t)kgd_mem->va <= pdd->gpuvm_base)
+                       /* Skip checkpointing BOs that are used for Trap handler
+                        * code and state. Currently, these BOs have a VA that
+                        * is less GPUVM Base
+                        */
+                       if (kgd_mem->va && kgd_mem->va <= pdd->gpuvm_base)
                                continue;
 
                        bo_bucket = &bo_buckets[bo_index];