Commit cd9f7910 authored by David Yat Sin's avatar David Yat Sin Committed by Alex Deucher

drm/amdkfd: CRIU Implement KFD unpause operation

Introducing UNPAUSE op. After CRIU amdgpu plugin performs a PROCESS_INFO
op the queues will be stay in an evicted state. Once the plugin is done
draining BO contents, it is safe to perform an UNPAUSE op for the queues
to resume.
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarDavid Yat Sin <david.yatsin@amd.com>
Signed-off-by: default avatarRajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 011bbb03
...@@ -2049,6 +2049,14 @@ static int criu_checkpoint(struct file *filep, ...@@ -2049,6 +2049,14 @@ static int criu_checkpoint(struct file *filep,
goto exit_unlock; goto exit_unlock;
} }
/* Confirm all process queues are evicted */
if (!p->queues_paused) {
pr_err("Cannot dump process when queues are not in evicted state\n");
/* CRIU plugin did not call op PROCESS_INFO before checkpointing */
ret = -EINVAL;
goto exit_unlock;
}
criu_get_process_object_info(p, &num_bos, &priv_size); criu_get_process_object_info(p, &num_bos, &priv_size);
if (num_bos != args->num_bos || if (num_bos != args->num_bos ||
...@@ -2388,7 +2396,24 @@ static int criu_unpause(struct file *filep, ...@@ -2388,7 +2396,24 @@ static int criu_unpause(struct file *filep,
struct kfd_process *p, struct kfd_process *p,
struct kfd_ioctl_criu_args *args) struct kfd_ioctl_criu_args *args)
{ {
return 0; int ret;
mutex_lock(&p->mutex);
if (!p->queues_paused) {
mutex_unlock(&p->mutex);
return -EINVAL;
}
ret = kfd_process_restore_queues(p);
if (ret)
pr_err("Failed to unpause queues ret:%d\n", ret);
else
p->queues_paused = false;
mutex_unlock(&p->mutex);
return ret;
} }
static int criu_resume(struct file *filep, static int criu_resume(struct file *filep,
...@@ -2440,6 +2465,12 @@ static int criu_process_info(struct file *filep, ...@@ -2440,6 +2465,12 @@ static int criu_process_info(struct file *filep,
goto err_unlock; goto err_unlock;
} }
ret = kfd_process_evict_queues(p);
if (ret)
goto err_unlock;
p->queues_paused = true;
args->pid = task_pid_nr_ns(p->lead_thread, args->pid = task_pid_nr_ns(p->lead_thread,
task_active_pid_ns(p->lead_thread)); task_active_pid_ns(p->lead_thread));
...@@ -2447,6 +2478,10 @@ static int criu_process_info(struct file *filep, ...@@ -2447,6 +2478,10 @@ static int criu_process_info(struct file *filep,
dev_dbg(kfd_device, "Num of bos:%u\n", args->num_bos); dev_dbg(kfd_device, "Num of bos:%u\n", args->num_bos);
err_unlock: err_unlock:
if (ret) {
kfd_process_restore_queues(p);
p->queues_paused = false;
}
mutex_unlock(&p->mutex); mutex_unlock(&p->mutex);
return ret; return ret;
} }
......
...@@ -877,6 +877,8 @@ struct kfd_process { ...@@ -877,6 +877,8 @@ struct kfd_process {
bool xnack_enabled; bool xnack_enabled;
atomic_t poison; atomic_t poison;
/* Queues are in paused stated because we are in the process of doing a CRIU checkpoint */
bool queues_paused;
}; };
#define KFD_PROCESS_TABLE_SIZE 5 /* bits: 32 entries */ #define KFD_PROCESS_TABLE_SIZE 5 /* bits: 32 entries */
......
...@@ -1384,6 +1384,7 @@ static struct kfd_process *create_process(const struct task_struct *thread) ...@@ -1384,6 +1384,7 @@ static struct kfd_process *create_process(const struct task_struct *thread)
process->mm = thread->mm; process->mm = thread->mm;
process->lead_thread = thread->group_leader; process->lead_thread = thread->group_leader;
process->n_pdds = 0; process->n_pdds = 0;
process->queues_paused = false;
INIT_DELAYED_WORK(&process->eviction_work, evict_process_worker); INIT_DELAYED_WORK(&process->eviction_work, evict_process_worker);
INIT_DELAYED_WORK(&process->restore_work, restore_process_worker); INIT_DELAYED_WORK(&process->restore_work, restore_process_worker);
process->last_restore_timestamp = get_jiffies_64(); process->last_restore_timestamp = get_jiffies_64();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment