From: Alex Sierra <alex.sierra@amd.com>
To: <akpm@linux-foundation.org>, <Felix.Kuehling@amd.com>,
<linux-mm@kvack.org>, <rcampbell@nvidia.com>,
<linux-ext4@vger.kernel.org>, <linux-xfs@vger.kernel.org>
Cc: <amd-gfx@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>, <hch@lst.de>, <jgg@nvidia.com>,
<jglisse@redhat.com>, <apopple@nvidia.com>, <willy@infradead.org>
Subject: [PATCH v6 02/10] mm: add device coherent vma selection for memory migration
Date: Tue, 1 Feb 2022 09:48:53 -0600 [thread overview]
Message-ID: <20220201154901.7921-3-alex.sierra@amd.com> (raw)
In-Reply-To: <20220201154901.7921-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>
---
v2:
condition added when migrations from device coherent pages.
v6:
Corrections with zero pages, to make sure these are only migrated
only when MIGRATE_VMA_SELECT_SYSTEM is set.
---
include/linux/migrate.h | 1 +
mm/migrate.c | 12 +++++++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index db96e10eb8da..66a34eae8cb6 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -130,6 +130,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.c b/mm/migrate.c
index cd137aedcfe5..69c6830c47c6 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2264,15 +2264,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-02-01 15:49 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-01 15:48 [PATCH v6 00/10] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping Alex Sierra
2022-02-01 15:48 ` [PATCH v6 01/10] mm: add zone device coherent type memory support Alex Sierra
2022-02-11 16:15 ` David Hildenbrand
2022-02-11 16:39 ` David Hildenbrand
2022-02-11 16:52 ` Sierra Guiza, Alejandro (Alex)
2022-02-11 17:07 ` Felix Kuehling
2022-02-15 12:16 ` David Hildenbrand
2022-02-15 14:45 ` Jason Gunthorpe
2022-02-15 18:32 ` Christoph Hellwig
2022-02-15 19:41 ` Jason Gunthorpe
2022-02-15 21:35 ` Felix Kuehling
2022-02-15 21:47 ` Jason Gunthorpe
2022-02-15 22:49 ` Felix Kuehling
2022-02-16 2:01 ` Jason Gunthorpe
2022-02-16 16:56 ` Felix Kuehling
2022-02-16 17:28 ` Jason Gunthorpe
2022-02-16 1:23 ` Alistair Popple
2022-02-16 2:03 ` Jason Gunthorpe
2022-02-16 2:36 ` Alistair Popple
2022-02-16 8:31 ` David Hildenbrand
2022-02-16 12:26 ` Jason Gunthorpe
2022-02-17 1:05 ` Alistair Popple
2022-02-17 21:12 ` Felix Kuehling
2022-02-18 0:19 ` Jason Gunthorpe
2022-02-18 19:20 ` Felix Kuehling
2022-02-18 19:26 ` Jason Gunthorpe
2022-02-18 19:37 ` Felix Kuehling
2022-02-28 20:34 ` [PATCH] mm: split vm_normal_pages for LRU and non-LRU handling Alex Sierra
2022-02-28 22:41 ` Felix Kuehling
2022-03-01 8:03 ` David Hildenbrand
2022-03-01 16:08 ` Felix Kuehling
2022-03-01 16:22 ` David Hildenbrand
2022-03-01 16:30 ` Felix Kuehling
2022-03-01 16:32 ` David Hildenbrand
2022-02-18 0:59 ` [PATCH v6 01/10] mm: add zone device coherent type memory support Alistair Popple
2022-02-11 16:45 ` Jason Gunthorpe
2022-02-11 16:49 ` David Hildenbrand
2022-02-11 16:56 ` Jason Gunthorpe
2022-02-15 12:15 ` David Hildenbrand
2022-02-15 18:52 ` Felix Kuehling
2022-02-11 17:05 ` Felix Kuehling
2022-02-14 2:04 ` Alistair Popple
2022-02-01 15:48 ` Alex Sierra [this message]
2022-02-01 15:48 ` [PATCH v6 03/10] mm/gup: fail get_user_pages for LONGTERM dev coherent type Alex Sierra
2022-02-01 15:48 ` [PATCH v6 04/10] drm/amdkfd: add SPM support for SVM Alex Sierra
2022-02-01 15:48 ` [PATCH v6 05/10] drm/amdkfd: coherent type as sys mem on migration to ram Alex Sierra
2022-02-01 15:48 ` [PATCH v6 06/10] lib: test_hmm add ioctl to get zone device type Alex Sierra
2022-02-01 15:48 ` [PATCH v6 07/10] lib: test_hmm add module param for " Alex Sierra
2022-02-01 15:48 ` [PATCH v6 08/10] lib: add support for device coherent type in test_hmm Alex Sierra
2022-02-01 15:49 ` [PATCH v6 09/10] tools: update hmm-test to support device coherent type Alex Sierra
2022-02-01 15:49 ` [PATCH v6 10/10] tools: update test_hmm script to support SP config 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=20220201154901.7921-3-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=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).