From patchwork Thu Feb 29 08:42:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13576869 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 61284C48BF6 for ; Thu, 29 Feb 2024 08:43:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C84E56B00A5; Thu, 29 Feb 2024 03:43:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C34D06B00A6; Thu, 29 Feb 2024 03:43:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B23686B00A7; Thu, 29 Feb 2024 03:43:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A47696B00A5 for ; Thu, 29 Feb 2024 03:43:14 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7C13341278 for ; Thu, 29 Feb 2024 08:43:14 +0000 (UTC) X-FDA: 81844201908.12.0874E48 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id E4D9D14000E for ; Thu, 29 Feb 2024 08:43:12 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fEf8c0H5; spf=pass (imf09.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709196193; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=V2zDOtq/zMs9EWQrhRs/fjSpny2ZJnGnEwNBTlsPnCA=; b=vhcxAhlBfHRl4TObiyejiYOxbbtOUZK+YQ8YDcNMeZwOtYeyL4oGyfLF8xZQPu+iWTMula lGClAECdWLIUpvEmykJsp601u5obwCT4nQ6eOY4TWxO8DnK/OvzmG5NNcImzXz30ExgAem vTHgjbH1uxz3OpiVgpDUx4vH8xBoYy4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709196193; a=rsa-sha256; cv=none; b=hGU7QMQSWfuCtIB9WbFXgvaAdn8Gy1fp1LzaQYN1DrkvQosIwdAn/28Rj8TMhIAtdLyp/2 J30pr2k9vKWFdika1YXybI7DquVgGSrl4jyh1y/VbQiZFLOh9rGsI/6O4REN2Au7J553DD huCnbIkivlGrnfHhTYcnL3ZhVoVf7zo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fEf8c0H5; spf=pass (imf09.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709196192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2zDOtq/zMs9EWQrhRs/fjSpny2ZJnGnEwNBTlsPnCA=; b=fEf8c0H5xbzFe+Bs5SIgFETVM3QZdygWLo/T7OyDR2lapA5VpXyxdjBW9efLVXSR80q3M/ /KBRV+lKOuYriFHR5t4th/t9aiadpb6+HJStsZDkoXQ2Sc/XLEBdDPZkiKpkn6DmAIUkM6 Vf5XZ+dKBx3GM8kvHm3voMvMQfkzTPM= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-258-WTxOHKzPMra3bRoOtE4B5g-1; Thu, 29 Feb 2024 03:43:07 -0500 X-MC-Unique: WTxOHKzPMra3bRoOtE4B5g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A97DD2932483; Thu, 29 Feb 2024 08:43:06 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A4B028D; Thu, 29 Feb 2024 08:43:00 +0000 (UTC) From: peterx@redhat.com To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org, Yang Shi , "Kirill A . Shutemov" , Jason Gunthorpe , peterx@redhat.com, Muchun Song , Andrew Morton , x86@kernel.org Subject: [PATCH v2 0/7] mm/treewide: Replace pXd_large() with pXd_leaf() Date: Thu, 29 Feb 2024 16:42:51 +0800 Message-ID: <20240229084258.599774-1-peterx@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Rspamd-Queue-Id: E4D9D14000E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: zs7b5gypeogccg9r1tbimnkco4r9km5e X-HE-Tag: 1709196192-898382 X-HE-Meta: U2FsdGVkX19AtLQ0arOkYnKuASC6QIJ7vPKdRE18lNJ/zh7qM4XfO9WyJXE5Ry4hO59auaFfqSv17DvklFYUfC6TUvk5msebLPyuRF4QM4LJ744xBOa1m7HjVnNtQV0zgfAONE2lWuwlaINNJVMwAyce1pIRrP8O2ysB0lmyUJ4dU9JdOpj1D6s3BblFW6WjIDXXutYnSzn/SCmUG7Dbq2BgVahFxAnWmKN8VtPRcFGVXck1qmGQHXKKMAU8j47vmUE9V6YoOOwLJFtJTsLxZIInRcpnmCTMZNyTVi1qcS5qbPbltUXRaYpOd0gC5yxNfXkcRqY2wPvgqbXOs3K7ryPgz4tcDoC2/LaOhn8aE+fR8iKOUPd6cODcJ21HZeWkPgz5koFH8RYI6ykyUWHf5YUnICvPsYqb4FebfvwnxcxoWwQV07LO7VDCMWrUfwG2/Dv3bs36s3j22t92IcMYigRsyLeLCWciPv1T+v5okxfjTy2HgGTOYaPqTJ2efwzKf/0lha8tkDnkN5flKsTkXZX9J0kizprQuBNRvfBKDGn7hmiYJHunX6NuRzDR7IC6urs1tkfXij8oB7SWixcA51c6Z3m4th1+HzFR+/3HNJ560jgrqKdi1rXUF5AnGFyb32pxo+qRf/ZRVcKsSjJN7mBFF/1Mh50dOg+VoZNR5EeBfl1Mxya99/bHts+ZhOBFZWOzJf9HSYNqiR0vqNgnwr3bWCI57eNxQfzNrC6WNXx6CKHs/k9tczk5zxJAvnBRoWEkDDQhcA22J9UUasU6Hc2IyJicZ5LVadyA1vNwarxuvQ9jhZg3LRyxhuAQbAYdhfsbCSX8SXMFWtN0kUijNeyQh7qjkEkB1vqRyD+H49dXKCJrp6EZDvUpNWR0UBJzVcFlg20ClOO+hEgL5ECDMA== 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: List-Subscribe: List-Unsubscribe: From: Peter Xu [based on latest akpm/mm-unstable, commit 1274e7646240] v2: - Added patch "mm/ppc: Replace pXd_is_leaf() with pXd_leaf()" [Christophe] - Added patch "mm/x86: Drop two unnecessary pud_leaf() definitions" [syzbot] - Touched up two more comments which also referenced pmd_large() These two APIs are mostly always the same. It's confusing to have both of them. Merge them into one. Here I used pXd_leaf() only because pXd_leaf() is a global API which is always defined, while pXd_large() is not. We have yet one more API that is similar which is pXd_huge(), but that's even trickier, so let's do it step by step. Some special cares are taken for ppc and x86, they're done as separate cleanups first. Only lightly tested on x86. Please have a look, thanks. Peter Xu (7): mm/ppc: Define pXd_large() with pXd_leaf() mm/ppc: Replace pXd_is_leaf() with pXd_leaf() mm/x86: Replace p4d_large() with p4d_leaf() mm/x86: Drop two unnecessary pud_leaf() definitions mm/treewide: Replace pmd_large() with pmd_leaf() mm/treewide: Replace pud_large() with pud_leaf() mm/treewide: Drop pXd_large() arch/arm/include/asm/pgtable-2level.h | 1 - arch/arm/include/asm/pgtable-3level.h | 1 - arch/arm/mm/dump.c | 4 +-- arch/powerpc/include/asm/book3s/64/pgtable.h | 26 ++++-------------- arch/powerpc/include/asm/pgtable.h | 28 -------------------- arch/powerpc/kvm/book3s_64_mmu_radix.c | 12 ++++----- arch/powerpc/mm/book3s64/pgtable.c | 4 +-- arch/powerpc/mm/book3s64/radix_pgtable.c | 16 +++++------ arch/powerpc/mm/pgtable.c | 6 ++--- arch/powerpc/mm/pgtable_64.c | 8 +++--- arch/powerpc/xmon/xmon.c | 6 ++--- arch/s390/boot/vmem.c | 4 +-- arch/s390/include/asm/pgtable.h | 20 +++++++------- arch/s390/mm/gmap.c | 14 +++++----- arch/s390/mm/hugetlbpage.c | 6 ++--- arch/s390/mm/pageattr.c | 4 +-- arch/s390/mm/pgtable.c | 8 +++--- arch/s390/mm/vmem.c | 12 ++++----- arch/sparc/include/asm/pgtable_64.h | 8 +++--- arch/sparc/mm/init_64.c | 6 ++--- arch/x86/boot/compressed/ident_map_64.c | 2 +- arch/x86/include/asm/pgtable.h | 20 +++++--------- arch/x86/kvm/mmu/mmu.c | 4 +-- arch/x86/mm/fault.c | 16 +++++------ arch/x86/mm/ident_map.c | 2 +- arch/x86/mm/init_32.c | 2 +- arch/x86/mm/init_64.c | 14 +++++----- arch/x86/mm/kasan_init_64.c | 4 +-- arch/x86/mm/mem_encrypt_identity.c | 6 ++--- arch/x86/mm/pat/set_memory.c | 14 +++++----- arch/x86/mm/pgtable.c | 4 +-- arch/x86/mm/pti.c | 8 +++--- arch/x86/power/hibernate.c | 6 ++--- arch/x86/xen/mmu_pv.c | 10 +++---- drivers/misc/sgi-gru/grufault.c | 2 +- include/asm-generic/pgtable-nopmd.h | 1 - 36 files changed, 128 insertions(+), 181 deletions(-)