Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp430388ybx; Mon, 4 Nov 2019 23:16:50 -0800 (PST) X-Google-Smtp-Source: APXvYqybu/PO873SA2YlFxKnjRWA1NrqqyOqRrP34d4cs/T+h/gx/QWtLWFtZd4Fr2xHjQ0Yf1uM X-Received: by 2002:a17:906:1a47:: with SMTP id j7mr17934087ejf.232.1572938210567; Mon, 04 Nov 2019 23:16:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572938210; cv=none; d=google.com; s=arc-20160816; b=QW1fKtkiwllS4P/yJdOL09LA3FM3sJ/Bb4YY9BQpxJrhoVX45j1sAQU0AZyRw+cMyH bRQE/9Flk1s6zrUgbUL7uKHNESLlOUiB/tIxQh41wcvjgf6KOLF2jbXugtdUrncgjIon prX9aXj+OKHSdSfDxzfoAio+NtLhm8jk9cY8y+1zNhhOeYb4auZfyPqdb1VsdQ/WNk4a n7Daq7eXO7suhMi3h4btr6yYuUS5VFNzNoaebgKMyXuMMq8HH9mSsgnmyVeiuSK7tltr x/opqfQdEWH6IiwRzwB/P1cV/WZPbXb9cMMWbVGxQ8PdJFUjgHlrvnt3FKCzFfHZCawe GnHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=vJHnHTuuypQw4/cg868/0/geXeDRKlyVEQ87Y9Oy90c=; b=tsN9N01vDEDjetjwMdkwmTqSoyK1OWqemJzj3TYDPjv5kmOhrIkno7aDO31UmUhaoi +OHVh2QQa0qQAlKGIt0Vs70TzpFjvJYs2oAXUII+YL0yz5v9QV/gaax1Sxx2iDAiZD6k i+vgTLWezvdbB83I/5jELpCRvhs7HuzWWlyh1H6CpezZRGDAvWjOsi3/bD11tzYeXGQN pKOr548yl0SK7KPt8QEncNfUosm0Wim8H2pmUie9b2PixLZXL1KouftYRdEJw9KUMQcK kLUOq0vpL34ukc0iUPIRvORbrZBLZLpYgvVO/xtubemadZ//d1r7SpswCksIpMDoBN80 1FeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=e8CnLOFF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q40si9509867eda.218.2019.11.04.23.16.26; Mon, 04 Nov 2019 23:16:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=e8CnLOFF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387702AbfKEHPv (ORCPT + 99 others); Tue, 5 Nov 2019 02:15:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:34332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387442AbfKEHPv (ORCPT ); Tue, 5 Nov 2019 02:15:51 -0500 Received: from aquarius.haifa.ibm.com (nesher1.haifa.il.ibm.com [195.110.40.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 376E820663; Tue, 5 Nov 2019 07:15:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572938149; bh=kjNCQHuIO20IAKAWjmpzSoXh0rbx0a5UW2oa2LBkQmM=; h=From:To:Cc:Subject:Date:From; b=e8CnLOFFAk03scBwXT2glhNQqZljnzKpdDdV9ssLH4vgZwUfT7sZlsQa0jZMc56FG hU/h/q0Zcr6pcZ40FngsJHQtvgJijqR5HEkxJc+40V8Vuj3up2Q03COp7V+pPOallg fILpyL0bn+D110+yGHv3uHDLybDa4PupJWXc/fN8= From: Mike Rapoport To: linux-mm@kvack.org Cc: Andrew Morton , Anton Ivanov , Arnd Bergmann , "David S. Miller" , Geert Uytterhoeven , Greentime Hu , Greg Ungerer , Helge Deller , "James E.J. Bottomley" , Jeff Dike , "Kirill A. Shutemov" , Linus Torvalds , Mark Salter , Matt Turner , Michal Simek , Peter Rosin , Richard Weinberger , Rolf Eike Beer , Russell King , Sam Creasey , Vincent Chen , Vineet Gupta , Mike Rapoport , linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-parisc@vger.kernel.org, linux-um@lists.infradead.org, sparclinux@vger.kernel.org, Mike Rapoport Subject: [PATCH v4 00/13] mm: remove __ARCH_HAS_4LEVEL_HACK Date: Tue, 5 Nov 2019 09:15:22 +0200 Message-Id: <1572938135-31886-1-git-send-email-rppt@kernel.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Rapoport Hi, These patches convert several architectures to use page table folding and remove __ARCH_HAS_4LEVEL_HACK along with include/asm-generic/4level-fixup.h. For the nommu configurations the folding is already implemented by the generic code so the only change was to use the appropriate header file. As for the rest, the changes are mostly about mechanical replacement of pgd accessors with pud/pmd ones and the addition of higher levels to page table traversals. With Vineet's patches from "elide extraneous generated code for folded p4d/pud/pmd" series [1] there is a small shrink of the kernel size of about -0.01% for the defconfig builds. The set is boot-tested on UML, qemu-{alpha,sparc} and aranym. v4 changes: * m68k: fix sun3x_defconfig build and reorder ifdefs as per Geert's suggestion v3 changes: * alpha: fix changelog to use pgtable-nopud.h rather than pgtable-nop4d.h * um: remove dead-code that was intended as provisioning for 4-level page tables v2 changes: * m68k: fixed ifdefs around pmd_t defintion to work with nommu * parisc: added conversion of hugetlb (thanks, Helge!); lexical fixups in comments and changelog * collected acks [1] https://lore.kernel.org/lkml/20191016162400.14796-1-vgupta@synopsys.com Helge Deller (1): parisc/hugetlb: use pgtable-nopXd instead of 4level-fixup Mike Rapoport (12): alpha: use pgtable-nopud instead of 4level-fixup arm: nommu: use pgtable-nopud instead of 4level-fixup c6x: use pgtable-nopud instead of 4level-fixup m68k: nommu: use pgtable-nopud instead of 4level-fixup m68k: mm: use pgtable-nopXd instead of 4level-fixup microblaze: use pgtable-nopmd instead of 4level-fixup nds32: use pgtable-nopmd instead of 4level-fixup parisc: use pgtable-nopXd instead of 4level-fixup sparc32: use pgtable-nopud instead of 4level-fixup um: remove unused pxx_offset_proc() and addr_pte() functions um: add support for folded p4d page tables mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h arch/alpha/include/asm/mmzone.h | 1 - arch/alpha/include/asm/pgalloc.h | 4 +- arch/alpha/include/asm/pgtable.h | 24 ++++----- arch/alpha/mm/init.c | 12 +++-- arch/arm/include/asm/pgtable.h | 2 +- arch/c6x/include/asm/pgtable.h | 2 +- arch/m68k/include/asm/mcf_pgalloc.h | 7 --- arch/m68k/include/asm/mcf_pgtable.h | 28 ++++------- arch/m68k/include/asm/mmu_context.h | 12 ++++- arch/m68k/include/asm/motorola_pgalloc.h | 4 +- arch/m68k/include/asm/motorola_pgtable.h | 32 +++++++----- arch/m68k/include/asm/page.h | 9 ++-- arch/m68k/include/asm/pgtable_mm.h | 11 +++-- arch/m68k/include/asm/pgtable_no.h | 2 +- arch/m68k/include/asm/sun3_pgalloc.h | 5 -- arch/m68k/include/asm/sun3_pgtable.h | 18 ------- arch/m68k/kernel/sys_m68k.c | 10 +++- arch/m68k/mm/init.c | 6 ++- arch/m68k/mm/kmap.c | 39 +++++++++++---- arch/m68k/mm/mcfmmu.c | 16 +++++- arch/m68k/mm/motorola.c | 17 ++++--- arch/m68k/sun3x/dvma.c | 7 ++- arch/microblaze/include/asm/page.h | 3 -- arch/microblaze/include/asm/pgalloc.h | 16 ------ arch/microblaze/include/asm/pgtable.h | 32 +----------- arch/microblaze/kernel/signal.c | 10 ++-- arch/microblaze/mm/init.c | 7 ++- arch/microblaze/mm/pgtable.c | 13 ++++- arch/nds32/include/asm/page.h | 3 -- arch/nds32/include/asm/pgalloc.h | 3 -- arch/nds32/include/asm/pgtable.h | 12 +---- arch/nds32/include/asm/tlb.h | 1 - arch/nds32/kernel/pm.c | 4 +- arch/nds32/mm/fault.c | 16 ++++-- arch/nds32/mm/init.c | 11 +++-- arch/nds32/mm/mm-nds32.c | 6 ++- arch/nds32/mm/proc.c | 26 ++++++---- arch/parisc/include/asm/page.h | 30 ++++++----- arch/parisc/include/asm/pgalloc.h | 41 ++++++--------- arch/parisc/include/asm/pgtable.h | 52 ++++++++++--------- arch/parisc/include/asm/tlb.h | 2 + arch/parisc/kernel/cache.c | 13 +++-- arch/parisc/kernel/pci-dma.c | 9 +++- arch/parisc/mm/fixmap.c | 10 ++-- arch/parisc/mm/hugetlbpage.c | 18 ++++--- arch/sparc/include/asm/pgalloc_32.h | 6 +-- arch/sparc/include/asm/pgtable_32.h | 28 +++++------ arch/sparc/mm/fault_32.c | 11 ++++- arch/sparc/mm/highmem.c | 6 ++- arch/sparc/mm/io-unit.c | 6 ++- arch/sparc/mm/iommu.c | 6 ++- arch/sparc/mm/srmmu.c | 51 ++++++++++++++----- arch/um/include/asm/pgtable-2level.h | 1 - arch/um/include/asm/pgtable-3level.h | 1 - arch/um/include/asm/pgtable.h | 3 ++ arch/um/kernel/mem.c | 8 ++- arch/um/kernel/skas/mmu.c | 12 ++++- arch/um/kernel/skas/uaccess.c | 7 ++- arch/um/kernel/tlb.c | 85 +++++++++++++++++++------------- arch/um/kernel/trap.c | 4 +- include/asm-generic/4level-fixup.h | 40 --------------- include/asm-generic/tlb.h | 2 - include/linux/mm.h | 10 ++-- mm/memory.c | 8 --- 64 files changed, 483 insertions(+), 418 deletions(-) delete mode 100644 include/asm-generic/4level-fixup.h -- 2.7.4