On 2024/3/1 5:20, Matthew Wilcox (Oracle) wrote:
> Handle anon/file folios the same way as KSM & DAX folios by passing in
> the address.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
> Cc: Longlong Xia <xialonglong1@xxxxxxxxxx>
LGTM. Thanks.
Acked-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
> ---
> mm/memory-failure.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index 9356227a50bb..7f8473c08ae3 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -432,7 +432,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
> @@ -465,7 +465,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
> @@ -481,6 +482,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)
>
