All of lore.kernel.org
 help / color / mirror / Atom feed
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 v4 02/10] mm: add device coherent vma selection for memory migration
Date: Wed, 26 Jan 2022 21:09:41 -0600	[thread overview]
Message-ID: <20220127030949.19396-3-alex.sierra@amd.com> (raw)
In-Reply-To: <20220127030949.19396-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>
---
v2:
condition added when migrations from device coherent pages.
---
 include/linux/migrate.h | 1 +
 mm/migrate.c            | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index c8077e936691..e74bb0978f6f 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -138,6 +138,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 277562cd4cf5..2b3375e165b1 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2340,8 +2340,6 @@ 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)) {
 				mpfn = MIGRATE_PFN_MIGRATE;
@@ -2349,6 +2347,13 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp,
 				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;
+			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


WARNING: multiple messages have this Message-ID (diff)
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: willy@infradead.org, apopple@nvidia.com,
	dri-devel@lists.freedesktop.org, jglisse@redhat.com,
	amd-gfx@lists.freedesktop.org, jgg@nvidia.com, hch@lst.de
Subject: [PATCH v4 02/10] mm: add device coherent vma selection for memory migration
Date: Wed, 26 Jan 2022 21:09:41 -0600	[thread overview]
Message-ID: <20220127030949.19396-3-alex.sierra@amd.com> (raw)
In-Reply-To: <20220127030949.19396-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>
---
v2:
condition added when migrations from device coherent pages.
---
 include/linux/migrate.h | 1 +
 mm/migrate.c            | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index c8077e936691..e74bb0978f6f 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -138,6 +138,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 277562cd4cf5..2b3375e165b1 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2340,8 +2340,6 @@ 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)) {
 				mpfn = MIGRATE_PFN_MIGRATE;
@@ -2349,6 +2347,13 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp,
 				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;
+			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


  parent reply	other threads:[~2022-01-27  3:10 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-27  3:09 [PATCH v4 00/10] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping Alex Sierra
2022-01-27  3:09 ` Alex Sierra
2022-01-27  3:09 ` [PATCH v4 01/10] mm: add zone device coherent type memory support Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-28  1:57   ` Alistair Popple
2022-01-28  1:57     ` Alistair Popple
2022-01-27  3:09 ` Alex Sierra [this message]
2022-01-27  3:09   ` [PATCH v4 02/10] mm: add device coherent vma selection for memory migration Alex Sierra
2022-01-28  2:07   ` Alistair Popple
2022-01-28  2:07     ` Alistair Popple
2022-01-27  3:09 ` [PATCH v4 03/10] mm/gup: fail get_user_pages for LONGTERM dev coherent type Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-28  2:36   ` Alistair Popple
2022-01-28  2:36     ` Alistair Popple
2022-01-27  3:09 ` [PATCH v4 04/10] drm/amdkfd: add SPM support for SVM Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-28  2:38   ` Alistair Popple
2022-01-28  2:38     ` Alistair Popple
2022-01-27  3:09 ` [PATCH v4 05/10] drm/amdkfd: coherent type as sys mem on migration to ram Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-27  3:09 ` [PATCH v4 06/10] lib: test_hmm add ioctl to get zone device type Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-28  4:22   ` Alistair Popple
2022-01-28  4:22     ` Alistair Popple
2022-01-27  3:09 ` [PATCH v4 07/10] lib: test_hmm add module param for " Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-28  4:22   ` Alistair Popple
2022-01-28  4:22     ` Alistair Popple
2022-01-27  3:09 ` [PATCH v4 08/10] lib: add support for device coherent type in test_hmm Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-28  4:25   ` Alistair Popple
2022-01-28  4:25     ` Alistair Popple
2022-01-27  3:09 ` [PATCH v4 09/10] tools: update hmm-test to support device coherent type Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-27  3:09 ` [PATCH v4 10/10] tools: update test_hmm script to support SP config Alex Sierra
2022-01-27  3:09   ` Alex Sierra
2022-01-27 22:32 ` [PATCH v4 00/10] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping Andrew Morton
2022-01-27 22:32   ` Andrew Morton
2022-01-27 23:20   ` Sierra Guiza, Alejandro (Alex)
2022-01-27 23:20     ` Sierra Guiza, Alejandro (Alex)
2022-01-28  7:08     ` Andrew Morton
2022-01-28  7:08       ` Andrew Morton
2022-01-28 15:00     ` Deucher, Alexander
2022-01-28 15:00       ` Deucher, Alexander
2022-01-28 17:09     ` Felix Kuehling
2022-01-28 17:09       ` Felix Kuehling
2022-02-02 14:57   ` Christoph Hellwig
2022-02-02 14:57     ` Christoph Hellwig
2022-02-02 15:42     ` Jason Gunthorpe
2022-02-02 15:42       ` Jason Gunthorpe

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=20220127030949.19396-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 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.