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 05/14] mm: add device coherent vma selection for memory migration
Date: Fri, 15 Jul 2022 10:05:12 -0500 [thread overview]
Message-ID: <20220715150521.18165-6-alex.sierra@amd.com> (raw)
In-Reply-To: <20220715150521.18165-1-alex.sierra@amd.com>
This case is used to migrate pages from device memory, back to system
memory. Device coherent type memory is cache coherent from device and CPU
point of view.
Signed-off-by: Alex Sierra <alex.sierra@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Alistair Poppple <apopple@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
include/linux/migrate.h | 1 +
mm/migrate_device.c | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 069a89e847f3..b84908debe5c 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -148,6 +148,7 @@ static inline unsigned long migrate_pfn(unsigned long pfn)
enum migrate_vma_direction {
MIGRATE_VMA_SELECT_SYSTEM = 1 << 0,
MIGRATE_VMA_SELECT_DEVICE_PRIVATE = 1 << 1,
+ MIGRATE_VMA_SELECT_DEVICE_COHERENT = 1 << 2,
};
struct migrate_vma {
diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index a4847ad65da3..18bc6483f63a 100644
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -148,15 +148,21 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp,
if (is_writable_device_private_entry(entry))
mpfn |= MIGRATE_PFN_WRITE;
} else {
- if (!(migrate->flags & MIGRATE_VMA_SELECT_SYSTEM))
- goto next;
pfn = pte_pfn(pte);
- if (is_zero_pfn(pfn)) {
+ if (is_zero_pfn(pfn) &&
+ (migrate->flags & MIGRATE_VMA_SELECT_SYSTEM)) {
mpfn = MIGRATE_PFN_MIGRATE;
migrate->cpages++;
goto next;
}
page = vm_normal_page(migrate->vma, addr, pte);
+ if (page && !is_zone_device_page(page) &&
+ !(migrate->flags & MIGRATE_VMA_SELECT_SYSTEM))
+ goto next;
+ else if (page && is_device_coherent_page(page) &&
+ (!(migrate->flags & MIGRATE_VMA_SELECT_DEVICE_COHERENT) ||
+ page->pgmap->owner != migrate->pgmap_owner))
+ goto next;
mpfn = migrate_pfn(pfn) | MIGRATE_PFN_MIGRATE;
mpfn |= pte_write(pte) ? MIGRATE_PFN_WRITE : 0;
}
--
2.32.0
next prev parent reply other threads:[~2022-07-16 14:37 UTC|newest]
Thread overview: 27+ 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 ` [PATCH v9 01/14] mm: rename is_pinnable_pages to is_longterm_pinnable_pages 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-18 10:50 ` David Hildenbrand
2022-07-18 17:52 ` Felix Kuehling
2022-07-18 18:46 ` David Hildenbrand
2023-06-15 19:33 ` Peter Xu
2023-06-15 20:15 ` Matthew Wilcox
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 ` [PATCH v9 04/14] mm: handling Non-LRU pages returned by vm_normal_pages Alex Sierra
2022-07-18 10:51 ` David Hildenbrand
2022-07-15 15:05 ` Alex Sierra [this message]
2022-07-15 15:05 ` [PATCH v9 06/14] mm/gup: migrate device coherent pages when pinning instead of failing Alex Sierra
2022-07-18 10:56 ` David Hildenbrand
2022-07-18 20:32 ` Andrew Morton
2022-07-19 8:40 ` David Hildenbrand
2022-07-26 2:22 ` Sierra Guiza, Alejandro (Alex)
2022-07-26 19:05 ` Andrew Morton
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 ` [PATCH v9 09/14] lib: test_hmm add module param for " 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 ` [PATCH v9 11/14] tools: update hmm-test to support device coherent type 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 ` [PATCH v9 13/14] tools: add hmm gup tests for device coherent type Alex Sierra
2022-07-15 15:05 ` [PATCH v9 14/14] tools: add selftests to hmm for COW in device memory 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-6-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: 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;
as well as URLs for NNTP newsgroup(s).