From patchwork Tue Jul 5 15:46:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 12906738 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 DAEDEC43334 for ; Tue, 5 Jul 2022 15:47:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7605B6B0071; Tue, 5 Jul 2022 11:47:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 70FFC6B0073; Tue, 5 Jul 2022 11:47:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FF0C6B0074; Tue, 5 Jul 2022 11:47:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 535CF6B0071 for ; Tue, 5 Jul 2022 11:47:27 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 19FA63462B for ; Tue, 5 Jul 2022 15:47:27 +0000 (UTC) X-FDA: 79653475734.29.2C19BED Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id 43D241A005E for ; Tue, 5 Jul 2022 15:47:26 +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 681E261B33; Tue, 5 Jul 2022 15:47:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C2BAC341C7; Tue, 5 Jul 2022 15:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657036044; bh=MAwV2W5idFBX6tA4mFmUeryIPp9vRIvaZ2oUFLz+ILg=; h=From:To:Cc:Subject:Date:From; b=VsoVBJwGEAVr7lyMU2UWLMiBj8A6/xWMBUP/ndaVU1MRaOkLlkP1nesTGcJb7AaC6 vI/AAaL038aGyT/D3Z/YOLMNoCzswsQyjskKn1ZqhlvTqQv0DOrWh0+a7AehLjsLdg YkHCdgBG9k6EcIYAMvNo9G4kuBUl9uc2x3+Y5SO5Y3Tr3Efh4BsLBrivMEwEe8UQEH LUA8aEdRw50wbnpP4ZfBnjJAiD97Ylep61jPYtfkaQCsIbmvDLHXO/EeHvslosxVGj reQJoxTxZFSGWTw/3KGLMQTo0noo1LFG6mnk+W3wclGNxxJq4w5epT2UogqZW+cU8f PgmAYjFGAMM9A== 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 , "Russell King (Oracle)" , 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 v2 00/15] arch: make PxD_ORDER generically available Date: Tue, 5 Jul 2022 18:46:53 +0300 Message-Id: <20220705154708.181258-1-rppt@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657036046; 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=sZ3KeBMlXVcEWM/ZInr3/xIzsSAFD4ZHiqjeDO5g6sM=; b=IpHW9QVVPqgfUCVIJ/1XhLLrQRDCsG6ayECZL4J1MOqGoNIpaI1g+DBca+ykWaEOCEmBuG fjKeJVEehvKVsRT+grlTdiINJEnOiPWaLxG1st1yKxEW5hOECtilzeaq1E36F+865yyuSA WzNVOBcy6x0l3/iCh8SjDZ+X+T9b/Dg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657036046; a=rsa-sha256; cv=none; b=KCFCCZ8Ko/HfgkvnlsItK8pOfBqTeR/GbxppDjZmS2F/McVb/HJK83zBb81gons4Mipgsi dkQZHDJ58Y2sbVfHB7cQHJcjU0JPblG7xAAp4mW+xMFu/eFnSdylOX3vh8LggBQXszSOmg fUywKs0pN4QkLhSm1OlMBcT3DLREtZs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VsoVBJwG; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org X-Stat-Signature: 5dhoyjn4ot48ypi5h5d5ompu175giqyx X-Rspamd-Queue-Id: 43D241A005E X-Rspam-User: Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VsoVBJwG; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org X-Rspamd-Server: rspam06 X-HE-Tag: 1657036046-538361 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 v2 changes: * Drop extra blank line in arch/loongarch/kernel/asm-offsets.c (patch 12) * Add patch 15 that renames PMD_ORDER to PMD_ENTRY_ORDER in arch/arm/kernel/head.S v1: https://lore.kernel.org/all/20220703141203.147893-1-rppt@kernel.org v1 cover letter: 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 (14): 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 ARM: head.S: rename PMD_ORDER to PMD_ENTRY_ORDER arch/arm/kernel/head.S | 34 ++++++++-------- 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 | 6 --- 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 - 22 files changed, 101 insertions(+), 130 deletions(-) base-commit: 03c765b0e3b4cb5063276b086c76f7a612856a9a