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 v2 02/11] mm: add device coherent vma selection for memory migration Date: Mon, 6 Dec 2021 12:52:42 -0600 [thread overview] Message-ID: <20211206185251.20646-3-alex.sierra@amd.com> (raw) In-Reply-To: <20211206185251.20646-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 91018880dc7f..0367f471211a 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 v2 02/11] mm: add device coherent vma selection for memory migration Date: Mon, 6 Dec 2021 12:52:42 -0600 [thread overview] Message-ID: <20211206185251.20646-3-alex.sierra@amd.com> (raw) In-Reply-To: <20211206185251.20646-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 91018880dc7f..0367f471211a 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
next prev parent reply other threads:[~2021-12-06 18:53 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-06 18:52 [PATCH v2 00/11] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-06 18:52 ` [PATCH v2 01/11] mm: add zone device coherent type memory support Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-06 18:52 ` Alex Sierra [this message] 2021-12-06 18:52 ` [PATCH v2 02/11] mm: add device coherent vma selection for memory migration Alex Sierra 2021-12-06 18:52 ` [PATCH v2 03/11] mm/gup: migrate PIN_LONGTERM dev coherent pages to system Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-08 11:31 ` Alistair Popple 2021-12-08 11:31 ` Alistair Popple 2021-12-08 13:53 ` Jason Gunthorpe 2021-12-08 13:53 ` Jason Gunthorpe 2021-12-09 1:45 ` Alistair Popple 2021-12-09 1:45 ` Alistair Popple 2021-12-09 2:53 ` Jason Gunthorpe 2021-12-09 2:53 ` Jason Gunthorpe 2021-12-08 16:58 ` Felix Kuehling 2021-12-08 16:58 ` Felix Kuehling 2021-12-08 17:30 ` Felix Kuehling 2021-12-08 17:30 ` Felix Kuehling 2021-12-08 18:55 ` Sierra Guiza, Alejandro (Alex) 2021-12-08 18:55 ` Sierra Guiza, Alejandro (Alex) 2021-12-09 10:53 ` Alistair Popple 2021-12-09 10:53 ` Alistair Popple 2021-12-09 16:29 ` Felix Kuehling 2021-12-09 16:29 ` Felix Kuehling 2021-12-09 16:54 ` Sierra Guiza, Alejandro (Alex) 2021-12-09 16:54 ` Sierra Guiza, Alejandro (Alex) 2021-12-10 1:31 ` Alistair Popple 2021-12-10 1:31 ` Alistair Popple 2021-12-10 16:39 ` Felix Kuehling 2021-12-10 16:39 ` Felix Kuehling 2021-12-06 18:52 ` [PATCH v2 04/11] drm/amdkfd: add SPM support for SVM Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-06 18:52 ` [PATCH v2 05/11] drm/amdkfd: coherent type as sys mem on migration to ram Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-06 18:52 ` [PATCH v2 06/11] lib: test_hmm add ioctl to get zone device type Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-06 18:52 ` [PATCH v2 07/11] lib: test_hmm add module param for " Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-06 18:52 ` [PATCH v2 08/11] lib: add support for device coherent type in test_hmm Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2022-01-03 20:24 ` Liam Howlett 2022-01-03 20:24 ` Liam Howlett 2021-12-06 18:52 ` [PATCH v2 09/11] tools: update hmm-test to support device coherent type Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-06 18:52 ` [PATCH v2 10/11] tools: update test_hmm script to support SP config Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-06 18:52 ` [PATCH v2 11/11] tools: add hmm gup test for long term pinned device pages Alex Sierra 2021-12-06 18:52 ` Alex Sierra 2021-12-07 19:31 ` Jason Gunthorpe 2021-12-07 19:31 ` 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=20211206185251.20646-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: 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.