Commit 33f2ef89 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

[PATCH] mm: make compound page destructor handling explicit 



Currently we we use the lru head link of the second page of a compound page
to hold its destructor.  This was ok when it was purely an internal
implmentation detail.  However, hugetlbfs overrides this destructor
violating the layering.  Abstract this out as explicit calls, also
introduce a type for the callback function allowing them to be type
checked.  For each callback we pre-declare the function, causing a type
error on definition rather than on use elsewhere.

[akpm@osdl.org: cleanups]
Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3c517a61

include/linux/mm.h

+18 −0
Original line number Diff line number Diff line
@@ -295,6 +295,24 @@ void put_pages_list(struct list_head *pages); 


void split_page(struct page *page, unsigned int order);



/*

 * Compound pages have a destructor function.  Provide a

 * prototype for that function and accessor functions.

 * These are _only_ valid on the head of a PG_compound page.

 */

typedef void compound_page_dtor(struct page *);



static inline void set_compound_page_dtor(struct page *page,

						compound_page_dtor *dtor)

{

	page[1].lru.next = (void *)dtor;

}



static inline compound_page_dtor *get_compound_page_dtor(struct page *page)

{

	return (compound_page_dtor *)page[1].lru.next;

}



/*

 * Multiple processes may "see" the same page. E.g. for untouched

 * mappings of /dev/null, all processes see the same page full of

mm/hugetlb.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int alloc_fresh_huge_page(void) 
	if (nid == MAX_NUMNODES)

		nid = first_node(node_online_map);

	if (page) {

		page[1].lru.next = (void *)free_huge_page;	/* dtor */

		set_compound_page_dtor(page, free_huge_page);

		spin_lock(&hugetlb_lock);

		nr_huge_pages++;

		nr_huge_pages_node[page_to_nid(page)]++;

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static void prep_compound_page(struct page *page, unsigned long order) 
	int i;

	int nr_pages = 1 << order;



	page[1].lru.next = (void *)free_compound_page;	/* set dtor */

	set_compound_page_dtor(page, free_compound_page);

	page[1].lru.prev = (void *)order;

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

		struct page *p = page + i;

mm/swap.c

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ static void put_compound_page(struct page *page) 
{

	page = (struct page *)page_private(page);

	if (put_page_testzero(page)) {

		void (*dtor)(struct page *page);

		compound_page_dtor *dtor;



		dtor = (void (*)(struct page *))page[1].lru.next;

		dtor = get_compound_page_dtor(page);

		(*dtor)(page);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE