Commit 224abf92 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Linus Torvalds
Browse files

[PATCH] mm: bad_page optimisation 



Cut down size slightly by not passing bad_page the function name (it should be
able to be determined by dump_stack()).  And cut down the number of printks in
bad_page.

Also, cut down some branching in the destroy_compound_page path.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9328b8fa

mm/page_alloc.c

+20 −24
Original line number Original line Diff line number Diff line
@@ -132,16 +132,16 @@ static inline int bad_range(struct zone *zone, struct page *page) 
}

}

#endif

#endif





static void bad_page(const char *function, struct page *page)

static void bad_page(struct page *page)

{

{

	printk(KERN_EMERG "Bad page state at %s (in process '%s', page %p)\n",

	printk(KERN_EMERG "Bad page state in process '%s'\n"

		function, current->comm, page);

		"page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n"

	printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",

		"Trying to fix it up, but a reboot is needed\n"

		(int)(2*sizeof(unsigned long)), (unsigned long)page->flags,

		"Backtrace:\n",

		page->mapping, page_mapcount(page), page_count(page));

		current->comm, page, (int)(2*sizeof(unsigned long)),

	printk(KERN_EMERG "Backtrace:\n");

		(unsigned long)page->flags, page->mapping,

		page_mapcount(page), page_count(page));

	dump_stack();

	dump_stack();

	printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n");

	page->flags &= ~(1 << PG_lru	|

	page->flags &= ~(1 << PG_lru	|

			1 << PG_private |

			1 << PG_private |

			1 << PG_locked	|

			1 << PG_locked	|
@@ -194,19 +194,15 @@ static void destroy_compound_page(struct page *page, unsigned long order) 
	int i;

	int i;

	int nr_pages = 1 << order;

	int nr_pages = 1 << order;





	if (!PageCompound(page))

	if (unlikely(page[1].index != order))

		return;

		bad_page(page);



	if (page[1].index != order)

		bad_page(__FUNCTION__, page);





	for (i = 0; i < nr_pages; i++) {

	for (i = 0; i < nr_pages; i++) {

		struct page *p = page + i;

		struct page *p = page + i;





		if (!PageCompound(p))

		if (unlikely(!PageCompound(p) |

			bad_page(__FUNCTION__, page);

				(page_private(p) != (unsigned long)page)))

		if (page_private(p) != (unsigned long)page)

			bad_page(page);

			bad_page(__FUNCTION__, page);

		ClearPageCompound(p);

		ClearPageCompound(p);

	}

	}

}

}
@@ -316,7 +312,7 @@ static inline void __free_pages_bulk (struct page *page, 
	unsigned long page_idx;

	unsigned long page_idx;

	int order_size = 1 << order;

	int order_size = 1 << order;





	if (unlikely(order))

	if (unlikely(PageCompound(page)))

		destroy_compound_page(page, order);

		destroy_compound_page(page, order);





	page_idx = page_to_pfn(page) & ((1 << MAX_ORDER) - 1);

	page_idx = page_to_pfn(page) & ((1 << MAX_ORDER) - 1);
@@ -348,7 +344,7 @@ static inline void __free_pages_bulk (struct page *page, 
	zone->free_area[order].nr_free++;

	zone->free_area[order].nr_free++;

}

}





static inline int free_pages_check(const char *function, struct page *page)

static inline int free_pages_check(struct page *page)

{

{

	if (unlikely(page_mapcount(page) |

	if (unlikely(page_mapcount(page) |

		(page->mapping != NULL)  |

		(page->mapping != NULL)  |
@@ -363,7 +359,7 @@ static inline int free_pages_check(const char *function, struct page *page) 
			1 << PG_swapcache |

			1 << PG_swapcache |

			1 << PG_writeback |

			1 << PG_writeback |

			1 << PG_reserved ))))

			1 << PG_reserved ))))

		bad_page(function, page);

		bad_page(page);

	if (PageDirty(page))

	if (PageDirty(page))

		__ClearPageDirty(page);

		__ClearPageDirty(page);

	/*

	/*
@@ -422,7 +418,7 @@ void __free_pages_ok(struct page *page, unsigned int order) 
#endif

#endif





	for (i = 0 ; i < (1 << order) ; ++i)

	for (i = 0 ; i < (1 << order) ; ++i)

		reserved += free_pages_check(__FUNCTION__, page + i);

		reserved += free_pages_check(page + i);

	if (reserved)

	if (reserved)

		return;

		return;
@@ -517,7 +513,7 @@ static int prep_new_page(struct page *page, int order) 
			1 << PG_swapcache |

			1 << PG_swapcache |

			1 << PG_writeback |

			1 << PG_writeback |

			1 << PG_reserved ))))

			1 << PG_reserved ))))

		bad_page(__FUNCTION__, page);

		bad_page(page);





	/*

	/*

	 * For now, we report if PG_reserved was found set, but do not

	 * For now, we report if PG_reserved was found set, but do not
@@ -716,7 +712,7 @@ static void fastcall free_hot_cold_page(struct page *page, int cold) 




	if (PageAnon(page))

	if (PageAnon(page))

		page->mapping = NULL;

		page->mapping = NULL;

	if (free_pages_check(__FUNCTION__, page))

	if (free_pages_check(page))

		return;

		return;





	inc_page_state(pgfree);

	inc_page_state(pgfree);