From: Felix Kuehling <Felix.Kuehling@amd.com> To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Alex Sierra <alex.sierra@amd.com>, Philip Yang <Philip.Yang@amd.com> Subject: [PATCH 23/34] drm/amdkfd: page table restore through svm API Date: Wed, 14 Apr 2021 21:23:26 -0400 [thread overview] Message-ID: <20210415012337.1755-24-Felix.Kuehling@amd.com> (raw) In-Reply-To: <20210415012337.1755-1-Felix.Kuehling@amd.com> Page table restore implementation in SVM API. This is called from the fault handler at amdgpu_vm. To update page tables through the page fault retry IH. Signed-off-by: Alex Sierra <alex.sierra@amd.com> Signed-off-by: Philip Yang <Philip.Yang@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 59 ++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 + 2 files changed, 61 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c index 4e3156d891a2..d89c998f9aa4 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c @@ -1997,6 +1997,65 @@ svm_range_from_addr(struct svm_range_list *svms, unsigned long addr, return NULL; } +int +svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid, + uint64_t addr) +{ + int r = 0; + struct mm_struct *mm = NULL; + struct svm_range *prange; + struct svm_range_list *svms; + struct kfd_process *p; + + p = kfd_lookup_process_by_pasid(pasid); + if (!p) { + pr_debug("kfd process not founded pasid 0x%x\n", pasid); + return -ESRCH; + } + if (!p->xnack_enabled) { + pr_debug("XNACK not enabled for pasid 0x%x\n", pasid); + return -EFAULT; + } + svms = &p->svms; + + pr_debug("restoring svms 0x%p fault address 0x%llx\n", svms, addr); + + mm = get_task_mm(p->lead_thread); + if (!mm) { + pr_debug("svms 0x%p failed to get mm\n", svms); + r = -ESRCH; + goto out; + } + + mmap_read_lock(mm); + mutex_lock(&svms->lock); + prange = svm_range_from_addr(svms, addr, NULL); + + if (!prange) { + pr_debug("failed to find prange svms 0x%p address [0x%llx]\n", + svms, addr); + r = -EFAULT; + goto out_unlock_svms; + } + + mutex_lock(&prange->migrate_mutex); + + r = svm_range_validate_and_map(mm, prange, MAX_GPU_INSTANCE, false, false); + if (r) + pr_debug("failed %d to map svms 0x%p [0x%lx 0x%lx] to gpu\n", r, + svms, prange->start, prange->last); + + mutex_unlock(&prange->migrate_mutex); +out_unlock_svms: + mutex_unlock(&svms->lock); + mmap_read_unlock(mm); + mmput(mm); +out: + kfd_unref_process(p); + + return r; +} + void svm_range_list_fini(struct kfd_process *p) { struct svm_range *prange; diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.h b/drivers/gpu/drm/amd/amdkfd/kfd_svm.h index d88926d2855f..9a078d354cba 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.h @@ -155,6 +155,8 @@ void svm_range_vram_node_free(struct svm_range *prange); int svm_range_split_by_granularity(struct kfd_process *p, struct mm_struct *mm, unsigned long addr, struct svm_range *parent, struct svm_range *prange); +int svm_range_restore_pages(struct amdgpu_device *adev, + unsigned int pasid, uint64_t addr); void svm_range_add_list_work(struct svm_range_list *svms, struct svm_range *prange, struct mm_struct *mm, enum svm_work_list_ops op); -- 2.31.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Felix Kuehling <Felix.Kuehling@amd.com> To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Alex Sierra <alex.sierra@amd.com>, Philip Yang <Philip.Yang@amd.com> Subject: [PATCH 23/34] drm/amdkfd: page table restore through svm API Date: Wed, 14 Apr 2021 21:23:26 -0400 [thread overview] Message-ID: <20210415012337.1755-24-Felix.Kuehling@amd.com> (raw) In-Reply-To: <20210415012337.1755-1-Felix.Kuehling@amd.com> Page table restore implementation in SVM API. This is called from the fault handler at amdgpu_vm. To update page tables through the page fault retry IH. Signed-off-by: Alex Sierra <alex.sierra@amd.com> Signed-off-by: Philip Yang <Philip.Yang@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 59 ++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 + 2 files changed, 61 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c index 4e3156d891a2..d89c998f9aa4 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c @@ -1997,6 +1997,65 @@ svm_range_from_addr(struct svm_range_list *svms, unsigned long addr, return NULL; } +int +svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid, + uint64_t addr) +{ + int r = 0; + struct mm_struct *mm = NULL; + struct svm_range *prange; + struct svm_range_list *svms; + struct kfd_process *p; + + p = kfd_lookup_process_by_pasid(pasid); + if (!p) { + pr_debug("kfd process not founded pasid 0x%x\n", pasid); + return -ESRCH; + } + if (!p->xnack_enabled) { + pr_debug("XNACK not enabled for pasid 0x%x\n", pasid); + return -EFAULT; + } + svms = &p->svms; + + pr_debug("restoring svms 0x%p fault address 0x%llx\n", svms, addr); + + mm = get_task_mm(p->lead_thread); + if (!mm) { + pr_debug("svms 0x%p failed to get mm\n", svms); + r = -ESRCH; + goto out; + } + + mmap_read_lock(mm); + mutex_lock(&svms->lock); + prange = svm_range_from_addr(svms, addr, NULL); + + if (!prange) { + pr_debug("failed to find prange svms 0x%p address [0x%llx]\n", + svms, addr); + r = -EFAULT; + goto out_unlock_svms; + } + + mutex_lock(&prange->migrate_mutex); + + r = svm_range_validate_and_map(mm, prange, MAX_GPU_INSTANCE, false, false); + if (r) + pr_debug("failed %d to map svms 0x%p [0x%lx 0x%lx] to gpu\n", r, + svms, prange->start, prange->last); + + mutex_unlock(&prange->migrate_mutex); +out_unlock_svms: + mutex_unlock(&svms->lock); + mmap_read_unlock(mm); + mmput(mm); +out: + kfd_unref_process(p); + + return r; +} + void svm_range_list_fini(struct kfd_process *p) { struct svm_range *prange; diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.h b/drivers/gpu/drm/amd/amdkfd/kfd_svm.h index d88926d2855f..9a078d354cba 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.h @@ -155,6 +155,8 @@ void svm_range_vram_node_free(struct svm_range *prange); int svm_range_split_by_granularity(struct kfd_process *p, struct mm_struct *mm, unsigned long addr, struct svm_range *parent, struct svm_range *prange); +int svm_range_restore_pages(struct amdgpu_device *adev, + unsigned int pasid, uint64_t addr); void svm_range_add_list_work(struct svm_range_list *svms, struct svm_range *prange, struct mm_struct *mm, enum svm_work_list_ops op); -- 2.31.1 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-04-15 1:25 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-15 1:23 [PATCH 00/34] Add HMM-based SVM memory manager to KFD v5 Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 01/34] drm/amdkfd: helper to convert gpu id and idx Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 02/34] drm/amdkfd: add svm ioctl API Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 03/34] drm/amdkfd: register svm range Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 04/34] drm/amdkfd: add svm ioctl GET_ATTR op Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 05/34] drm/amdgpu: add common HMM get pages function Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 06/34] drm/amdkfd: support larger svm range allocation Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 07/34] drm/amdkfd: validate svm range system memory Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 08/34] drm/amdkfd: deregister svm range Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 09/34] drm/amdgpu: export vm update mapping interface Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 10/34] drm/amdkfd: map svm range to GPUs Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 11/34] drm/amdkfd: svm range eviction and restore Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 12/34] drm/amdgpu: Enable retry faults unconditionally on Aldebaran Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 13/34] drm/amdkfd: add xnack enabled flag to kfd_process Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 14/34] drm/amdkfd: add ioctl to configure and query xnack retries Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 15/34] drm/amdkfd: register HMM device private zone Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 16/34] drm/amdkfd: validate vram svm range from TTM Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 17/34] drm/amdkfd: support xgmi same hive mapping Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 18/34] drm/amdkfd: copy memory through gart table Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 19/34] drm/amdkfd: HMM migrate ram to vram Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 20/34] drm/amdkfd: HMM migrate vram to ram Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 21/34] drm/amdkfd: invalidate tables on page retry fault Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 22/34] drm/amdgpu: enable 48-bit IH timestamp counter Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling [this message] 2021-04-15 1:23 ` [PATCH 23/34] drm/amdkfd: page table restore through svm API Felix Kuehling 2021-04-15 1:23 ` [PATCH 24/34] drm/amdkfd: SVM API call to restore page tables Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 25/34] drm/amdkfd: add svm_bo reference for eviction fence Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 26/34] drm/amdgpu: add param bit flag to create SVM BOs Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 27/34] drm/amdkfd: add svm_bo eviction mechanism support Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 28/34] drm/amdgpu: svm bo enable_signal call condition Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 29/34] drm/amdgpu: add svm_bo eviction to enable_signal cb Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 30/34] drm/amdkfd: refine migration policy with xnack on Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 31/34] drm/amdkfd: add svm range validate timestamp Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 32/34] drm/amdkfd: multiple gpu migrate vram to vram Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 33/34] drm/amdkfd: Add SVM API support capability bits Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling 2021-04-15 1:23 ` [PATCH 34/34] drm/amdkfd: Add CONFIG_HSA_AMD_SVM Felix Kuehling 2021-04-15 1:23 ` Felix Kuehling -- strict thread matches above, loose matches on Subject: below -- 2021-04-06 1:45 [PATCH 00/34] Add HMM-based SVM memory manager to KFD v4 Felix Kuehling 2021-04-06 1:46 ` [PATCH 23/34] drm/amdkfd: page table restore through svm API Felix Kuehling 2021-04-06 1:46 ` Felix Kuehling
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210415012337.1755-24-Felix.Kuehling@amd.com \ --to=felix.kuehling@amd.com \ --cc=Philip.Yang@amd.com \ --cc=alex.sierra@amd.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=dri-devel@lists.freedesktop.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.