From patchwork Sun Jul 3 14:11:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 12904353 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60329C43334 for ; Sun, 3 Jul 2022 14:12:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F133E8E0001; Sun, 3 Jul 2022 10:12:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EC2826B0073; Sun, 3 Jul 2022 10:12:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DB1AD8E0001; Sun, 3 Jul 2022 10:12:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id CC8D46B0072 for ; Sun, 3 Jul 2022 10:12:22 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 933FA352C9 for ; Sun, 3 Jul 2022 14:12:22 +0000 (UTC) X-FDA: 79645978524.01.0484F5B Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id E883E100065 for ; Sun, 3 Jul 2022 14:12:21 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EB81260CBA; Sun, 3 Jul 2022 14:12:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01306C341C6; Sun, 3 Jul 2022 14:12:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656857540; bh=2fK2Mo95TrQ9YyvETTkhsR/j4qd6wNxp5Cu4kSAA7jw=; h=From:To:Cc:Subject:Date:From; b=Dk0D1nBvfXpeECpi/rc7AbSXNvOSYMh3QZABip646bL8INt4bVSWQ6WbjmgIJmjQN lv26uSYVMuoOBhc5ntut4CgaUZScUPsk00OGR28shXprMLlcbL9AhdAMc+bRI5A8RP h6u2fWCjyUxO+qS3bQ2bjnHCMYhhIFHJJmeczlw2vyahAIKe9e7oNHzotLvBJ6twDI MRSPwcb1/wKgJYtkMCHgzbytpKqE6AUzXHzhDDr9EtoTSdv3BB/tuj5DwBn43Ztem4 Dzdpzu9OU8FbK69qhfKwC1BXFEs5O8lOs/EC/Hes9GkcQjZTD0P1tnVmUQIST45NC5 rEs1Ev3mMCPlQ== From: Mike Rapoport To: Andrew Morton Cc: Arnd Bergmann , Dinh Nguyen , Guo Ren , Helge Deller , Huacai Chen , "James E.J. Bottomley" , Matthew Wilcox , Max Filippov , Mike Rapoport , Mike Rapoport , Thomas Bogendoerfer , WANG Xuerui , linux-arch@vger.kernel.org, linux-csky@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linux-xtensa@linux-xtensa.org, loongarch@lists.linux.dev Subject: [PATCH 00/14] arch: make PxD_ORDER generically available Date: Sun, 3 Jul 2022 17:11:49 +0300 Message-Id: <20220703141203.147893-1-rppt@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656857542; a=rsa-sha256; cv=none; b=1kIDcXhvBHbaT3aMXf40Djniq6qZewgivg1eKdjKgsdgwlxqIGfon8OGwvA7lasylM+Wd8 213eDt4CaRNm+SG+IA5IShjbjpukJ4f0wJZQ8hDcrGOh0OhlLUQeWGO2z3kL1BOeCy2WGm hr+UB8xUe8z8Aa9D+nm++GahxAFsbfQ= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Dk0D1nBv; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf05.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656857542; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=b6Q9zS0AEhzExBJWnMzbOhVdmatiD+9cs75uuiw3h2o=; b=gltIj/C8z4wl9nmfScWkdBCkoX+mkMD+ZzcfVwohSkZbGCjl7zXPF2c0ksIwBMiEqFwq6G AGe28vweW0BGeQRk8H6njo6+klrlTcriQc4kCL5B09XGpN3dJH3RcMM4y16v+4L5MI3uRA aa3/SfXZOp4fDv281+YRHFkTLFgrFFE= X-Rspamd-Queue-Id: E883E100065 X-Rspam-User: Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Dk0D1nBv; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf05.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org X-Rspamd-Server: rspam02 X-Stat-Signature: uysyzaxfemy6qwr47siwwjg87hiho7di X-HE-Tag: 1656857541-302689 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Mike Rapoport Hi, The question what does PxD_ORDER define raises from time to time and there is still a conflict between MIPS and DAX definitions. Some time ago Matthew Wilcox suggested to use PMD_TABLE_ORDER to define the order of page table allocation: [1] https://lore.kernel.org/linux-arch/YPCJftSTUBEnq2lI@casper.infradead.org/ The parisc patch made it in, but mips didn't. Now mips defines from asm/include/pgtable.h were copied to loongarch which made it worse. Let's deal with it once and for all and rename PxD_ORDER defines to PxD_TABLE_ORDER or just drop them when the only possible order of page table is 0. I think the best way to merge this via mm tree with acks from arch maintainers. Matthew Wilcox (Oracle) (1): mips: Rename PMD_ORDER to PMD_TABLE_ORDER Mike Rapoport (13): csky: drop definition of PTE_ORDER csky: drop definition of PGD_ORDER mips: Rename PUD_ORDER to PUD_TABLE_ORDER mips: drop definitions of PTE_ORDER mips: Rename PGD_ORDER to PGD_TABLE_ORDER nios2: drop definition of PTE_ORDER nios2: drop definition of PGD_ORDER loongarch: drop definition of PTE_ORDER loongarch: drop definition of PMD_ORDER loongarch: drop definition of PUD_ORDER loongarch: drop definition of PGD_ORDER parisc: Rename PGD_ORDER to PGD_TABLE_ORDER xtensa: drop definition of PGD_ORDER arch/csky/include/asm/pgalloc.h | 2 +- arch/csky/include/asm/pgtable.h | 6 +-- arch/loongarch/include/asm/pgalloc.h | 6 +-- arch/loongarch/include/asm/pgtable.h | 27 +++++------- arch/loongarch/kernel/asm-offsets.c | 5 --- arch/loongarch/mm/pgtable.c | 2 +- arch/loongarch/mm/tlbex.S | 6 +-- arch/mips/include/asm/pgalloc.h | 8 ++-- arch/mips/include/asm/pgtable-32.h | 19 ++++----- arch/mips/include/asm/pgtable-64.h | 61 +++++++++++++--------------- arch/mips/kernel/asm-offsets.c | 5 --- arch/mips/kvm/mmu.c | 2 +- arch/mips/mm/pgtable.c | 2 +- arch/mips/mm/tlbex.c | 14 +++---- arch/nios2/include/asm/pgtable.h | 7 +--- arch/nios2/mm/init.c | 5 +-- arch/nios2/mm/pgtable.c | 2 +- arch/parisc/include/asm/pgalloc.h | 6 +-- arch/parisc/include/asm/pgtable.h | 8 ++-- arch/xtensa/include/asm/pgalloc.h | 2 +- arch/xtensa/include/asm/pgtable.h | 1 - 21 files changed, 84 insertions(+), 112 deletions(-) base-commit: 03c765b0e3b4cb5063276b086c76f7a612856a9a Acked-by: Helge Deller # parisc Acked-by: Huacai Chen # LoongArch Acked-by: Guo Ren