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 v5 04/13] mm: remove the vma check in migrate_vma_setup() Date: Tue, 31 May 2022 15:00:32 -0500 [thread overview] Message-ID: <20220531200041.24904-5-alex.sierra@amd.com> (raw) In-Reply-To: <20220531200041.24904-1-alex.sierra@amd.com> From: Alistair Popple <apopple@nvidia.com> migrate_vma_setup() checks that a valid vma is passed so that the page tables can be walked to find the pfns associated with a given address range. However in some cases the pfns are already known, such as when migrating device coherent pages during pin_user_pages() meaning a valid vma isn't required. Signed-off-by: Alistair Popple <apopple@nvidia.com> Acked-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Christoph Hellwig <hch@lst.de> --- mm/migrate_device.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 18bc6483f63a..cf9668376c5a 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -486,24 +486,24 @@ int migrate_vma_setup(struct migrate_vma *args) args->start &= PAGE_MASK; args->end &= PAGE_MASK; - if (!args->vma || is_vm_hugetlb_page(args->vma) || - (args->vma->vm_flags & VM_SPECIAL) || vma_is_dax(args->vma)) - return -EINVAL; - if (nr_pages <= 0) - return -EINVAL; - if (args->start < args->vma->vm_start || - args->start >= args->vma->vm_end) - return -EINVAL; - if (args->end <= args->vma->vm_start || args->end > args->vma->vm_end) - return -EINVAL; if (!args->src || !args->dst) return -EINVAL; - - memset(args->src, 0, sizeof(*args->src) * nr_pages); - args->cpages = 0; - args->npages = 0; - - migrate_vma_collect(args); + if (args->vma) { + if (is_vm_hugetlb_page(args->vma) || + (args->vma->vm_flags & VM_SPECIAL) || vma_is_dax(args->vma)) + return -EINVAL; + if (args->start < args->vma->vm_start || + args->start >= args->vma->vm_end) + return -EINVAL; + if (args->end <= args->vma->vm_start || + args->end > args->vma->vm_end) + return -EINVAL; + memset(args->src, 0, sizeof(*args->src) * nr_pages); + args->cpages = 0; + args->npages = 0; + + migrate_vma_collect(args); + } if (args->cpages) migrate_vma_unmap(args); @@ -685,7 +685,7 @@ void migrate_vma_pages(struct migrate_vma *migrate) continue; } - if (!page) { + if (!page && migrate->vma) { if (!(migrate->src[i] & MIGRATE_PFN_MIGRATE)) continue; if (!notified) { -- 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 v5 04/13] mm: remove the vma check in migrate_vma_setup() Date: Tue, 31 May 2022 15:00:32 -0500 [thread overview] Message-ID: <20220531200041.24904-5-alex.sierra@amd.com> (raw) In-Reply-To: <20220531200041.24904-1-alex.sierra@amd.com> From: Alistair Popple <apopple@nvidia.com> migrate_vma_setup() checks that a valid vma is passed so that the page tables can be walked to find the pfns associated with a given address range. However in some cases the pfns are already known, such as when migrating device coherent pages during pin_user_pages() meaning a valid vma isn't required. Signed-off-by: Alistair Popple <apopple@nvidia.com> Acked-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Christoph Hellwig <hch@lst.de> --- mm/migrate_device.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 18bc6483f63a..cf9668376c5a 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -486,24 +486,24 @@ int migrate_vma_setup(struct migrate_vma *args) args->start &= PAGE_MASK; args->end &= PAGE_MASK; - if (!args->vma || is_vm_hugetlb_page(args->vma) || - (args->vma->vm_flags & VM_SPECIAL) || vma_is_dax(args->vma)) - return -EINVAL; - if (nr_pages <= 0) - return -EINVAL; - if (args->start < args->vma->vm_start || - args->start >= args->vma->vm_end) - return -EINVAL; - if (args->end <= args->vma->vm_start || args->end > args->vma->vm_end) - return -EINVAL; if (!args->src || !args->dst) return -EINVAL; - - memset(args->src, 0, sizeof(*args->src) * nr_pages); - args->cpages = 0; - args->npages = 0; - - migrate_vma_collect(args); + if (args->vma) { + if (is_vm_hugetlb_page(args->vma) || + (args->vma->vm_flags & VM_SPECIAL) || vma_is_dax(args->vma)) + return -EINVAL; + if (args->start < args->vma->vm_start || + args->start >= args->vma->vm_end) + return -EINVAL; + if (args->end <= args->vma->vm_start || + args->end > args->vma->vm_end) + return -EINVAL; + memset(args->src, 0, sizeof(*args->src) * nr_pages); + args->cpages = 0; + args->npages = 0; + + migrate_vma_collect(args); + } if (args->cpages) migrate_vma_unmap(args); @@ -685,7 +685,7 @@ void migrate_vma_pages(struct migrate_vma *migrate) continue; } - if (!page) { + if (!page && migrate->vma) { if (!(migrate->src[i] & MIGRATE_PFN_MIGRATE)) continue; if (!notified) { -- 2.32.0
next prev parent reply other threads:[~2022-05-31 20:01 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-31 20:00 [PATCH v5 00/13] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 01/13] mm: add zone device coherent type memory support Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-06-17 9:40 ` David Hildenbrand 2022-06-17 9:40 ` David Hildenbrand 2022-06-17 17:20 ` Sierra Guiza, Alejandro (Alex) 2022-06-17 17:20 ` Sierra Guiza, Alejandro (Alex) 2022-06-17 17:33 ` David Hildenbrand 2022-06-17 17:33 ` David Hildenbrand 2022-06-17 19:27 ` Sierra Guiza, Alejandro (Alex) 2022-06-17 19:27 ` Sierra Guiza, Alejandro (Alex) 2022-06-17 21:19 ` David Hildenbrand 2022-06-17 21:19 ` David Hildenbrand 2022-06-21 11:25 ` Felix Kuehling 2022-06-21 11:25 ` Felix Kuehling 2022-06-21 11:32 ` David Hildenbrand 2022-06-21 11:32 ` David Hildenbrand 2022-06-21 11:55 ` Alistair Popple 2022-06-21 11:55 ` Alistair Popple 2022-06-21 12:25 ` David Hildenbrand 2022-06-21 12:25 ` David Hildenbrand 2022-06-21 16:08 ` Sierra Guiza, Alejandro (Alex) 2022-06-21 16:08 ` Sierra Guiza, Alejandro (Alex) 2022-06-21 16:16 ` David Hildenbrand 2022-06-21 16:16 ` David Hildenbrand 2022-06-22 0:16 ` Alistair Popple 2022-06-22 0:16 ` Alistair Popple 2022-06-22 23:06 ` Sierra Guiza, Alejandro (Alex) 2022-06-22 23:06 ` Sierra Guiza, Alejandro (Alex) 2022-06-22 23:16 ` Sierra Guiza, Alejandro (Alex) 2022-06-22 23:16 ` Sierra Guiza, Alejandro (Alex) 2022-06-23 7:57 ` David Hildenbrand 2022-06-23 7:57 ` David Hildenbrand 2022-06-23 18:20 ` Sierra Guiza, Alejandro (Alex) 2022-06-23 18:20 ` Sierra Guiza, Alejandro (Alex) 2022-06-23 18:21 ` David Hildenbrand 2022-06-23 18:21 ` David Hildenbrand 2022-06-24 16:13 ` Sierra Guiza, Alejandro (Alex) 2022-06-24 16:13 ` Sierra Guiza, Alejandro (Alex) 2022-06-18 9:32 ` Oded Gabbay 2022-06-18 9:32 ` Oded Gabbay 2022-06-20 0:17 ` Alistair Popple 2022-06-20 0:17 ` Alistair Popple 2022-06-20 6:01 ` Oded Gabbay 2022-06-20 6:01 ` Oded Gabbay 2022-06-20 8:13 ` Alistair Popple 2022-06-20 8:13 ` Alistair Popple 2022-06-20 12:23 ` Oded Gabbay 2022-06-20 12:23 ` Oded Gabbay 2022-05-31 20:00 ` [PATCH v5 02/13] mm: handling Non-LRU pages returned by vm_normal_pages Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-06-08 7:06 ` Alistair Popple 2022-06-08 7:06 ` Alistair Popple 2022-06-17 9:51 ` David Hildenbrand 2022-06-17 9:51 ` David Hildenbrand 2022-05-31 20:00 ` [PATCH v5 03/13] mm: add device coherent vma selection for memory migration Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` Alex Sierra [this message] 2022-05-31 20:00 ` [PATCH v5 04/13] mm: remove the vma check in migrate_vma_setup() Alex Sierra 2022-05-31 20:00 ` [PATCH v5 05/13] mm/gup: migrate device coherent pages when pinning instead of failing Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 06/13] drm/amdkfd: add SPM support for SVM Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 07/13] lib: test_hmm add ioctl to get zone device type Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 08/13] lib: test_hmm add module param for " Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 09/13] lib: add support for device coherent type in test_hmm Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 10/13] tools: update hmm-test to support device coherent type Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 11/13] tools: update test_hmm script to support SP config Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 12/13] tools: add hmm gup tests for device coherent type Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-05-31 20:00 ` [PATCH v5 13/13] tools: add selftests to hmm for COW in device memory Alex Sierra 2022-05-31 20:00 ` Alex Sierra 2022-06-17 2:19 ` [PATCH v5 00/13] Add MEMORY_DEVICE_COHERENT for coherent device memory mapping Andrew Morton 2022-06-17 2:19 ` Andrew Morton 2022-06-17 7:44 ` David Hildenbrand 2022-06-17 7:44 ` David Hildenbrand
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=20220531200041.24904-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.