Commit f32848e1 authored Jul 11, 2019 by Mike Rapoport Committed by Linus Torvalds Jul 12, 2019

um: switch to generic version of pte allocation

um allocates PTE pages with __get_free_page() and uses
GFP_KERNEL | __GFP_ZERO for the allocations.

Switch it to the generic version that does exactly the same thing for the
kernel page tables and adds __GFP_ACCOUNT for the user PTEs.

The pte_free() and pte_free_kernel() versions are identical to the generic
ones and can be simply dropped.

Link: http://lkml.kernel.org/r/1557296232-15361-14-git-send-email-rppt@linux.ibm.com


Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Guo Ren <ren_guo@c-sky.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Sam Creasey <sammy@sammy.net>
Cc: Vincent Chen <deanbo422@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent d1b46fe5

arch/um/include/asm/pgalloc.h

+2 −14

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@

		#include <linux/mm.h>

		#include <asm-generic/pgalloc.h> /* for pte_{alloc,free}_one */

		#define pmd_populate_kernel(mm, pmd, pte) \
		set_pmd(pmd, __pmd(_PAGE_TABLE + (unsigned long) __pa(pte)))

		@@ -25,20 +27,6 @@
		extern pgd_t pgd_alloc(struct mm_struct );
		extern void pgd_free(struct mm_struct mm, pgd_t pgd);

		extern pte_t pte_alloc_one_kernel(struct mm_struct );
		extern pgtable_t pte_alloc_one(struct mm_struct *);

		static inline void pte_free_kernel(struct mm_struct mm, pte_t pte)
		{
		free_page((unsigned long) pte);
		}

		static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
		{
		pgtable_page_dtor(pte);
		__free_page(pte);
		}

		#define __pte_free_tlb(tlb,pte, address) \
		do { \
		pgtable_page_dtor(pte); \

arch/um/kernel/mem.c

+0 −22

Original line number	Diff line number	Diff line
		@@ -208,28 +208,6 @@ void pgd_free(struct mm_struct mm, pgd_t pgd)
		free_page((unsigned long) pgd);
		}

		pte_t pte_alloc_one_kernel(struct mm_struct mm)
		{
		pte_t *pte;

		pte = (pte_t *)__get_free_page(GFP_KERNEL\|__GFP_ZERO);
		return pte;
		}

		pgtable_t pte_alloc_one(struct mm_struct *mm)
		{
		struct page *pte;

		pte = alloc_page(GFP_KERNEL\|__GFP_ZERO);
		if (!pte)
		return NULL;
		if (!pgtable_page_ctor(pte)) {
		__free_page(pte);
		return NULL;
		}
		return pte;
		}

		#ifdef CONFIG_3_LEVEL_PGTABLES
		pmd_t pmd_alloc_one(struct mm_struct mm, unsigned long address)
		{

Admin message