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 v7 04/14] mm: add device coherent vma selection for memory migration Date: Tue, 28 Jun 2022 22:54:16 -0500 [thread overview] Message-ID: <20220629035426.20013-5-alex.sierra@amd.com> (raw) In-Reply-To: <20220629035426.20013-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> --- 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
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 v7 04/14] mm: add device coherent vma selection for memory migration Date: Tue, 28 Jun 2022 22:54:16 -0500 [thread overview] Message-ID: <20220629035426.20013-5-alex.sierra@amd.com> (raw) In-Reply-To: <20220629035426.20013-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> --- 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-06-29 3:55 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-29 3:54 [PATCH v7 00/14] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 01/14] mm: rename is_pinnable_pages to is_pinnable_longterm_pages Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 7:33 ` David Hildenbrand 2022-06-29 7:33 ` David Hildenbrand 2022-06-29 22:08 ` Felix Kuehling 2022-06-29 22:08 ` Felix Kuehling 2022-06-29 22:15 ` David Hildenbrand 2022-06-29 22:15 ` David Hildenbrand 2022-07-02 4:25 ` Andrew Morton 2022-07-02 4:25 ` Andrew Morton 2022-06-29 23:24 ` Andrew Morton 2022-06-29 23:24 ` Andrew Morton 2022-06-29 3:54 ` [PATCH v7 02/14] mm: add zone device coherent type memory support Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 18:48 ` David Hildenbrand 2022-06-29 18:48 ` David Hildenbrand 2022-06-29 3:54 ` [PATCH v7 03/14] mm: handling Non-LRU pages returned by vm_normal_pages Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 9:59 ` David Hildenbrand 2022-06-29 9:59 ` David Hildenbrand 2022-06-29 23:31 ` Andrew Morton 2022-06-29 23:31 ` Andrew Morton 2022-06-29 3:54 ` Alex Sierra [this message] 2022-06-29 3:54 ` [PATCH v7 04/14] mm: add device coherent vma selection for memory migration Alex Sierra 2022-06-30 10:04 ` David Hildenbrand 2022-06-30 10:04 ` David Hildenbrand 2022-06-30 11:44 ` Alistair Popple 2022-06-30 11:44 ` Alistair Popple 2022-06-30 20:56 ` David Hildenbrand 2022-06-30 20:56 ` David Hildenbrand 2022-06-29 3:54 ` [PATCH v7 05/14] mm: remove the vma check in migrate_vma_setup() Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 06/14] mm/gup: migrate device coherent pages when pinning instead of failing Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 07/14] drm/amdkfd: add SPM support for SVM Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 08/14] lib: test_hmm add ioctl to get zone device type Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 09/14] lib: test_hmm add module param for " Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 10/14] lib: add support for device coherent type in test_hmm Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 11/14] tools: update hmm-test to support device coherent type Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 12/14] tools: update test_hmm script to support SP config Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 13/14] tools: add hmm gup tests for device coherent type Alex Sierra 2022-06-29 3:54 ` Alex Sierra 2022-06-29 3:54 ` [PATCH v7 14/14] tools: add selftests to hmm for COW in device memory Alex Sierra 2022-06-29 3:54 ` 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=20220629035426.20013-5-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.