[PATCH] mm/migrate: remove cpages-- in migrate_vma_finalize()

[PATCH] mm/migrate: remove cpages-- in migrate_vma_finalize()

[Ralph Campbell]

The variable struct migrate_vma->cpages is only used in
migrate_vma_setup(). There is no need to decrement it in
migrate_vma_finalize() since it is never checked.

Signed-off-by: Ralph Campbell <rcampbell@nvidia.com>
---

This applies to linux-mm and is for Andrew Morton's tree.

 mm/migrate.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index 0b945c8031be..eb859f7a9811 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -3087,7 +3087,6 @@ void migrate_vma_finalize(struct migrate_vma *migrate)
 
 		remove_migration_ptes(page, newpage, false);
 		unlock_page(page);
-		migrate->cpages--;
 
 		if (is_zone_device_page(page))
 			put_page(page);
-- 
2.20.1

[PATCH] mm/migrate: remove obsolete comment about device public

[Ralph Campbell]

Device public memory never had an in tree consumer and was removed in
commit 25b2995a35b6 ("mm: remove MEMORY_DEVICE_PUBLIC support").
Delete the obsolete comment.

Signed-off-by: Ralph Campbell <rcampbell@nvidia.com>
---

This applies to linux-mm and is for Andrew Morton's tree.

 mm/migrate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index eb859f7a9811..34fdd25a26db 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -381,7 +381,7 @@ static int expected_page_refs(struct address_space *mapping, struct page *page)
 	int expected_count = 1;
 
 	/*
-	 * Device public or private pages have an extra refcount as they are
+	 * Device private pages have an extra refcount as they are
 	 * ZONE_DEVICE pages.
 	 */
 	expected_count += is_device_private_page(page);
-- 
2.20.1

Re: [PATCH] mm/migrate: remove obsolete comment about device public

[Jason Gunthorpe]

On Thu, Aug 27, 2020 at 12:07:35PM -0700, Ralph Campbell wrote:
> Device public memory never had an in tree consumer and was removed in
> commit 25b2995a35b6 ("mm: remove MEMORY_DEVICE_PUBLIC support").
> Delete the obsolete comment.
> 
> Signed-off-by: Ralph Campbell <rcampbell@nvidia.com>
> ---
> 
> This applies to linux-mm and is for Andrew Morton's tree.

Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>

Jason