Commit 07f44ac3 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: page_alloc: move pm_* function into power 

pm_restrict_gfp_mask()/pm_restore_gfp_mask() only used in power, let's
move them out of page_alloc.c.

Adding a general gfp_has_io_fs() function which return true if gfp with
both __GFP_IO and __GFP_FS flags, then use it inside of
pm_suspended_storage(), also the pm_suspended_storage() is moved into
suspend.h.

Link: https://lkml.kernel.org/r/20230516063821.121844-11-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Len Brown <len.brown@intel.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 31a1b9d7

include/linux/gfp.h

+4 −11
Original line number Diff line number Diff line
@@ -338,19 +338,12 @@ extern gfp_t gfp_allowed_mask; 
/* Returns true if the gfp_mask allows use of ALLOC_NO_WATERMARK */

bool gfp_pfmemalloc_allowed(gfp_t gfp_mask);



extern void pm_restrict_gfp_mask(void);

extern void pm_restore_gfp_mask(void);



extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma);



#ifdef CONFIG_PM_SLEEP

extern bool pm_suspended_storage(void);

#else

static inline bool pm_suspended_storage(void)

static inline bool gfp_has_io_fs(gfp_t gfp)

{

	return false;

	return (gfp & (__GFP_IO | __GFP_FS)) == (__GFP_IO | __GFP_FS);

}

#endif /* CONFIG_PM_SLEEP */



extern gfp_t vma_thp_gfp_mask(struct vm_area_struct *vma);



#ifdef CONFIG_CONTIG_ALLOC

/* The below functions must be run on a range from a single zone. */

include/linux/suspend.h

+6 −0
Original line number Diff line number Diff line
@@ -502,6 +502,11 @@ extern void pm_report_max_hw_sleep(u64 t); 
extern bool events_check_enabled;

extern suspend_state_t pm_suspend_target_state;



static inline bool pm_suspended_storage(void)

{

	return !gfp_has_io_fs(gfp_allowed_mask);

}



extern bool pm_wakeup_pending(void);

extern void pm_system_wakeup(void);

extern void pm_system_cancel_wakeup(void);
@@ -535,6 +540,7 @@ static inline void ksys_sync_helper(void) {} 


#define pm_notifier(fn, pri)	do { (void)(fn); } while (0)



static inline bool pm_suspended_storage(void) { return false; }

static inline bool pm_wakeup_pending(void) { return false; }

static inline void pm_system_wakeup(void) {}

static inline void pm_wakeup_clear(bool reset) {}

kernel/power/main.c

+27 −0
Original line number Diff line number Diff line
@@ -21,6 +21,33 @@ 
#include "power.h"



#ifdef CONFIG_PM_SLEEP

/*

 * The following functions are used by the suspend/hibernate code to temporarily

 * change gfp_allowed_mask in order to avoid using I/O during memory allocations

 * while devices are suspended.  To avoid races with the suspend/hibernate code,

 * they should always be called with system_transition_mutex held

 * (gfp_allowed_mask also should only be modified with system_transition_mutex

 * held, unless the suspend/hibernate code is guaranteed not to run in parallel

 * with that modification).

 */

static gfp_t saved_gfp_mask;



void pm_restore_gfp_mask(void)

{

	WARN_ON(!mutex_is_locked(&system_transition_mutex));

	if (saved_gfp_mask) {

		gfp_allowed_mask = saved_gfp_mask;

		saved_gfp_mask = 0;

	}

}



void pm_restrict_gfp_mask(void)

{

	WARN_ON(!mutex_is_locked(&system_transition_mutex));

	WARN_ON(saved_gfp_mask);

	saved_gfp_mask = gfp_allowed_mask;

	gfp_allowed_mask &= ~(__GFP_IO | __GFP_FS);

}



unsigned int lock_system_sleep(void)

{

kernel/power/power.h

+5 −0
Original line number Diff line number Diff line
@@ -216,6 +216,11 @@ static inline void suspend_test_finish(const char *label) {} 
/* kernel/power/main.c */

extern int pm_notifier_call_chain_robust(unsigned long val_up, unsigned long val_down);

extern int pm_notifier_call_chain(unsigned long val);

void pm_restrict_gfp_mask(void);

void pm_restore_gfp_mask(void);

#else

static inline void pm_restrict_gfp_mask(void) {}

static inline void pm_restore_gfp_mask(void) {}

#endif



#ifdef CONFIG_HIGHMEM

mm/page_alloc.c

+0 −38
Original line number Diff line number Diff line
@@ -227,44 +227,6 @@ static inline void set_pcppage_migratetype(struct page *page, int migratetype) 
	page->index = migratetype;

}



#ifdef CONFIG_PM_SLEEP

/*

 * The following functions are used by the suspend/hibernate code to temporarily

 * change gfp_allowed_mask in order to avoid using I/O during memory allocations

 * while devices are suspended.  To avoid races with the suspend/hibernate code,

 * they should always be called with system_transition_mutex held

 * (gfp_allowed_mask also should only be modified with system_transition_mutex

 * held, unless the suspend/hibernate code is guaranteed not to run in parallel

 * with that modification).

 */



static gfp_t saved_gfp_mask;



void pm_restore_gfp_mask(void)

{

	WARN_ON(!mutex_is_locked(&system_transition_mutex));

	if (saved_gfp_mask) {

		gfp_allowed_mask = saved_gfp_mask;

		saved_gfp_mask = 0;

	}

}



void pm_restrict_gfp_mask(void)

{

	WARN_ON(!mutex_is_locked(&system_transition_mutex));

	WARN_ON(saved_gfp_mask);

	saved_gfp_mask = gfp_allowed_mask;

	gfp_allowed_mask &= ~(__GFP_IO | __GFP_FS);

}



bool pm_suspended_storage(void)

{

	if ((gfp_allowed_mask & (__GFP_IO | __GFP_FS)) == (__GFP_IO | __GFP_FS))

		return false;

	return true;

}

#endif /* CONFIG_PM_SLEEP */



#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE

unsigned int pageblock_order __read_mostly;

#endif