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: 21137 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp256001dyb; Thu, 29 Feb 2024 00:43:40 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXOy8e/xrgm1+tTaWDpq1Zndqu5eOqxpSEF+iXVH6SX5Cul9nWuFfy/X9ktbgtb1/z3D0fWs98wdxlUOBMgYN7ec3oq/Q== X-Google-Smtp-Source: AGHT+IHw0h5tu2w5eAVFa/S/HjhbE4XZl8ppkL4zeTjVtpScFe0hqzyPN5lA4tvE6tVZRfWOrasO X-Received: by 2002:a05:6358:93a5:b0:17b:759:65c2 with SMTP id h37-20020a05635893a500b0017b075965c2mr1779155rwb.10.1709196219945; Thu, 29 Feb 2024 00:43:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709196219; cv=pass; d=google.com; s=arc-20160816; b=Be6BUbCZong6aRnxAgMWMpV/yADZ6ADcy+TmO3uhecQd91/pHgi8GaUizdgTiFTdGJ dTIXLwH1R19136+jD1B8Ft/Ws7nykTOnF+bO7fydJuAYNGDp1ENfeO2yao9J7ppFhLQA xAh/HLBLTKxapjul9r58Kb+4Yfy1iRR1XMxSSG6R7RugodcVxjsHDZ0oNMRiFGe/MmVb GQeU7yb2n74bM/+fpr4e4G76mAUqzpsineR584o7h3UX6VhrDMy4A/EEZ+hXTjjcTuCd 2WwteWy3hiyAnOdRFAHGlbtIBKWObUXLBNHQ0jIsHINKrrBWuiqNDXE4PaCq3E79Ax2/ N4mg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=V2zDOtq/zMs9EWQrhRs/fjSpny2ZJnGnEwNBTlsPnCA=; fh=staWlDk4zqblDXTfxJuR8XgUntq3xPgi8+0logwKFUg=; b=U/sZVrRtodUbQ2d59tWixFUCLYlICmWtlDDZZAqRSm/XoNpT2VpdXs2Klv5jkAJEfk Fg5Q+Pv6EbvPrGvD4jLRyzLgEOgSx3CWbty/a4Bo8p3Zi4JAnPfXvAPnstoVbsUmv3X0 vMzr2KIGHFCG62M0Y9RFPjAcinMTo8TbTVsYeSI2ZWiCPMhB0rFho7wjb5/NjiOTh1Sh 51DEXDVrvf+Y78s/lcESP7EV9MLr1DsinliaK5zJtRwtjweCsXBEX11vEwH3UbmreHdJ k0Bkman4omtw5EK+QQOk4kc4z7iNhDSwq2LBys+QCdT0KU4V3YSZSndflVGYNTnw6ofD xn/w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Sv/am9A2"; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-86325-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86325-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id w20-20020a63fb54000000b005dcc8a4590esi909328pgj.680.2024.02.29.00.43.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 00:43:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-86325-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Sv/am9A2"; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-86325-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-86325-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id B6F15283134 for ; Thu, 29 Feb 2024 08:43:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9BE34524BF; Thu, 29 Feb 2024 08:43:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Sv/am9A2" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F71F50A7E for ; Thu, 29 Feb 2024 08:43:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709196195; cv=none; b=Pv8z4kie/FbbGAFqfNeB4Uikt/yOO9Ftrf0RWocCS3LE+Lm9o2sPDVaSxbjFnxrp6d3d5x9N2//HqGrfIlDPY55Pf0oRtKdFB8Dpm8MlNsV7xmCVSINDn2Ur7GoT00QAiD2Zi2XDm0asofwLvf4e8Jo+qAZeqEtAj8BvExyT3Uo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709196195; c=relaxed/simple; bh=OpghRkYBRv5vOLqSsMEp9J7irwZMGw99BVcLsJuz6Qc=; h=From:To:Cc:Subject:Date:Message-ID:Content-Type:MIME-Version; b=kJOmASpikvfYh9Nr9+DrNfddpoySig5uidkb1nb40lQeVTBS1O4aMYvUdM8RGQheTsN/3/MTH5MnG/hrbclr9x8/vo16rJqeadQIiHwImtnpA9eVBz4MOu+FJPkDyWze0OI7vpr2+uyOQE5AdrAN9Te2VoQyIO0ywHi2a4hZoBE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Sv/am9A2; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709196193; 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=Sv/am9A2IoqTIIAemQ6JZH2K424RO6Qq3BcL14+bbSnZWZAV74JRGZolOs9TfCqom5Xclk BaORXCvm0Q+TwbPuN+lPnERdi9Wy5eAyo2kgxT7Y2zz2l99fVDXaSTiH/x0cOmpoXrKj2K a2Q63BBpLojbxc+TiSTNqfPVx1k4G1Q= 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792222135439987560 X-GMAIL-MSGID: 1792222135439987560 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(-)