From: Felix Kuehling <Felix.Kuehling@amd.com> To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: alex.sierra@amd.com, Philip Yang <Philip.Yang@amd.com> Subject: [PATCH 19/35] drm/amdkfd: support xgmi same hive mapping Date: Wed, 6 Jan 2021 22:01:11 -0500 [thread overview] Message-ID: <20210107030127.20393-20-Felix.Kuehling@amd.com> (raw) In-Reply-To: <20210107030127.20393-1-Felix.Kuehling@amd.com> From: Philip Yang <Philip.Yang@amd.com> amdgpu_gmc_get_vm_pte use bo_va->is_xgmi same hive information to set pte flags to update GPU mapping. Add local structure variable bo_va, and update bo_va.is_xgmi, pass it to mapping->bo_va while mapping to GPU. Assuming xgmi pstate is hi after boot. Signed-off-by: Philip Yang <Philip.Yang@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c index 7d91dc49a5a9..8a4d0a3935b6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c @@ -26,6 +26,8 @@ #include "amdgpu_object.h" #include "amdgpu_vm.h" #include "amdgpu_mn.h" +#include "amdgpu.h" +#include "amdgpu_xgmi.h" #include "kfd_priv.h" #include "kfd_svm.h" @@ -923,10 +925,11 @@ static int svm_range_bo_validate(void *param, struct amdgpu_bo *bo) static int svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm, struct svm_range *prange, bool reserve_vm, - struct dma_fence **fence) + struct amdgpu_device *bo_adev, struct dma_fence **fence) { struct ttm_validate_buffer tv[2]; struct ww_acquire_ctx ticket; + struct amdgpu_bo_va bo_va; struct list_head list; dma_addr_t *pages_addr; uint64_t pte_flags; @@ -963,6 +966,11 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm, } } + if (prange->svm_bo && prange->mm_nodes) { + bo_va.is_xgmi = amdgpu_xgmi_same_hive(adev, bo_adev); + prange->mapping.bo_va = &bo_va; + } + prange->mapping.start = prange->it_node.start; prange->mapping.last = prange->it_node.last; prange->mapping.offset = prange->offset; @@ -970,7 +978,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm, prange->mapping.flags = pte_flags; pages_addr = prange->pages_addr; - r = amdgpu_vm_bo_update_mapping(adev, adev, vm, false, false, NULL, + r = amdgpu_vm_bo_update_mapping(adev, bo_adev, vm, false, false, NULL, prange->mapping.start, prange->mapping.last, pte_flags, prange->mapping.offset, @@ -994,6 +1002,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm, *fence = dma_fence_get(vm->last_update); unreserve_out: + prange->mapping.bo_va = NULL; if (reserve_vm) ttm_eu_backoff_reservation(&ticket, &list); out: @@ -1004,6 +1013,7 @@ static int svm_range_map_to_gpus(struct svm_range *prange, bool reserve_vm) { DECLARE_BITMAP(bitmap, MAX_GPU_INSTANCE); struct kfd_process_device *pdd; + struct amdgpu_device *bo_adev; struct amdgpu_device *adev; struct kfd_process *p; struct kfd_dev *dev; @@ -1011,6 +1021,11 @@ static int svm_range_map_to_gpus(struct svm_range *prange, bool reserve_vm) uint32_t gpuidx; int r = 0; + if (prange->svm_bo && prange->mm_nodes) + bo_adev = amdgpu_ttm_adev(prange->svm_bo->bo->tbo.bdev); + else + bo_adev = NULL; + bitmap_or(bitmap, prange->bitmap_access, prange->bitmap_aip, MAX_GPU_INSTANCE); p = container_of(prange->svms, struct kfd_process, svms); @@ -1027,8 +1042,14 @@ static int svm_range_map_to_gpus(struct svm_range *prange, bool reserve_vm) return -EINVAL; adev = (struct amdgpu_device *)dev->kgd; + if (bo_adev && adev != bo_adev && + !amdgpu_xgmi_same_hive(adev, bo_adev)) { + pr_debug("cannot map to device idx %d\n", gpuidx); + continue; + } + r = svm_range_map_to_gpu(adev, pdd->vm, prange, reserve_vm, - &fence); + bo_adev, &fence); if (r) break; -- 2.29.2 _______________________________________________ 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@amd.com, Philip Yang <Philip.Yang@amd.com> Subject: [PATCH 19/35] drm/amdkfd: support xgmi same hive mapping Date: Wed, 6 Jan 2021 22:01:11 -0500 [thread overview] Message-ID: <20210107030127.20393-20-Felix.Kuehling@amd.com> (raw) In-Reply-To: <20210107030127.20393-1-Felix.Kuehling@amd.com> From: Philip Yang <Philip.Yang@amd.com> amdgpu_gmc_get_vm_pte use bo_va->is_xgmi same hive information to set pte flags to update GPU mapping. Add local structure variable bo_va, and update bo_va.is_xgmi, pass it to mapping->bo_va while mapping to GPU. Assuming xgmi pstate is hi after boot. Signed-off-by: Philip Yang <Philip.Yang@amd.com> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c index 7d91dc49a5a9..8a4d0a3935b6 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c @@ -26,6 +26,8 @@ #include "amdgpu_object.h" #include "amdgpu_vm.h" #include "amdgpu_mn.h" +#include "amdgpu.h" +#include "amdgpu_xgmi.h" #include "kfd_priv.h" #include "kfd_svm.h" @@ -923,10 +925,11 @@ static int svm_range_bo_validate(void *param, struct amdgpu_bo *bo) static int svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm, struct svm_range *prange, bool reserve_vm, - struct dma_fence **fence) + struct amdgpu_device *bo_adev, struct dma_fence **fence) { struct ttm_validate_buffer tv[2]; struct ww_acquire_ctx ticket; + struct amdgpu_bo_va bo_va; struct list_head list; dma_addr_t *pages_addr; uint64_t pte_flags; @@ -963,6 +966,11 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm, } } + if (prange->svm_bo && prange->mm_nodes) { + bo_va.is_xgmi = amdgpu_xgmi_same_hive(adev, bo_adev); + prange->mapping.bo_va = &bo_va; + } + prange->mapping.start = prange->it_node.start; prange->mapping.last = prange->it_node.last; prange->mapping.offset = prange->offset; @@ -970,7 +978,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm, prange->mapping.flags = pte_flags; pages_addr = prange->pages_addr; - r = amdgpu_vm_bo_update_mapping(adev, adev, vm, false, false, NULL, + r = amdgpu_vm_bo_update_mapping(adev, bo_adev, vm, false, false, NULL, prange->mapping.start, prange->mapping.last, pte_flags, prange->mapping.offset, @@ -994,6 +1002,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm, *fence = dma_fence_get(vm->last_update); unreserve_out: + prange->mapping.bo_va = NULL; if (reserve_vm) ttm_eu_backoff_reservation(&ticket, &list); out: @@ -1004,6 +1013,7 @@ static int svm_range_map_to_gpus(struct svm_range *prange, bool reserve_vm) { DECLARE_BITMAP(bitmap, MAX_GPU_INSTANCE); struct kfd_process_device *pdd; + struct amdgpu_device *bo_adev; struct amdgpu_device *adev; struct kfd_process *p; struct kfd_dev *dev; @@ -1011,6 +1021,11 @@ static int svm_range_map_to_gpus(struct svm_range *prange, bool reserve_vm) uint32_t gpuidx; int r = 0; + if (prange->svm_bo && prange->mm_nodes) + bo_adev = amdgpu_ttm_adev(prange->svm_bo->bo->tbo.bdev); + else + bo_adev = NULL; + bitmap_or(bitmap, prange->bitmap_access, prange->bitmap_aip, MAX_GPU_INSTANCE); p = container_of(prange->svms, struct kfd_process, svms); @@ -1027,8 +1042,14 @@ static int svm_range_map_to_gpus(struct svm_range *prange, bool reserve_vm) return -EINVAL; adev = (struct amdgpu_device *)dev->kgd; + if (bo_adev && adev != bo_adev && + !amdgpu_xgmi_same_hive(adev, bo_adev)) { + pr_debug("cannot map to device idx %d\n", gpuidx); + continue; + } + r = svm_range_map_to_gpu(adev, pdd->vm, prange, reserve_vm, - &fence); + bo_adev, &fence); if (r) break; -- 2.29.2 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-01-07 3:03 UTC|newest] Thread overview: 168+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-07 3:00 [PATCH 00/35] Add HMM-based SVM memory manager to KFD Felix Kuehling 2021-01-07 3:00 ` Felix Kuehling 2021-01-07 3:00 ` [PATCH 01/35] drm/amdkfd: select kernel DEVICE_PRIVATE option Felix Kuehling 2021-01-07 3:00 ` Felix Kuehling 2021-01-07 3:00 ` [PATCH 02/35] drm/amdgpu: replace per_device_list by array Felix Kuehling 2021-01-07 3:00 ` Felix Kuehling 2021-01-07 3:00 ` [PATCH 03/35] drm/amdkfd: helper to convert gpu id and idx Felix Kuehling 2021-01-07 3:00 ` Felix Kuehling 2021-01-07 3:00 ` [PATCH 04/35] drm/amdkfd: add svm ioctl API Felix Kuehling 2021-01-07 3:00 ` Felix Kuehling 2021-01-07 3:00 ` [PATCH 05/35] drm/amdkfd: Add SVM API support capability bits Felix Kuehling 2021-01-07 3:00 ` Felix Kuehling 2021-01-07 3:00 ` [PATCH 06/35] drm/amdkfd: register svm range Felix Kuehling 2021-01-07 3:00 ` Felix Kuehling 2021-01-07 3:00 ` [PATCH 07/35] drm/amdkfd: add svm ioctl GET_ATTR op Felix Kuehling 2021-01-07 3:00 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 08/35] drm/amdgpu: add common HMM get pages function Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 10:53 ` Christian König 2021-01-07 10:53 ` Christian König 2021-01-07 3:01 ` [PATCH 09/35] drm/amdkfd: validate svm range system memory Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 10/35] drm/amdkfd: register overlap system memory range Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 11/35] drm/amdkfd: deregister svm range Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 12/35] drm/amdgpu: export vm update mapping interface Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 10:54 ` Christian König 2021-01-07 10:54 ` Christian König 2021-01-07 3:01 ` [PATCH 13/35] drm/amdkfd: map svm range to GPUs Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 14/35] drm/amdkfd: svm range eviction and restore Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 15/35] drm/amdkfd: add xnack enabled flag to kfd_process Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 16/35] drm/amdkfd: add ioctl to configure and query xnack retries Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 17/35] drm/amdkfd: register HMM device private zone Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-03-01 8:32 ` Daniel Vetter 2021-03-01 8:32 ` Daniel Vetter 2021-03-01 8:46 ` Thomas Hellström (Intel) 2021-03-01 8:46 ` Thomas Hellström (Intel) 2021-03-01 8:58 ` Daniel Vetter 2021-03-01 8:58 ` Daniel Vetter 2021-03-01 9:30 ` Thomas Hellström (Intel) 2021-03-01 9:30 ` Thomas Hellström (Intel) 2021-03-04 17:58 ` Felix Kuehling 2021-03-04 17:58 ` Felix Kuehling 2021-03-11 12:24 ` Thomas Hellström (Intel) 2021-03-11 12:24 ` Thomas Hellström (Intel) 2021-01-07 3:01 ` [PATCH 18/35] drm/amdkfd: validate vram svm range from TTM Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling [this message] 2021-01-07 3:01 ` [PATCH 19/35] drm/amdkfd: support xgmi same hive mapping Felix Kuehling 2021-01-07 3:01 ` [PATCH 20/35] drm/amdkfd: copy memory through gart table Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 21/35] drm/amdkfd: HMM migrate ram to vram Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 22/35] drm/amdkfd: HMM migrate vram to ram Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 23/35] drm/amdkfd: invalidate tables on page retry fault Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 24/35] drm/amdkfd: page table restore through svm API Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 25/35] drm/amdkfd: SVM API call to restore page tables Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 26/35] drm/amdkfd: add svm_bo reference for eviction fence Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 27/35] drm/amdgpu: add param bit flag to create SVM BOs Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 28/35] drm/amdkfd: add svm_bo eviction mechanism support Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 29/35] drm/amdgpu: svm bo enable_signal call condition Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 10:56 ` Christian König 2021-01-07 10:56 ` Christian König 2021-01-07 16:16 ` Felix Kuehling 2021-01-07 16:16 ` Felix Kuehling 2021-01-07 16:28 ` Christian König 2021-01-07 16:28 ` Christian König 2021-01-07 16:53 ` Felix Kuehling 2021-01-07 16:53 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 30/35] drm/amdgpu: add svm_bo eviction to enable_signal cb Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 31/35] drm/amdgpu: reserve fence slot to update page table Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 10:57 ` Christian König 2021-01-07 10:57 ` Christian König 2021-01-07 3:01 ` [PATCH 32/35] drm/amdgpu: enable retry fault wptr overflow Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 11:01 ` Christian König 2021-01-07 11:01 ` Christian König 2021-01-07 3:01 ` [PATCH 33/35] drm/amdkfd: refine migration policy with xnack on Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 34/35] drm/amdkfd: add svm range validate timestamp Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 3:01 ` [PATCH 35/35] drm/amdkfd: multiple gpu migrate vram to vram Felix Kuehling 2021-01-07 3:01 ` Felix Kuehling 2021-01-07 9:23 ` [PATCH 00/35] Add HMM-based SVM memory manager to KFD Daniel Vetter 2021-01-07 9:23 ` Daniel Vetter 2021-01-07 16:25 ` Felix Kuehling 2021-01-07 16:25 ` Felix Kuehling 2021-01-08 14:40 ` Daniel Vetter 2021-01-08 14:40 ` Daniel Vetter 2021-01-08 14:45 ` Christian König 2021-01-08 14:45 ` Christian König 2021-01-08 15:58 ` Felix Kuehling 2021-01-08 15:58 ` Felix Kuehling 2021-01-08 16:06 ` Daniel Vetter 2021-01-08 16:06 ` Daniel Vetter 2021-01-08 16:36 ` Felix Kuehling 2021-01-08 16:36 ` Felix Kuehling 2021-01-08 16:53 ` Daniel Vetter 2021-01-08 16:53 ` Daniel Vetter 2021-01-08 17:56 ` Felix Kuehling 2021-01-08 17:56 ` Felix Kuehling 2021-01-11 16:29 ` Daniel Vetter 2021-01-11 16:29 ` Daniel Vetter 2021-01-14 5:34 ` Felix Kuehling 2021-01-14 5:34 ` Felix Kuehling 2021-01-14 12:19 ` Christian König 2021-01-14 12:19 ` Christian König 2021-01-13 16:56 ` Jerome Glisse 2021-01-13 16:56 ` Jerome Glisse 2021-01-13 20:31 ` Daniel Vetter 2021-01-13 20:31 ` Daniel Vetter 2021-01-14 3:27 ` Jerome Glisse 2021-01-14 3:27 ` Jerome Glisse 2021-01-14 9:26 ` Daniel Vetter 2021-01-14 9:26 ` Daniel Vetter 2021-01-14 10:39 ` Daniel Vetter 2021-01-14 10:39 ` Daniel Vetter 2021-01-14 10:49 ` Christian König 2021-01-14 10:49 ` Christian König 2021-01-14 11:52 ` Daniel Vetter 2021-01-14 11:52 ` Daniel Vetter 2021-01-14 13:37 ` HMM fence (was Re: [PATCH 00/35] Add HMM-based SVM memory manager to KFD) Christian König 2021-01-14 13:37 ` Christian König 2021-01-14 13:57 ` Daniel Vetter 2021-01-14 13:57 ` Daniel Vetter 2021-01-14 14:13 ` Christian König 2021-01-14 14:13 ` Christian König 2021-01-14 14:23 ` Daniel Vetter 2021-01-14 14:23 ` Daniel Vetter 2021-01-14 15:08 ` Christian König 2021-01-14 15:08 ` Christian König 2021-01-14 15:40 ` Daniel Vetter 2021-01-14 15:40 ` Daniel Vetter 2021-01-14 16:01 ` Christian König 2021-01-14 16:01 ` Christian König 2021-01-14 16:36 ` Daniel Vetter 2021-01-14 16:36 ` Daniel Vetter 2021-01-14 19:08 ` Christian König 2021-01-14 19:08 ` Christian König 2021-01-14 20:09 ` Daniel Vetter 2021-01-14 20:09 ` Daniel Vetter 2021-01-14 16:51 ` Jerome Glisse 2021-01-14 16:51 ` Jerome Glisse 2021-01-14 21:13 ` Felix Kuehling 2021-01-14 21:13 ` Felix Kuehling 2021-01-15 7:47 ` Christian König 2021-01-15 7:47 ` Christian König 2021-01-13 16:47 ` [PATCH 00/35] Add HMM-based SVM memory manager to KFD Jerome Glisse 2021-01-13 16:47 ` Jerome Glisse 2021-01-14 0:06 ` Felix Kuehling 2021-01-14 0:06 ` 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=20210107030127.20393-20-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.