Commit 6efde38f authored by Joerg Roedel's avatar Joerg Roedel Committed by Rafael J. Wysocki
Browse files

PM / Hibernate: Iterate over set bits instead of PFNs in swsusp_free() 



The existing implementation of swsusp_free iterates over all
pfns in the system and checks every bit in the two memory
bitmaps.

This doesn't scale very well with large numbers of pfns,
especially when the bitmaps are not populated very densly.
Change the algorithm to iterate over the set bits in the
bitmaps instead to make it scale better in large memory
configurations.

Also add a memory_bm_clear_current() helper function that
clears the bit for the last position returned from the
memory bitmap.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3a20cb17

kernel/power/snapshot.c

+38 −15
Original line number Diff line number Diff line
@@ -848,6 +848,17 @@ static void memory_bm_clear_bit(struct memory_bitmap *bm, unsigned long pfn) 
	clear_bit(bit, addr);

}



static void memory_bm_clear_current(struct memory_bitmap *bm)

{

	int bit;



	bit = max(bm->cur.node_bit - 1, 0);

	clear_bit(bit, bm->cur.node->data);



	bit = max(bm->cur.bit - 1, 0);

	clear_bit(bit, bm->cur.block->data);

}



static int memory_bm_test_bit(struct memory_bitmap *bm, unsigned long pfn)

{

	void *addr;
@@ -1491,23 +1502,35 @@ static struct memory_bitmap copy_bm; 


void swsusp_free(void)

{

	struct zone *zone;

	unsigned long pfn, max_zone_pfn;

	unsigned long fb_pfn, fr_pfn;



	for_each_populated_zone(zone) {

		max_zone_pfn = zone_end_pfn(zone);

		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)

			if (pfn_valid(pfn)) {

				struct page *page = pfn_to_page(pfn);

	memory_bm_position_reset(forbidden_pages_map);

	memory_bm_position_reset(free_pages_map);



				if (swsusp_page_is_forbidden(page) &&

				    swsusp_page_is_free(page)) {

					swsusp_unset_page_forbidden(page);

					swsusp_unset_page_free(page);

loop:

	fr_pfn = memory_bm_next_pfn(free_pages_map);

	fb_pfn = memory_bm_next_pfn(forbidden_pages_map);



	/*

	 * Find the next bit set in both bitmaps. This is guaranteed to

	 * terminate when fb_pfn == fr_pfn == BM_END_OF_MAP.

	 */

	do {

		if (fb_pfn < fr_pfn)

			fb_pfn = memory_bm_next_pfn(forbidden_pages_map);

		if (fr_pfn < fb_pfn)

			fr_pfn = memory_bm_next_pfn(free_pages_map);

	} while (fb_pfn != fr_pfn);



	if (fr_pfn != BM_END_OF_MAP && pfn_valid(fr_pfn)) {

		struct page *page = pfn_to_page(fr_pfn);



		memory_bm_clear_current(forbidden_pages_map);

		memory_bm_clear_current(free_pages_map);

		__free_page(page);

		goto loop;

	}

			}

	}



	nr_copy_pages = 0;

	nr_meta_pages = 0;

	restore_pblist = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE