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-hexag Subject: [PATCH 12/15] powerpc/nohash/64: switch to generic version of pte allocation Date: Thu, 2 May 2019 18:28:39 +0300 [thread overview] Message-ID: <1556810922-20248-13-git-send-email-rppt@linux.ibm.com> (raw) In-Reply-To: <1556810922-20248-1-git-send-email-rppt@linux.ibm.com> The 64-bit book-E powerpc implements pte_alloc_one(), pte_alloc_one_kernel(), pte_free_kernel() and pte_free() the same way as the generic version. Switch it to the generic version that does exactly the same thing. Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> --- arch/powerpc/include/asm/nohash/64/pgalloc.h | 35 ++-------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/arch/powerpc/include/asm/nohash/64/pgalloc.h b/arch/powerpc/include/asm/nohash/64/pgalloc.h index 66d086f..bfb53a0 100644 --- a/arch/powerpc/include/asm/nohash/64/pgalloc.h +++ b/arch/powerpc/include/asm/nohash/64/pgalloc.h @@ -11,6 +11,8 @@ #include <linux/cpumask.h> #include <linux/percpu.h> +#include <asm-generic/pgalloc.h> /* for pte_{alloc,free}_one */ + struct vmemmap_backing { struct vmemmap_backing *list; unsigned long phys; @@ -92,39 +94,6 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) kmem_cache_free(PGT_CACHE(PMD_CACHE_INDEX), pmd); } - -static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm) -{ - return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); -} - -static inline pgtable_t pte_alloc_one(struct mm_struct *mm) -{ - struct page *page; - pte_t *pte; - - pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO | __GFP_ACCOUNT); - if (!pte) - return NULL; - page = virt_to_page(pte); - if (!pgtable_page_ctor(page)) { - __free_page(page); - return NULL; - } - return page; -} - -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 ptepage) -{ - pgtable_page_dtor(ptepage); - __free_page(ptepage); -} - static inline void pgtable_free(void *table, int shift) { if (!shift) { -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
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 12/15] powerpc/nohash/64: switch to generic version of pte allocation Date: Thu, 2 May 2019 18:28:39 +0300 [thread overview] Message-ID: <1556810922-20248-13-git-send-email-rppt@linux.ibm.com> (raw) Message-ID: <20190502152839.CvpaNAghkc8srnoDDSj1BpJvi_X1GfaqUiKskVwXVXo@z> (raw) In-Reply-To: <1556810922-20248-1-git-send-email-rppt@linux.ibm.com> The 64-bit book-E powerpc implements pte_alloc_one(), pte_alloc_one_kernel(), pte_free_kernel() and pte_free() the same way as the generic version. Switch it to the generic version that does exactly the same thing. Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> --- arch/powerpc/include/asm/nohash/64/pgalloc.h | 35 ++-------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/arch/powerpc/include/asm/nohash/64/pgalloc.h b/arch/powerpc/include/asm/nohash/64/pgalloc.h index 66d086f..bfb53a0 100644 --- a/arch/powerpc/include/asm/nohash/64/pgalloc.h +++ b/arch/powerpc/include/asm/nohash/64/pgalloc.h @@ -11,6 +11,8 @@ #include <linux/cpumask.h> #include <linux/percpu.h> +#include <asm-generic/pgalloc.h> /* for pte_{alloc,free}_one */ + struct vmemmap_backing { struct vmemmap_backing *list; unsigned long phys; @@ -92,39 +94,6 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) kmem_cache_free(PGT_CACHE(PMD_CACHE_INDEX), pmd); } - -static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm) -{ - return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); -} - -static inline pgtable_t pte_alloc_one(struct mm_struct *mm) -{ - struct page *page; - pte_t *pte; - - pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO | __GFP_ACCOUNT); - if (!pte) - return NULL; - page = virt_to_page(pte); - if (!pgtable_page_ctor(page)) { - __free_page(page); - return NULL; - } - return page; -} - -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 ptepage) -{ - pgtable_page_dtor(ptepage); - __free_page(ptepage); -} - static inline void pgtable_free(void *table, int shift) { if (!shift) { -- 2.7.4
next prev parent reply other threads:[~2019-05-02 15:28 UTC|newest] Thread overview: 58+ 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 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 01/15] asm-generic, x86: introduce generic pte_{alloc, free}_one[_kernel] Mike Rapoport 2019-05-02 15:28 ` [PATCH 01/15] asm-generic, x86: introduce generic pte_{alloc,free}_one[_kernel] Mike Rapoport 2019-05-02 19:03 ` Paul Burton 2019-05-02 19:03 ` Paul Burton 2019-05-05 6:15 ` Mike Rapoport 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 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 03/15] arm: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 04/15] arm64: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-03 10:05 ` Mark Rutland 2019-05-03 10:05 ` Mark Rutland 2019-05-05 6:19 ` Mike Rapoport 2019-05-05 6:19 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 05/15] csky: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-03 16:03 ` Guo Ren 2019-05-03 16:03 ` Guo Ren 2019-05-03 16:18 ` 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 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 07/15] m68k: sun3: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 08/15] mips: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-02 19:09 ` Paul Burton 2019-05-02 19:09 ` Paul Burton 2019-05-05 6:17 ` Mike Rapoport 2019-05-05 6:17 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 09/15] nds32: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-07 6:49 ` Greentime Hu 2019-05-07 6:49 ` Greentime Hu 2019-05-02 15:28 ` [PATCH 10/15] nios2: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 11/15] parisc: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport [this message] 2019-05-02 15:28 ` [PATCH 12/15] powerpc/nohash/64: " Mike Rapoport 2019-05-02 16:56 ` Christophe Leroy 2019-05-02 16:56 ` Christophe Leroy 2019-05-05 6:23 ` Mike Rapoport 2019-05-05 6:23 ` Mike Rapoport 2019-05-02 15:28 ` [PATCH 13/15] riscv: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-06 18:25 ` Palmer Dabbelt 2019-05-06 18:25 ` Palmer Dabbelt 2019-05-02 15:28 ` [PATCH 14/15] um: " Mike Rapoport 2019-05-02 15:28 ` Mike Rapoport 2019-05-03 13:28 ` Anton Ivanov 2019-05-03 13:28 ` Anton Ivanov 2019-05-02 15:28 ` [PATCH 15/15] unicore32: " Mike Rapoport 2019-05-02 15:28 ` 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-13-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@armlinux.org.uk \ --cc=mattst88@gmail.com \ --cc=mhocko@suse.com \ --cc=mpe@ellerman.id.au \ --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: linkBe 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).