From: Alex Sierra <alex.sierra@amd.com> To: <jgg@nvidia.com> Cc: <david@redhat.com>, <Felix.Kuehling@amd.com>, <linux-mm@kvack.org>, <rcampbell@nvidia.com>, <linux-ext4@vger.kernel.org>, <linux-xfs@vger.kernel.org>, <amd-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org>, <hch@lst.de>, <jglisse@redhat.com>, <apopple@nvidia.com>, <willy@infradead.org>, <akpm@linux-foundation.org> Subject: [PATCH v9 07/14] drm/amdkfd: add SPM support for SVM Date: Fri, 15 Jul 2022 10:05:14 -0500 [thread overview] Message-ID: <20220715150521.18165-8-alex.sierra@amd.com> (raw) In-Reply-To: <20220715150521.18165-1-alex.sierra@amd.com> When CPU is connected throug XGMI, it has coherent access to VRAM resource. In this case that resource is taken from a table in the device gmc aperture base. This resource is used along with the device type, which could be DEVICE_PRIVATE or DEVICE_COHERENT to create the device page map region. Also, MIGRATE_VMA_SELECT_DEVICE_COHERENT flag is selected for coherent type case during migration to device. Signed-off-by: Alex Sierra <alex.sierra@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 34 +++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c index e44376c2ecdc..f73e3e340413 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -671,13 +671,15 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, migrate.vma = vma; migrate.start = start; migrate.end = end; - migrate.flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE; migrate.pgmap_owner = SVM_ADEV_PGMAP_OWNER(adev); + if (adev->gmc.xgmi.connected_to_cpu) + migrate.flags = MIGRATE_VMA_SELECT_DEVICE_COHERENT; + else + migrate.flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE; buf = kvcalloc(npages, 2 * sizeof(*migrate.src) + sizeof(uint64_t) + sizeof(dma_addr_t), GFP_KERNEL); - if (!buf) goto out; @@ -947,7 +949,7 @@ int svm_migrate_init(struct amdgpu_device *adev) { struct kfd_dev *kfddev = adev->kfd.dev; struct dev_pagemap *pgmap; - struct resource *res; + struct resource *res = NULL; unsigned long size; void *r; @@ -962,28 +964,34 @@ int svm_migrate_init(struct amdgpu_device *adev) * should remove reserved size */ size = ALIGN(adev->gmc.real_vram_size, 2ULL << 20); - res = devm_request_free_mem_region(adev->dev, &iomem_resource, size); - if (IS_ERR(res)) - return -ENOMEM; + if (adev->gmc.xgmi.connected_to_cpu) { + pgmap->range.start = adev->gmc.aper_base; + pgmap->range.end = adev->gmc.aper_base + adev->gmc.aper_size - 1; + pgmap->type = MEMORY_DEVICE_COHERENT; + } else { + res = devm_request_free_mem_region(adev->dev, &iomem_resource, size); + if (IS_ERR(res)) + return -ENOMEM; + pgmap->range.start = res->start; + pgmap->range.end = res->end; + pgmap->type = MEMORY_DEVICE_PRIVATE; + } - pgmap->type = MEMORY_DEVICE_PRIVATE; pgmap->nr_range = 1; - pgmap->range.start = res->start; - pgmap->range.end = res->end; pgmap->ops = &svm_migrate_pgmap_ops; pgmap->owner = SVM_ADEV_PGMAP_OWNER(adev); - pgmap->flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE; - + pgmap->flags = 0; /* Device manager releases device-specific resources, memory region and * pgmap when driver disconnects from device. */ r = devm_memremap_pages(adev->dev, pgmap); if (IS_ERR(r)) { pr_err("failed to register HMM device memory\n"); - /* Disable SVM support capability */ pgmap->type = 0; - devm_release_mem_region(adev->dev, res->start, resource_size(res)); + if (pgmap->type == MEMORY_DEVICE_PRIVATE) + devm_release_mem_region(adev->dev, res->start, + res->end - res->start + 1); return PTR_ERR(r); } -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Alex Sierra <alex.sierra@amd.com> To: <jgg@nvidia.com> Cc: rcampbell@nvidia.com, willy@infradead.org, david@redhat.com, Felix.Kuehling@amd.com, apopple@nvidia.com, amd-gfx@lists.freedesktop.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, jglisse@redhat.com, dri-devel@lists.freedesktop.org, akpm@linux-foundation.org, linux-ext4@vger.kernel.org, hch@lst.de Subject: [PATCH v9 07/14] drm/amdkfd: add SPM support for SVM Date: Fri, 15 Jul 2022 10:05:14 -0500 [thread overview] Message-ID: <20220715150521.18165-8-alex.sierra@amd.com> (raw) In-Reply-To: <20220715150521.18165-1-alex.sierra@amd.com> When CPU is connected throug XGMI, it has coherent access to VRAM resource. In this case that resource is taken from a table in the device gmc aperture base. This resource is used along with the device type, which could be DEVICE_PRIVATE or DEVICE_COHERENT to create the device page map region. Also, MIGRATE_VMA_SELECT_DEVICE_COHERENT flag is selected for coherent type case during migration to device. Signed-off-by: Alex Sierra <alex.sierra@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 34 +++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c index e44376c2ecdc..f73e3e340413 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c @@ -671,13 +671,15 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, migrate.vma = vma; migrate.start = start; migrate.end = end; - migrate.flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE; migrate.pgmap_owner = SVM_ADEV_PGMAP_OWNER(adev); + if (adev->gmc.xgmi.connected_to_cpu) + migrate.flags = MIGRATE_VMA_SELECT_DEVICE_COHERENT; + else + migrate.flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE; buf = kvcalloc(npages, 2 * sizeof(*migrate.src) + sizeof(uint64_t) + sizeof(dma_addr_t), GFP_KERNEL); - if (!buf) goto out; @@ -947,7 +949,7 @@ int svm_migrate_init(struct amdgpu_device *adev) { struct kfd_dev *kfddev = adev->kfd.dev; struct dev_pagemap *pgmap; - struct resource *res; + struct resource *res = NULL; unsigned long size; void *r; @@ -962,28 +964,34 @@ int svm_migrate_init(struct amdgpu_device *adev) * should remove reserved size */ size = ALIGN(adev->gmc.real_vram_size, 2ULL << 20); - res = devm_request_free_mem_region(adev->dev, &iomem_resource, size); - if (IS_ERR(res)) - return -ENOMEM; + if (adev->gmc.xgmi.connected_to_cpu) { + pgmap->range.start = adev->gmc.aper_base; + pgmap->range.end = adev->gmc.aper_base + adev->gmc.aper_size - 1; + pgmap->type = MEMORY_DEVICE_COHERENT; + } else { + res = devm_request_free_mem_region(adev->dev, &iomem_resource, size); + if (IS_ERR(res)) + return -ENOMEM; + pgmap->range.start = res->start; + pgmap->range.end = res->end; + pgmap->type = MEMORY_DEVICE_PRIVATE; + } - pgmap->type = MEMORY_DEVICE_PRIVATE; pgmap->nr_range = 1; - pgmap->range.start = res->start; - pgmap->range.end = res->end; pgmap->ops = &svm_migrate_pgmap_ops; pgmap->owner = SVM_ADEV_PGMAP_OWNER(adev); - pgmap->flags = MIGRATE_VMA_SELECT_DEVICE_PRIVATE; - + pgmap->flags = 0; /* Device manager releases device-specific resources, memory region and * pgmap when driver disconnects from device. */ r = devm_memremap_pages(adev->dev, pgmap); if (IS_ERR(r)) { pr_err("failed to register HMM device memory\n"); - /* Disable SVM support capability */ pgmap->type = 0; - devm_release_mem_region(adev->dev, res->start, resource_size(res)); + if (pgmap->type == MEMORY_DEVICE_PRIVATE) + devm_release_mem_region(adev->dev, res->start, + res->end - res->start + 1); return PTR_ERR(r); } -- 2.32.0
next prev parent reply other threads:[~2022-07-15 15:06 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-15 15:05 [PATCH v9 00/14] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 01/14] mm: rename is_pinnable_pages to is_longterm_pinnable_pages Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 02/14] mm: move page zone helpers from mm.h to mmzone.h Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-18 10:50 ` David Hildenbrand 2022-07-18 10:50 ` David Hildenbrand 2022-07-18 17:52 ` Felix Kuehling 2022-07-18 17:52 ` Felix Kuehling 2022-07-18 18:46 ` David Hildenbrand 2022-07-18 18:46 ` David Hildenbrand 2023-06-15 19:33 ` Peter Xu 2023-06-15 19:33 ` Peter Xu 2023-06-15 20:15 ` Matthew Wilcox 2023-06-15 20:15 ` Matthew Wilcox 2023-06-15 20:48 ` Peter Xu 2023-06-15 20:48 ` Peter Xu 2022-07-15 15:05 ` [PATCH v9 03/14] mm: add zone device coherent type memory support Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 04/14] mm: handling Non-LRU pages returned by vm_normal_pages Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-18 10:51 ` David Hildenbrand 2022-07-18 10:51 ` David Hildenbrand 2022-07-15 15:05 ` [PATCH v9 05/14] mm: add device coherent vma selection for memory migration Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 06/14] mm/gup: migrate device coherent pages when pinning instead of failing Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-18 10:56 ` David Hildenbrand 2022-07-18 10:56 ` David Hildenbrand 2022-07-18 20:32 ` Andrew Morton 2022-07-18 20:32 ` Andrew Morton 2022-07-19 8:40 ` David Hildenbrand 2022-07-19 8:40 ` David Hildenbrand 2022-07-26 2:22 ` Sierra Guiza, Alejandro (Alex) 2022-07-26 2:22 ` Sierra Guiza, Alejandro (Alex) 2022-07-26 19:05 ` Andrew Morton 2022-07-26 19:05 ` Andrew Morton 2022-07-15 15:05 ` Alex Sierra [this message] 2022-07-15 15:05 ` [PATCH v9 07/14] drm/amdkfd: add SPM support for SVM Alex Sierra 2022-07-15 15:05 ` [PATCH v9 08/14] lib: test_hmm add ioctl to get zone device type Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 09/14] lib: test_hmm add module param for " Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 10/14] lib: add support for device coherent type in test_hmm Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 11/14] tools: update hmm-test to support device coherent type Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 12/14] tools: update test_hmm script to support SP config Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 13/14] tools: add hmm gup tests for device coherent type Alex Sierra 2022-07-15 15:05 ` Alex Sierra 2022-07-15 15:05 ` [PATCH v9 14/14] tools: add selftests to hmm for COW in device memory Alex Sierra 2022-07-15 15:05 ` Alex Sierra
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=20220715150521.18165-8-alex.sierra@amd.com \ --to=alex.sierra@amd.com \ --cc=Felix.Kuehling@amd.com \ --cc=akpm@linux-foundation.org \ --cc=amd-gfx@lists.freedesktop.org \ --cc=apopple@nvidia.com \ --cc=david@redhat.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=hch@lst.de \ --cc=jgg@nvidia.com \ --cc=jglisse@redhat.com \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-xfs@vger.kernel.org \ --cc=rcampbell@nvidia.com \ --cc=willy@infradead.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.