[Patch V2 v2] drm/amdgpu: Checkpoint and Restore VRAM BOs without VA

[Felix Kuehling]

Am 2023-07-25 um 17:11 schrieb Ramesh Errabolu:
> Extend checkpoint logic to allow inclusion of VRAM BOs that
> do not have a VA attached
>
> Signed-off-by: Ramesh Errabolu <Ramesh.Errabolu at amd.com>
> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index 40ac093b5035..44c647c82070 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -1845,7 +1845,8 @@ 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 (((uint64_t)kgd_mem->va > pdd->gpuvm_base) ||

Unnecessary parentheses around (a > b).


> +			    !kgd_mem->va)
>   				num_of_bos++;
>   		}
>   	}
> @@ -1917,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 (((uint64_t)kgd_mem->va <= pdd->gpuvm_base) && kgd_mem->va)

Unnecessary parentheses around (a <= b). In this condition I'd also 
prefer to put kgd_mem->va first, because it short-circuits execution for 
the case that va is NULL.

With that fixed, the patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling at amd.com>



>   				continue;
>   
>   			bo_bucket = &bo_buckets[bo_index];