mm/memory-failure: pass addr to __add_to_kill()

Handle anon/file folios the same way as KSM & DAX folios by passing in the
address.

Link: https://lkml.kernel.org/r/20240412193510.2356957-3-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Miaohe Lin <linmiaohe@huawei.com>
Reviewed-by: Jane Chu <jane.chu@oracle.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 396f939c0e1fe15b28ff2a11ce4a13937b8bf71e..9e1a7d8ca745494e036c0e5892342c9608a21435 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -443,7 +443,7 @@ static void __add_to_kill(struct task_struct *tsk, struct page *p,
                return;
        }
 
-       tk->addr = addr ? addr : page_address_in_vma(p, vma);
+       tk->addr = addr;
        if (is_zone_device_page(p))
                tk->size_shift = dev_pagemap_mapping_shift(vma, tk->addr);
        else
@@ -476,7 +476,8 @@ static void add_to_kill_anon_file(struct task_struct *tsk, struct page *p,
                                  struct vm_area_struct *vma,
                                  struct list_head *to_kill)
 {
-       __add_to_kill(tsk, p, vma, to_kill, 0);
+       unsigned long addr = page_address_in_vma(p, vma);
+       __add_to_kill(tsk, p, vma, to_kill, addr);
 }
 
 #ifdef CONFIG_KSM
@@ -492,6 +493,7 @@ static bool task_in_to_kill_list(struct list_head *to_kill,
 
        return false;
 }
+
 void add_to_kill_ksm(struct task_struct *tsk, struct page *p,
                     struct vm_area_struct *vma, struct list_head *to_kill,
                     unsigned long addr)