| Message ID | 20240408194232.118537-3-willy@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Some cleanups for memory-failure | expand |
On 4/8/2024 12:42 PM, Matthew Wilcox (Oracle) wrote: > Handle anon/file folios the same way as KSM & DAX folios by passing in > the address. > > Cc: Longlong Xia <xialonglong1@huawei.com> > Acked-by: Miaohe Lin <linmiaohe@huawei.com> > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > --- > 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 34b3c8255c9b..f94d85075ec1 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -431,7 +431,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 > @@ -464,7 +464,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 > @@ -480,6 +481,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) Looks good. Reviewed-by: Jane Chu <jane.chu@oracle.com> -jane
On Mon, Apr 08, 2024 at 08:42:20PM +0100, Matthew Wilcox (Oracle) wrote: > Handle anon/file folios the same way as KSM & DAX folios by passing in > the address. > > Cc: Longlong Xia <xialonglong1@huawei.com> > Acked-by: Miaohe Lin <linmiaohe@huawei.com> > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: Oscar Salvador <osalvador@suse.de>
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 34b3c8255c9b..f94d85075ec1 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -431,7 +431,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 @@ -464,7 +464,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 @@ -480,6 +481,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)