mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 03:10:52 +07:00
mm/memory-failure: remove a wrapper for alloc_migration_target()
There is a well-defined standard migration target callback. Use it directly. Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: Christoph Hellwig <hch@infradead.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Cc: Roman Gushchin <guro@fb.com> Link: http://lkml.kernel.org/r/1594622517-20681-9-git-send-email-iamjoonsoo.kim@lge.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4127c6504f
commit
5460875999
@ -1673,16 +1673,6 @@ int unpoison_memory(unsigned long pfn)
|
||||
}
|
||||
EXPORT_SYMBOL(unpoison_memory);
|
||||
|
||||
static struct page *new_page(struct page *p, unsigned long private)
|
||||
{
|
||||
struct migration_target_control mtc = {
|
||||
.nid = page_to_nid(p),
|
||||
.gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
|
||||
};
|
||||
|
||||
return alloc_migration_target(p, (unsigned long)&mtc);
|
||||
}
|
||||
|
||||
/*
|
||||
* Safely get reference count of an arbitrary page.
|
||||
* Returns 0 for a free page, -EIO for a zero refcount page
|
||||
@ -1797,6 +1787,10 @@ static int __soft_offline_page(struct page *page)
|
||||
char const *msg_page[] = {"page", "hugepage"};
|
||||
bool huge = PageHuge(page);
|
||||
LIST_HEAD(pagelist);
|
||||
struct migration_target_control mtc = {
|
||||
.nid = NUMA_NO_NODE,
|
||||
.gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL,
|
||||
};
|
||||
|
||||
/*
|
||||
* Check PageHWPoison again inside page lock because PageHWPoison
|
||||
@ -1833,8 +1827,8 @@ static int __soft_offline_page(struct page *page)
|
||||
}
|
||||
|
||||
if (isolate_page(hpage, &pagelist)) {
|
||||
ret = migrate_pages(&pagelist, new_page, NULL, MPOL_MF_MOVE_ALL,
|
||||
MIGRATE_SYNC, MR_MEMORY_FAILURE);
|
||||
ret = migrate_pages(&pagelist, alloc_migration_target, NULL,
|
||||
(unsigned long)&mtc, MIGRATE_SYNC, MR_MEMORY_FAILURE);
|
||||
if (!ret) {
|
||||
bool release = !huge;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user