Commit 4fa4f53b authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds

[PATCH] x86_64: pageattr remove __put_page

Remove page_count and __put_page from x86-64 pageattr
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Acked-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 20aaffd6
...@@ -45,6 +45,13 @@ static struct page *split_large_page(unsigned long address, pgprot_t prot, ...@@ -45,6 +45,13 @@ static struct page *split_large_page(unsigned long address, pgprot_t prot,
pte_t *pbase; pte_t *pbase;
if (!base) if (!base)
return NULL; return NULL;
/*
* page_private is used to track the number of entries in
* the page table page have non standard attributes.
*/
SetPagePrivate(base);
page_private(base) = 0;
address = __pa(address); address = __pa(address);
addr = address & LARGE_PAGE_MASK; addr = address & LARGE_PAGE_MASK;
pbase = (pte_t *)page_address(base); pbase = (pte_t *)page_address(base);
...@@ -124,8 +131,8 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot, ...@@ -124,8 +131,8 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot,
set_pte(kpte, pfn_pte(pfn, prot)); set_pte(kpte, pfn_pte(pfn, prot));
} else { } else {
/* /*
* split_large_page will take the reference for this change_page_attr * split_large_page will take the reference for this
* on the split page. * change_page_attr on the split page.
*/ */
struct page *split; struct page *split;
...@@ -137,23 +144,20 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot, ...@@ -137,23 +144,20 @@ __change_page_attr(unsigned long address, unsigned long pfn, pgprot_t prot,
set_pte(kpte,mk_pte(split, ref_prot2)); set_pte(kpte,mk_pte(split, ref_prot2));
kpte_page = split; kpte_page = split;
} }
get_page(kpte_page); page_private(kpte_page)++;
} else if ((kpte_flags & _PAGE_PSE) == 0) { } else if ((kpte_flags & _PAGE_PSE) == 0) {
set_pte(kpte, pfn_pte(pfn, ref_prot)); set_pte(kpte, pfn_pte(pfn, ref_prot));
__put_page(kpte_page); BUG_ON(page_private(kpte_page) == 0);
page_private(kpte_page)--;
} else } else
BUG(); BUG();
/* on x86-64 the direct mapping set at boot is not using 4k pages */ /* on x86-64 the direct mapping set at boot is not using 4k pages */
BUG_ON(PageReserved(kpte_page)); BUG_ON(PageReserved(kpte_page));
switch (page_count(kpte_page)) { if (page_private(kpte_page) == 0) {
case 1:
save_page(kpte_page); save_page(kpte_page);
revert_page(address, ref_prot); revert_page(address, ref_prot);
break;
case 0:
BUG(); /* memleak and failed 2M page regeneration */
} }
return 0; return 0;
} }
...@@ -216,6 +220,7 @@ void global_flush_tlb(void) ...@@ -216,6 +220,7 @@ void global_flush_tlb(void)
while (dpage) { while (dpage) {
struct page *tmp = dpage; struct page *tmp = dpage;
dpage = (struct page *)dpage->lru.next; dpage = (struct page *)dpage->lru.next;
ClearPagePrivate(tmp);
__free_page(tmp); __free_page(tmp);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment