Re: [PATCH 1/2] mm: memory-failure: Refactor add_to_kill()

From: HORIGUCHI NAOYA(堀口 直也)
Date: Fri Mar 31 2023 - 01:41:54 EST


On Thu, Mar 30, 2023 at 03:45:00PM +0800, Longlong Xia wrote:
> The page_address_in_vma() is used to find the user virtual address of page
> in add_to_kill(), but it doesn't support ksm due to the ksm page->index
> unusable, add an addr as parameter to add_to_kill(), let's the caller to
> pass it, also rename the function to __add_to_kill(), and adding
> add_to_kill_anon_file() for handling anonymous pages and file pages,
> adding add_to_kill_fsdax() for handling fsdax pages.
>
> Signed-off-by: Longlong Xia <xialonglong1@xxxxxxxxxx>
> ---
> mm/memory-failure.c | 29 +++++++++++++++++++++--------
> 1 file changed, 21 insertions(+), 8 deletions(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index a1ede7bdce95e..9ca058f659121 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -405,9 +405,9 @@ static unsigned long dev_pagemap_mapping_shift(struct vm_area_struct *vma,
> * page->mapping are sufficient for mapping the page back to its
> * corresponding user virtual address.
> */
> -static void add_to_kill(struct task_struct *tsk, struct page *p,
> - pgoff_t fsdax_pgoff, struct vm_area_struct *vma,
> - struct list_head *to_kill)
> +static void __add_to_kill(struct task_struct *tsk, struct page *p,
> + struct vm_area_struct *vma, struct list_head *to_kill,
> + unsigned long addr, pgoff_t fsdax_pgoff)

Hi, Longlong,

The new argument addr seems to be used only from add_to_kill_ksm(),
so you can name the argument as such (like ksm_addr), as we do
for fsdax_pgoff (which is clear to be used only for fsdax)?

Thanks,
Naoya Horiguchi