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

unicore32: switch to generic version of pte allocation

Replace __get_free_page() and alloc_pages() calls with the generic
__pte_alloc_one_kernel() and __pte_alloc_one().

There is no functional change for the kernel PTE allocation.

The difference for the user PTEs, is that the clear_pte_table() is now
called after pgtable_page_ctor() and the addition of __GFP_ACCOUNT to the
GFP flags.

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-15-git-send-email-rppt@linux.ibm.com


Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
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: 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: 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: Ralf Baechle <ralf@linux-mips.org>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Cc: Guo Ren <ren_guo@c-sky.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f32848e1

arch/unicore32/include/asm/pgalloc.h

+8 −28

Original line number	Diff line number	Diff line
		@@ -14,6 +14,10 @@
		#include <asm/cacheflush.h>
		#include <asm/tlbflush.h>

		#define __HAVE_ARCH_PTE_ALLOC_ONE_KERNEL
		#define __HAVE_ARCH_PTE_ALLOC_ONE
		#include <asm-generic/pgalloc.h>

		#define check_pgt_cache() do { } while (0)

		#define _PAGE_USER_TABLE (PMD_TYPE_TABLE \| PMD_PRESENT)
		@@ -25,17 +29,14 @@ extern void free_pgd_slow(struct mm_struct mm, pgd_t pgd);
		#define pgd_alloc(mm) get_pgd_slow(mm)
		#define pgd_free(mm, pgd) free_pgd_slow(mm, pgd)

		#define PGALLOC_GFP (GFP_KERNEL \| __GFP_ZERO)

		/*
		* Allocate one PTE table.
		*/
		static inline pte_t *
		pte_alloc_one_kernel(struct mm_struct *mm)
		{
		pte_t *pte;
		pte_t *pte = __pte_alloc_one_kernel(mm);

		pte = (pte_t *)__get_free_page(PGALLOC_GFP);
		if (pte)
		clean_dcache_area(pte, PTRS_PER_PTE * sizeof(pte_t));

		@@ -47,35 +48,14 @@ pte_alloc_one(struct mm_struct *mm)
		{
		struct page *pte;

		pte = alloc_pages(PGALLOC_GFP, 0);
		pte = __pte_alloc_one(mm, GFP_PGTABLE_USER);
		if (!pte)
		return NULL;
		if (!PageHighMem(pte)) {
		void *page = page_address(pte);
		clean_dcache_area(page, PTRS_PER_PTE * sizeof(pte_t));
		}
		if (!pgtable_page_ctor(pte)) {
		__free_page(pte);
		}

		if (!PageHighMem(pte))
		clean_pte_table(page_address(pte));
		return pte;
		}

		/*
		* Free one PTE table.
		*/
		static inline void pte_free_kernel(struct mm_struct mm, pte_t pte)
		{
		if (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);
		}

		static inline void __pmd_populate(pmd_t *pmdp, unsigned long pmdval)
		{
		set_pmd(pmdp, __pmd(pmdval));

Admin message