From patchwork Mon Feb 25 05:03:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anshuman Khandual X-Patchwork-Id: 10828229 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6B6111399 for ; Mon, 25 Feb 2019 05:04:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5829A2AA8F for ; Mon, 25 Feb 2019 05:04:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B17E2AA94; Mon, 25 Feb 2019 05:04:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F19AC2AA8F for ; Mon, 25 Feb 2019 05:04:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=NTenXRt7wa/8I0Ah9I980mzxvytg39B+meIjO7iIAqg=; b=afW4dmYCFcUVisnHX+jAqoSS3c ZnAihv2BxlPJvWs1kAX6RTwBbwllsdC2fyt5/ZD9JEYQ+E1Kz2VOMnn2ec17tSh91AQGIl5RNSQJ5 ZSpU0JWhhBYPwSH/wkFNmPMrxGseXJqAj6ijL1bFBnSLHkXcNhaKTNGBZl5WF+utgN8UxPPAlPNjT l4U0FaCTsj2pPCtDWNcIV/e2pmJzLT4NMP6hWqRfLKo/ltq/CLbWSvtNhX61zLvp7kKRRaqizV5XI KQTD7VSoYsJbdOgKOp1vDOuXD+nM6X9P+TRkMlitxj4ohQmgTvCbh9KaPZ+t1fTKmTP7x3HVudiU7 mqT5gVTQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gy8RZ-0006gS-6P; Mon, 25 Feb 2019 05:04:45 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gy8R1-00069k-OO for linux-arm-kernel@lists.infradead.org; Mon, 25 Feb 2019 05:04:13 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6391815AD; Sun, 24 Feb 2019 21:04:09 -0800 (PST) Received: from p8cg001049571a15.blr.arm.com (p8cg001049571a15.blr.arm.com [10.162.42.159]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 843233F5C1; Sun, 24 Feb 2019 21:04:06 -0800 (PST) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V2 2/6] arm64/mm: Make pgd_pgtable_alloc() call pte_alloc_one() always Date: Mon, 25 Feb 2019 10:33:55 +0530 Message-Id: <1551071039-20192-3-git-send-email-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1551071039-20192-1-git-send-email-anshuman.khandual@arm.com> References: <1551071039-20192-1-git-send-email-anshuman.khandual@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190224_210411_791857_062D906E X-CRM114-Status: GOOD ( 14.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, yuzhao@google.com, Steve.Capper@arm.com, marc.zyngier@arm.com, Catalin.Marinas@arm.com, suzuki.poulose@arm.com, will.deacon@arm.com, james.morse@arm.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP pgd_pgtable_alloc() provides page allocation function while creating all levels of page table (PGD, PUD, CONT PMD etc) for various kernel mappings. It calls __get_free_page() and initializes page with pagetable_page_ctor(). pte_alloc_one() already provides a standard interface for allocating a page table page and initializes it with pagetable_page_ctor(). This removes the redundancy and instead make it call pte_alloc_one() directly. Signed-off-by: Anshuman Khandual --- arch/arm64/mm/mmu.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index b6f5aa52ac67..2dbd72319152 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -372,13 +372,22 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, static phys_addr_t pgd_pgtable_alloc(void) { - void *ptr = (void *)__get_free_page(PGALLOC_GFP); - if (!ptr || !pgtable_page_ctor(virt_to_page(ptr))) - BUG(); + + pgtable_t ptr; + + /* + * pgd_pgtable_alloc() is called while creating kernel mappings + * through __create_pgd_mapping() might not install it through + * swapper_pg_dir (&init_mm). Even then init_mm is passed here + * just to indicate that the allocation is kernel specific not + * for the user space page tables. + */ + ptr = pte_alloc_one(&init_mm); + BUG_ON(!ptr); /* Ensure the zeroed page is visible to the page table walker */ dsb(ishst); - return __pa(ptr); + return page_to_phys(ptr); } /*