Commit d027122d authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Andrew Morton
Browse files

mm/hwpoison: move definitions of num_poisoned_pages_* to memory-failure.c 

These interfaces will be used by drivers/base/memory.c by later patch, so
as a preparatory work move them to more common header file visible to the
file.

Link: https://lkml.kernel.org/r/20221024062012.1520887-3-naoya.horiguchi@linux.dev


Signed-off-by: default avatarNaoya Horiguchi <naoya.horiguchi@nec.com>
Reviewed-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jane Chu <jane.chu@oracle.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e591ef7d

arch/parisc/kernel/pdt.c

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
#include <linux/kthread.h>

#include <linux/initrd.h>

#include <linux/pgtable.h>

#include <linux/swap.h>

#include <linux/swapops.h>

#include <linux/mm.h>



#include <asm/pdc.h>

#include <asm/pdcpat.h>

include/linux/mm.h

+5 −0
Original line number Diff line number Diff line
@@ -3279,12 +3279,17 @@ extern int soft_offline_page(unsigned long pfn, int flags); 
#ifdef CONFIG_MEMORY_FAILURE

extern int __get_huge_page_for_hwpoison(unsigned long pfn, int flags,

					bool *migratable_cleared);

extern void num_poisoned_pages_inc(void);

#else

static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags,

					bool *migratable_cleared)

{

	return 0;

}



static inline void num_poisoned_pages_inc(void)

{

}

#endif



#ifndef arch_memory_failure

include/linux/swapops.h

+2 −22
Original line number Diff line number Diff line
@@ -581,8 +581,6 @@ static inline int is_pmd_migration_entry(pmd_t pmd) 


#ifdef CONFIG_MEMORY_FAILURE



extern atomic_long_t num_poisoned_pages __read_mostly;



/*

 * Support for hardware poisoned pages

 */
@@ -597,17 +595,7 @@ static inline int is_hwpoison_entry(swp_entry_t entry) 
	return swp_type(entry) == SWP_HWPOISON;

}



static inline void num_poisoned_pages_inc(void)

{

	atomic_long_inc(&num_poisoned_pages);

}



static inline void num_poisoned_pages_sub(long i)

{

	atomic_long_sub(i, &num_poisoned_pages);

}



#else  /* CONFIG_MEMORY_FAILURE */

#else



static inline swp_entry_t make_hwpoison_entry(struct page *page)

{
@@ -618,15 +606,7 @@ static inline int is_hwpoison_entry(swp_entry_t swp) 
{

	return 0;

}



static inline void num_poisoned_pages_inc(void)

{

}



static inline void num_poisoned_pages_sub(long i)

{

}

#endif  /* CONFIG_MEMORY_FAILURE */

#endif



static inline int non_swap_entry(swp_entry_t entry)

{

mm/memory-failure.c

+10 −0
Original line number Diff line number Diff line
@@ -74,6 +74,16 @@ atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); 


static bool hw_memory_failure __read_mostly = false;



inline void num_poisoned_pages_inc(void)

{

	atomic_long_inc(&num_poisoned_pages);

}



static inline void num_poisoned_pages_sub(long i)

{

	atomic_long_sub(i, &num_poisoned_pages);

}



/*

 * Return values:

 *   1:   the page is dissolved (if needed) and taken off from buddy,