From: Rajneesh Bhardwaj rajneesh.bhardwaj@amd.com
This IOCTL is expected to be called as a precursor to the actual Checkpoint operation. This does the basic discovery into the target process seized by CRIU and relays the information to the userspace that utilizes it to start the Checkpoint operation via another dedicated IOCTL.
The helper IOCTL determines the number of GPUs, buffer objects that are associated with the target process, its process id in caller's namespace since /proc/pid/mem interface maybe used to drain the contenets of the discovered buffer objects in userspace and getpid returns the pid of CRIU dumper process. Also the pid of a process inside a container might be different than its global pid so return the ns pid.
Signed-off-by: Rajneesh Bhardwaj rajneesh.bhardwaj@amd.com (cherry picked from commit b2fa92d0a8f1de51013cd6742b4996b38c285ffc) (cherry picked from commit 8b44c466ce53162603cd8ae49624462902541a47) Signed-off-by: David Yat Sin david.yatsin@amd.com Change-Id: I2c6b28fe4df7333c9faf7eb6ee86decabe475338 --- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 42 ++++++++++++++++++++++-- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 ++ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 14 ++++++++ 3 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index 1fa2ba34a429..6b347ce5992f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -1822,9 +1822,47 @@ static int kfd_ioctl_criu_restorer(struct file *filep, static int kfd_ioctl_criu_helper(struct file *filep, struct kfd_process *p, void *data) { - pr_info("Inside %s\n",__func__); + struct kfd_ioctl_criu_helper_args *args = data; + struct kgd_mem *kgd_mem; + u64 num_of_bos = 0; + int id, i = 0; + void *mem; + int ret = 0;
- return 0; + pr_debug("Inside %s\n", __func__); + mutex_lock(&p->mutex); + + if (!kfd_has_process_device_data(p)) { + pr_err("No pdd for given process\n"); + ret = -ENODEV; + goto err_unlock; + } + + /* Run over all PDDs of the process */ + for (i = 0; i < p->n_pdds; i++) { + struct kfd_process_device *pdd = p->pdds[i]; + + idr_for_each_entry(&pdd->alloc_idr, mem, id) { + if (!mem) { + ret = -ENOMEM; + goto err_unlock; + } + + kgd_mem = (struct kgd_mem *)mem; + if ((uint64_t)kgd_mem->va > pdd->gpuvm_base) + num_of_bos++; + } + } + + args->task_pid = task_pid_nr_ns(p->lead_thread, + task_active_pid_ns(p->lead_thread)); + args->num_of_devices = p->n_pdds; + args->num_of_bos = num_of_bos; + dev_dbg(kfd_device, "Num of bos = %llu\n", num_of_bos); + +err_unlock: + mutex_unlock(&p->mutex); + return ret; }
static int kfd_ioctl_criu_resume(struct file *filep, diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index a494d61543af..74d3eb383099 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -932,6 +932,8 @@ void *kfd_process_device_translate_handle(struct kfd_process_device *p, void kfd_process_device_remove_obj_handle(struct kfd_process_device *pdd, int handle);
+bool kfd_has_process_device_data(struct kfd_process *p); + /* PASIDs */ int kfd_pasid_init(void); void kfd_pasid_exit(void); diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 9d4f527bda7c..bc133c3789d8 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -1359,6 +1359,20 @@ static int init_doorbell_bitmap(struct qcm_process_device *qpd, return 0; }
+bool kfd_has_process_device_data(struct kfd_process *p) +{ + int i; + + for (i = 0; i < p->n_pdds; i++) { + struct kfd_process_device *pdd = p->pdds[i]; + + if (pdd) + return true; + } + + return false; +} + struct kfd_process_device *kfd_get_process_device_data(struct kfd_dev *dev, struct kfd_process *p) {