From patchwork Mon Oct 17 23:37:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 13009695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A4A71C43217 for ; Mon, 17 Oct 2022 23:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=YoFIjnDmGSS7ASFO3wu99aApL4wJSVarOqR4i9vqZ/Y=; b=RZs5ISzhXPzkbX rPde7qizbrkEy10bYTGrJqu4hjJiEJ0g2bp4PHsm2cbrlANtAGfNjWWaVPeRO7B7Z+oV7lWFa8I/f fnNAGNHh5lBIWYM05y3Hx/bUhC5mgaHYrXebtlWxe15WIgj6ODgADCBk1bNBO8e/CVZ7U1FyIS4XJ elR6yAj8wHL9F+gme4+lzKQ7n/YBQF2bJnx1zYpSUtazyWNlYbPof6mNP+uUL8oJecY9s6H5X5BPN 67QXmHt4dVbaAW2XjVWQbNavHPO6pGZ3XRV+tOllwug5pD3iQkHs71SDhLKUobjg5wkL4RbmZrdHn pmJkmsy+QyIeuwEW+ebQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1okZfY-00GYRA-7K; Mon, 17 Oct 2022 23:37:16 +0000 Received: from smtpcmd0641.aruba.it ([62.149.156.41]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1okZfT-00GYP7-KE for linux-arm-kernel@lists.infradead.org; Mon, 17 Oct 2022 23:37:14 +0000 Received: from localhost.localdomain ([146.241.87.206]) by Aruba Outgoing Smtp with ESMTPSA id kZfJoHtVXJpY4kZfJoMX3o; Tue, 18 Oct 2022 01:37:03 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1666049823; bh=+OQAKoYv7OiuITTsmVZiFS/2M0iuzzB5uuDxcJkXXgI=; h=From:To:Subject:Date:MIME-Version; b=bUwxpBrurlQyUR5ls45YsLQoMzDT8C9/GiWvONMGEjAi19/DBuVq243MR53ypulYl IH/b3lGfM5D5z1UJ3Ek2gcgoO/bSYzEuyd5mtcmEQiegZMNusd9L+NNnsmJNX22L3q FkkYh4BS/ihkYsyDLkadWF/3aq7dfurgJp4yOyXlDhi1jYK2EklFsgG8M68xtq6P3/ 5B8Iq4v/0v4fol+5j9xbhoWicSGwhc/R7Ck+6Pj8nUG0lOS6q+NMQPxXn7A9Ad8p50 mq2EvrKVhi1+oB5wzsArJslj27JtC1sdV/zJ23hdsUU0Sjdifip1Mwo3n1zBVTl/nM xe0RNKxSZZmLw== From: Giulio Benetti To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Russell King , Giulio Benetti , Anshuman Khandual , Andrew Morton , Kefeng Wang , Russell King , Arnd Bergmann , Will Deacon Subject: [PATCH] ARM: mm: fix no-MMU ZERO_PAGE() implementation Date: Tue, 18 Oct 2022 01:37:00 +0200 Message-Id: <20221017233700.84918-1-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4xfEesJnfYhGVfzJwrpi2WrccOoQLk7qp7dxIosvDTgNTHuD+L/Kgzbkpqd5IzkRrqzYNkCaCxHsGSoGNJBk/6hCXucsuTWi1skZxo2vJ2oPXyWgrir0Dc WSG2BDgQRCTBN3fISBsiKdgBXLrKGfZL8BvLcoY1DCli3bD3X4YOgh0xNnuWOlxBZZ+UI5vYWrk/vQkIy1MjU4r9NL2P3zARME3m7jk1ZKUijybkhhAVOU6r IKu98Y6Ui8ByU+5a3DA22aTL9J5YfLdorcXL/Ef0irNtMNXrGVKwYfuLS1MZPQLyYe4CtnfkWBFPtq5GyNyOaNpd+wF1ILw98TgmEAJhgyebqBH2KL1Ad6Mv JDM3AuMzmChqAj4em51r15cfjGCGXrEAnbyRTENfxX0XFkAwr3xMouc4rbRgHya9z+H17oqI2G2nta7f3ybPP+WLN/TGioTA1lxsgKHpoxWHfl4ai+UALEIx h+iN2PkHoXKPdCD6yAlWNL/JF0cfG1eFndeljNJyUL4NgDbanjiBNn6C3Tia8AilFEDttK2spTNGMRf96iMSgmpPI8PBwZF1DRMPZjjHksQjG3nFprJyg3ge r1Q= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221017_163712_170556_F45652BB X-CRM114-Status: GOOD ( 15.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Actually in no-MMU SoCs(i.e. i.MXRT) ZERO_PAGE(vaddr) expands to ``` virt_to_page(0) ``` that in order expands to: ``` pfn_to_page(virt_to_pfn(0)) ``` and then virt_to_pfn(0) to: ``` #define virt_to_pfn(0) \ ((((unsigned long)(0) - PAGE_OFFSET) >> PAGE_SHIFT) + \ PHYS_PFN_OFFSET) ``` where PAGE_OFFSET and PHYS_PFN_OFFSET are the DRAM offset(0x80000000) and PAGE_SHIFT is 12. This way we obtain 16MB(0x01000000) summed to the base of DRAM(0x80000000). When ZERO_PAGE(0) is then used, for example in bio_add_page(), the page gets an address that is out of DRAM bounds. So instead of using fake virtual page 0 let's allocate a dedicated zero_page during paging_init() and assign it to a global 'struct page * empty_zero_page' the same way mmu.c does. Then let's move ZERO_PAGE() definition to the top of pgtable.h to be in common between mmu.c and nommu.c. Signed-off-by: Giulio Benetti --- arch/arm/include/asm/pgtable-nommu.h | 6 ------ arch/arm/include/asm/pgtable.h | 16 +++++++++------- arch/arm/mm/nommu.c | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h index d16aba48fa0a..090011394477 100644 --- a/arch/arm/include/asm/pgtable-nommu.h +++ b/arch/arm/include/asm/pgtable-nommu.h @@ -44,12 +44,6 @@ typedef pte_t *pte_addr_t; -/* - * ZERO_PAGE is a global shared page that is always zero: used - * for zero-mapped memory areas etc.. - */ -#define ZERO_PAGE(vaddr) (virt_to_page(0)) - /* * Mark the prot value as uncacheable and unbufferable. */ diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 78a532068fec..ef48a55e9af8 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -10,6 +10,15 @@ #include #include +#ifndef __ASSEMBLY__ +/* + * ZERO_PAGE is a global shared page that is always zero: used + * for zero-mapped memory areas etc.. + */ +extern struct page *empty_zero_page; +#define ZERO_PAGE(vaddr) (empty_zero_page) +#endif + #ifndef CONFIG_MMU #include @@ -139,13 +148,6 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, */ #ifndef __ASSEMBLY__ -/* - * ZERO_PAGE is a global shared page that is always zero: used - * for zero-mapped memory areas etc.. - */ -extern struct page *empty_zero_page; -#define ZERO_PAGE(vaddr) (empty_zero_page) - extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index c42debaded95..c1494a4dee25 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c @@ -26,6 +26,13 @@ unsigned long vectors_base; +/* + * empty_zero_page is a special page that is used for + * zero-initialized data and COW. + */ +struct page *empty_zero_page; +EXPORT_SYMBOL(empty_zero_page); + #ifdef CONFIG_ARM_MPU struct mpu_rgn_info mpu_rgn_info; #endif @@ -148,9 +155,21 @@ void __init adjust_lowmem_bounds(void) */ void __init paging_init(const struct machine_desc *mdesc) { + void *zero_page; + early_trap_init((void *)vectors_base); mpu_setup(); + + /* allocate the zero page. */ + zero_page = memblock_alloc(PAGE_SIZE, PAGE_SIZE); + if (!zero_page) + panic("%s: Failed to allocate %lu bytes align=0x%lx\n", + __func__, PAGE_SIZE, PAGE_SIZE); + bootmem_init(); + + empty_zero_page = virt_to_page(zero_page); + flush_dcache_page(empty_zero_page); } /*