p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mm: migrate: fix double call of radix_tree_replace_slot() 

radix_tree_replace_slot() is called twice for head page, it's obviously
a bug.  Let's fix it.

Link: http://lkml.kernel.org/r/20180423072101.GA12157@hori1.linux.bs1.fc.nec.co.jp
Fixes: e71769ae52 ("mm: enable thp migration for shmem thp")
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Reported-by: Matthew Wilcox <willy@infradead.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Zi Yan <zi.yan@sent.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Naoya Horiguchi 2018-05-11 16:02:00 -07:00 committed by Linus Torvalds
parent 3955333df9
commit 013567be19
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mm/migrate.c
View File

@ -528,14 +528,12 @@ int migrate_page_move_mapping(struct address_space *mapping,
int i; int i;
int index = page_index(page); int index = page_index(page);
for (i = 0; i < HPAGE_PMD_NR; i++) { for (i = 1; i < HPAGE_PMD_NR; i++) {
pslot = radix_tree_lookup_slot(&mapping->i_pages, pslot = radix_tree_lookup_slot(&mapping->i_pages,
index + i); index + i);
radix_tree_replace_slot(&mapping->i_pages, pslot, radix_tree_replace_slot(&mapping->i_pages, pslot,
newpage + i); newpage + i);
} }
} else {
radix_tree_replace_slot(&mapping->i_pages, pslot, newpage);
} }
/* /*