From: Alex Sierra <alex.sierra@amd.com>
To: amd-gfx@lists.freedesktop.org
Cc: Alex Sierra <alex.sierra@amd.com>
Subject: [PATCH 08/11] drm/amdkfd: skip migration for pages already in VRAM
Date: Tue, 29 Jun 2021 13:02:03 -0500 [thread overview]
Message-ID: <20210629180206.8002-8-alex.sierra@amd.com> (raw)
In-Reply-To: <20210629180206.8002-1-alex.sierra@amd.com>
Migration skipped for pages that are already in VRAM
domain. These could be the result of previous partial
migrations to SYS RAM, and prefetch back to VRAM.
Ex. Coherent pages in VRAM that were not written/invalidated after
a copy-on-write.
Signed-off-by: Alex Sierra <alex.sierra@amd.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
index 7b31c8596786..ae360d94c06f 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_migrate.c
@@ -329,15 +329,13 @@ svm_migrate_copy_to_vram(struct amdgpu_device *adev, struct svm_range *prange,
for (i = j = 0; i < npages; i++) {
struct page *spage;
- dst[i] = vram_addr + (j << PAGE_SHIFT);
- migrate->dst[i] = svm_migrate_addr_to_pfn(adev, dst[i]);
- svm_migrate_get_vram_page(prange, migrate->dst[i]);
-
- migrate->dst[i] = migrate_pfn(migrate->dst[i]);
- migrate->dst[i] |= MIGRATE_PFN_LOCKED;
-
- if (migrate->src[i] & MIGRATE_PFN_VALID) {
- spage = migrate_pfn_to_page(migrate->src[i]);
+ spage = migrate_pfn_to_page(migrate->src[i]);
+ if (spage && !is_zone_device_page(spage)) {
+ dst[i] = vram_addr + (j << PAGE_SHIFT);
+ migrate->dst[i] = svm_migrate_addr_to_pfn(adev, dst[i]);
+ svm_migrate_get_vram_page(prange, migrate->dst[i]);
+ migrate->dst[i] = migrate_pfn(migrate->dst[i]);
+ migrate->dst[i] |= MIGRATE_PFN_LOCKED;
src[i] = dma_map_page(dev, spage, 0, PAGE_SIZE,
DMA_TO_DEVICE);
r = dma_mapping_error(dev, src[i]);
--
2.32.0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-06-29 18:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 18:01 [PATCH 01/11] drm/amdkfd: device pgmap owner at the svm migrate init Alex Sierra
2021-06-29 18:01 ` [PATCH 02/11] drm/amdkfd: add owner ref param to get hmm pages Alex Sierra
2021-06-29 18:01 ` [PATCH 03/11] drm/amdkfd: set owner ref to svm range prefault Alex Sierra
2021-06-29 18:01 ` [PATCH 04/11] drm/amdgpu: get owner ref in validate and map Alex Sierra
2021-06-29 18:02 ` [PATCH 05/11] drm/amdkfd: use hmm range fault to get both domain pfns Alex Sierra
2021-06-29 18:02 ` [PATCH 06/11] drm/amdkfd: classify and map mixed svm range pages in GPU Alex Sierra
2021-06-29 18:02 ` [PATCH 07/11] drm/amdkfd: skip invalid pages during migrations Alex Sierra
2021-06-29 18:02 ` Alex Sierra [this message]
2021-06-29 18:02 ` [PATCH 09/11] drm/amdkfd: add invalid pages debug at vram migration Alex Sierra
2021-06-29 18:02 ` [PATCH 10/11] drm/amdkfd: Maintain svm_bo reference in page->zone_device_data Alex Sierra
2021-06-29 18:02 ` [PATCH 11/11] drm/amdkfd: inc counter on child ranges with xnack off Alex Sierra
2021-06-29 19:00 ` Felix Kuehling
2021-06-30 4:00 ` [PATCH 01/11] drm/amdkfd: device pgmap owner at the svm migrate init Felix Kuehling
2021-06-30 4: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=20210629180206.8002-8-alex.sierra@amd.com \
--to=alex.sierra@amd.com \
--cc=amd-gfx@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox