From 69cef3a73bfc5f9961e646f25b6796433c26821a Mon Sep 17 00:00:00 2001 From: Jane Chu Date: Thu, 29 Apr 2021 23:02:19 -0700 Subject: [PATCH] mm/memory-failure: unnecessary amount of unmapping ANBZ: #4488 commit 4d75136be8bf3ae01b0bc3e725b2cdc921e103bd upstream. It appears that unmap_mapping_range() actually takes a 'size' as its third argument rather than a location, the current calling fashion causes unnecessary amount of unmapping to occur. Link: https://lkml.kernel.org/r/20210420002821.2749748-1-jane.chu@oracle.com Fixes: 6100e34b2526e ("mm, memory_failure: Teach memory_failure() about dev_pagemap pages") Signed-off-by: Jane Chu Reviewed-by: Dan Williams Reviewed-by: Naoya Horiguchi Cc: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: jiaofenfang --- mm/memory-failure.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 51729fddb11a..bfcaec2e5611 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1288,7 +1288,7 @@ static int memory_failure_kill_procs(unsigned long long pfn, int flags) * communicated in siginfo, see kill_proc() */ start = (page->index << PAGE_SHIFT) & ~(size - 1); - unmap_mapping_range(page->mapping, start, start + size, 0); + unmap_mapping_range(page->mapping, start, size, 0); } kill_procs(&to_kill, flags & MF_MUST_KILL, !unmap_success, pfn, flags); @@ -1329,7 +1329,7 @@ int dax_kill_mapping_procs(struct address_space *mapping, pgoff_t index, int fla * communicated in siginfo, see kill_proc() */ start = (index << PAGE_SHIFT) & ~(size - 1); - unmap_mapping_range(mapping, start, start + size, 0); + unmap_mapping_range(mapping, start, size, 0); } kill_procs(&to_kill, flags & MF_MUST_KILL, false, pfn, flags); -- Gitee