Commit 4d17ed81 authored by Kefeng Wang's avatar Kefeng Wang Committed by Tong Tiangen
Browse files

mm: migrate: simplify __buffer_migrate_folio() 

mainline inclusion
from mainline-v6.11-rc1
commit 01878f10f8e01e6ca1040ccc19b76e10ff7678ad
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAROKE
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=01878f10f8e01e6ca1040ccc19b76e10ff7678ad

--------------------------------

Patch series "mm: cleanup MIGRATE_SYNC_NO_COPY mode".

Commit 2916ecc0 ("mm/migrate: new migrate mode MIGRATE_SYNC_NO_COPY")
introduce a new MIGRATE_SYNC_NO_COPY mode to allow to offload the copy to
a device DMA engine, which is only used __migrate_device_pages() to decide
whether or not copy the old page, and the MIGRATE_SYNC_NO_COPY mode only
used in hmm, a easy way is just to call the folio_migrate_mapping() and
folio_migrate_flags(), which help to remove the MIGRATE_SYNC_NO_COPY mode.

This patch (of 5):

Use filemap_migrate_folio() helper to simplify __buffer_migrate_folio().

Link: https://lkml.kernel.org/r/20240524052843.182275-1-wangkefeng.wang@huawei.com
Link: https://lkml.kernel.org/r/20240524052843.182275-2-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: default avatarVishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Benjamin LaHaise <bcrl@kvack.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Jiaqi Yan <jiaqiyan@google.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>

Conflicts:
	mm/migrate.c
[Conflicts due to context "spin_unlock(&mapping->i_private_lock)"
inconsistency]

Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
parent 84404f24

mm/migrate.c

+1 −9
Original line number Diff line number Diff line
@@ -792,24 +792,16 @@ static int __buffer_migrate_folio(struct address_space *mapping, 
		}

	}



	rc = folio_migrate_mapping(mapping, dst, src, 0);

	rc = filemap_migrate_folio(mapping, dst, src, mode);

	if (rc != MIGRATEPAGE_SUCCESS)

		goto unlock_buffers;



	folio_attach_private(dst, folio_detach_private(src));



	bh = head;

	do {

		folio_set_bh(bh, dst, bh_offset(bh));

		bh = bh->b_this_page;

	} while (bh != head);



	if (mode != MIGRATE_SYNC_NO_COPY)

		folio_migrate_copy(dst, src);

	else

		folio_migrate_flags(dst, src);



	rc = MIGRATEPAGE_SUCCESS;

unlock_buffers:

	if (check_refs)

		spin_unlock(&mapping->private_lock);