From: Mike Rapoport <rppt@linux.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Catalin Marinas <catalin.marinas@arm.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Greentime Hu <green.hu@gmail.com>, Guan Xuetao <gxt@pku.edu.cn>,
Guo Ren <guoren@kernel.org>, Helge Deller <deller@gmx.de>,
Ley Foon Tan <lftan@altera.com>,
Matthew Wilcox <willy@infradead.org>,
Matt Turner <mattst88@gmail.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Michal Hocko <mhocko@suse.com>,
Palmer Dabbelt <palmer@sifive.com>,
Paul Burton <paul.burton@mips.com>,
Richard Kuo <rkuo@codeaurora.org>,
Richard Weinberger <richard@nod.at>,
Russell King <linux@armlinux.org.uk>,
Sam Creasey <sammy@sammy.net>,
x86@kernel.org, linux-alpha@vger.kernel.org,
linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-riscv@lists.infradead.org, linux-um@lists.infradead.org,
nios2-dev@lists.rocketboards.org,
Mike Rapoport <rppt@linux.ibm.com>
Subject: [PATCH 14/15] um: switch to generic version of pte allocation
Date: Thu, 2 May 2019 18:28:41 +0300 [thread overview]
Message-ID: <1556810922-20248-15-git-send-email-rppt@linux.ibm.com> (raw)
In-Reply-To: <1556810922-20248-1-git-send-email-rppt@linux.ibm.com>
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.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/um/include/asm/pgalloc.h | 16 ++--------------
arch/um/kernel/mem.c | 22 ----------------------
2 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h
index 99eb568..d7b282e 100644
--- a/arch/um/include/asm/pgalloc.h
+++ b/arch/um/include/asm/pgalloc.h
@@ -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); \
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 99aa11b..2280374 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -215,28 +215,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)
{
--
2.7.4
next prev parent reply other threads:[~2019-05-02 15:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-02 15:28 [PATCH 00/15] introduce generic pte_{alloc,free}_one[_kernel] Mike Rapoport
2019-05-02 15:28 ` [PATCH 01/15] asm-generic, x86: " Mike Rapoport
2019-05-02 19:03 ` Paul Burton
2019-05-05 6:15 ` Mike Rapoport
2019-05-02 15:28 ` [PATCH 02/15] alpha: switch to generic version of pte allocation Mike Rapoport
2019-05-02 15:28 ` [PATCH 03/15] arm: " Mike Rapoport
2019-05-02 15:28 ` [PATCH 04/15] arm64: " Mike Rapoport
2019-05-03 10:05 ` Mark Rutland
2019-05-05 6:19 ` Mike Rapoport
2019-05-02 15:28 ` [PATCH 05/15] csky: " Mike Rapoport
2019-05-03 16:03 ` Guo Ren
2019-05-03 16:18 ` Guo Ren
2019-05-02 15:28 ` [PATCH 06/15] hexagon: " Mike Rapoport
2019-05-02 15:28 ` [PATCH 07/15] m68k: sun3: " Mike Rapoport
2019-05-02 15:28 ` [PATCH 08/15] mips: " Mike Rapoport
2019-05-02 19:09 ` Paul Burton
2019-05-05 6:17 ` Mike Rapoport
2019-05-02 15:28 ` [PATCH 09/15] nds32: " Mike Rapoport
2019-05-07 6:49 ` Greentime Hu
2019-05-02 15:28 ` [PATCH 10/15] nios2: " Mike Rapoport
2019-05-02 15:28 ` [PATCH 11/15] parisc: " Mike Rapoport
2019-05-02 15:28 ` [PATCH 12/15] powerpc/nohash/64: " Mike Rapoport
2019-05-02 16:56 ` Christophe Leroy
2019-05-05 6:23 ` Mike Rapoport
2019-05-02 15:28 ` [PATCH 13/15] riscv: " Mike Rapoport
2019-05-06 18:25 ` Palmer Dabbelt
2019-05-02 15:28 ` Mike Rapoport [this message]
2019-05-03 13:28 ` [PATCH 14/15] um: " Anton Ivanov
2019-05-02 15:28 ` [PATCH 15/15] unicore32: " Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1556810922-20248-15-git-send-email-rppt@linux.ibm.com \
--to=rppt@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=deller@gmx.de \
--cc=geert@linux-m68k.org \
--cc=green.hu@gmail.com \
--cc=guoren@kernel.org \
--cc=gxt@pku.edu.cn \
--cc=lftan@altera.com \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-um@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mattst88@gmail.com \
--cc=mhocko@suse.com \
--cc=mpe@ellerman.id.au \
--cc=nios2-dev@lists.rocketboards.org \
--cc=palmer@sifive.com \
--cc=paul.burton@mips.com \
--cc=richard@nod.at \
--cc=rkuo@codeaurora.org \
--cc=sammy@sammy.net \
--cc=willy@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).