@@ -335,23 +335,21 @@ static pte_t *get_pte_from_cache(struct mm_struct *mm)
static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel)
{
+ gfp_t gfp_mask = PGALLOC_GFP;
void *ret = NULL;
struct page *page;
- if (!kernel) {
- page = alloc_page(PGALLOC_GFP | __GFP_ACCOUNT);
- if (!page)
- return NULL;
- if (!pgtable_page_ctor(page)) {
- __free_page(page);
- return NULL;
- }
- } else {
- page = alloc_page(PGALLOC_GFP);
- if (!page)
- return NULL;
- }
+ if (!kernel)
+ gfp_mask |= __GFP_ACCOUNT;
+ page = alloc_page(gfp_mask);
+ if (!page)
+ return NULL;
+
+ if (!pgtable_page_ctor(page)) {
+ __free_page(page);
+ return NULL;
+ }
ret = page_address(page);
/*
Kernel pagetable pages for PTE fragments never go through the standard init sequence which can cause inaccuracies in utilization statistics reported at places like /proc and /sysfs interfaces etc. Also the allocated page misses out on pagetable lock and page flag init as well. Fix it by making sure all pages allocated for either user process or kernel PTE fragments go through same initialization. Signed-off-by: Anshuman Khandual <khandual@linux.vnet.ibm.com> --- arch/powerpc/mm/pgtable-book3s64.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)