From mboxrd@z Thu Jan 1 00:00:00 1970 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 21C55C5475B for ; Wed, 6 Mar 2024 06:24:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 892936B007E; Wed, 6 Mar 2024 01:24:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8422C6B0080; Wed, 6 Mar 2024 01:24:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 731DA6B0081; Wed, 6 Mar 2024 01:24:05 -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 645C36B007E for ; Wed, 6 Mar 2024 01:24:05 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 18E1A8099A for ; Wed, 6 Mar 2024 06:24:05 +0000 (UTC) X-FDA: 81865624050.11.55A8735 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf07.hostedemail.com (Postfix) with ESMTP id 93EF840008 for ; Wed, 6 Mar 2024 06:24:02 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=pRd4hIXl; spf=pass (imf07.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709706242; a=rsa-sha256; cv=none; b=TWkdDD06A7yubKGcOv/XDmN/ALN+QiX+an1ep5EUs0L2KySGSXwj+MhcXgEHEtFfqpezJR RoG24BuJKOf0zL+WHv4Gsnd8KzBMOGRSDxQgwE4y95bMYcHK+U98xzQmbzmbBda7Rm7ZPC Y1C6tfLonQXqxSVceoipt7ijWWzROkY= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=pRd4hIXl; spf=pass (imf07.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709706242; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZoPkfQJxDp+I7cbnzwuzoMP4yBR3cMRT0wNNUZUruCg=; b=CCJg2kKD8flM75Tp4LjtWZcQLdd5eM3qYi7RrzlNroxhIvykOJIjBTSLbCDERjT7uo/kpl 3Nf75/5T8RSvHFjxOFBaYHEclZZ4QVUBN5PsIUMW4FIBnmjxx5MfNo0yVPvgnkRSJMGgAJ hs8fCUE+IsvzdKx0DfpQ9pOqKwrHOys= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 9EFCE60DDB; Wed, 6 Mar 2024 06:24:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBDBFC433F1; Wed, 6 Mar 2024 06:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709706241; bh=RjcUrgFFbqLCRk4mp6+71yebhvFupXWUxXPN5bFeYEc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pRd4hIXllVAPYIPtLMMzSPf8ff00qQuCW3SfaXOqUD0RmE00JMLNSCefhf3qCvS9v iXMTwezrqdF2Tw+jmSQKGpvH1i9g7BiXu4hyp4wP3wQw6YXLVNaLlJFM+uDQrLxfyy T1N4heGZOJDB27E6vlPsuikUAkdiVw9moQBOtLTrMdFi81r0nhUnKBTY8qG7s7wliY LNkxN5O7d3nRQmYKmioxKmovfm6U0oHWVkiC7hmL932YDpmqBag/ql4uC2HZMGO41l mmdIfdeSfKu1GzqJ3iHFseO7h9d3L5EOC9eRpw9xyGk0RkcXaJW1hfE5iGA+BtdoXg i4VKBk+Je/NYw== Date: Wed, 6 Mar 2024 08:23:07 +0200 From: Mike Rapoport To: peterx@redhat.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christophe Leroy , x86@kernel.org, "Kirill A . Shutemov" , Jason Gunthorpe , Yang Shi , Andrew Morton , linuxppc-dev@lists.ozlabs.org, Muchun Song , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen Subject: Re: [PATCH v3 03/10] mm/x86: Replace p4d_large() with p4d_leaf() Message-ID: References: <20240305043750.93762-1-peterx@redhat.com> <20240305043750.93762-4-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240305043750.93762-4-peterx@redhat.com> X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 93EF840008 X-Stat-Signature: uh7kcfmxz3359umbjmox79ycxa37omaz X-Rspam-User: X-HE-Tag: 1709706242-806383 X-HE-Meta: U2FsdGVkX18OPEdZMU4BJvHBcewLMsIhrQin4Qx4AUoFZinpAr41A3Bs/ozArNtUIPVkPuPFewQ2FMRQFeHmrONosm4nlKN5VVDWJ0EzHLG4DfgmBvsCEPk6j5PQYijN6bsE6b/WlCeUNLzNQO1tPfE4ytIBcNYRMQV01n4n8lpMn/CfrRUt0jrvfDDqgGsix9bbrjrKn8VtyyPcsouvAl60Xghc++lz32ITL01DSuD1DJ88RuKTKqS9+sllKQNdbgsn0PfiJf1Jq64CGqytFkMR45ytoG/wsQLx9qpUQk4oWneXJ9u7SpuMLnTexx6yodzq0jQET3EJeSMk6ggcO3TCbZ1N6pmOC2cV3OTiLz87HcSYs4hECugBAQ+94TqdWdMp3nOmgdPXWzSl2SaDwqSJ6U2Wz++CuQuYNNd3hrkn4U2mD9S1haEMZlNNSv3R+LCP7ayoNgEQ69qOTfxTWnLLKUCU/RWlVSeldVLGRyRxHERCGv+Fx048HpT/sTdi4ZjNz/bNAlVX3pBjwOlleOC5EEpksMuRyPSCWPzwlbAkRxHbISEL86Rra48hXnyHaJR7auQkNKfRKM1yIopHeXn8sGknJ986YhgUSQVtHTyZIM7+TLRcfzNMRMLqhxJj/G13/kQvS0eFOHLqFI6GqvQkls2j1FII2obQQSNezOXmsZB3VX4k3+/1yYacU4SR2fE+UJOU0lXF7yo0m4UgjPIg/uilOv5ruEC02NegDw4zz9OgoleVxzIzGSSXL72+PyIyVIDpaE5akTtZHR04IWjJIdRUX+Sal1wOpWGgAUbuIY11sbhHU/tQvzvMMPS5LPXFKHRrpnLnWnDHj4IcLxiOD7Hz7j/K+Ya/CdCXtOntsQDhA2J7Cs6NMhuVV/Umpis0Zm0Ilg/vu+Fi2cNHkBK2qqgHXA7ieDsVATEVLZDNgJWF8X+y4DENpc2EMumS 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: On Tue, Mar 05, 2024 at 12:37:43PM +0800, peterx@redhat.com wrote: > From: Peter Xu > > p4d_large() is always defined as p4d_leaf(). Merge their usages. Chose > p4d_leaf() because p4d_leaf() is a global API, while p4d_large() is not. > > Only x86 has p4d_leaf() defined as of now. So it also means after this > patch we removed all p4d_large() usages. > > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: Borislav Petkov > Cc: Dave Hansen > Cc: x86@kernel.org > Reviewed-by: Jason Gunthorpe > Signed-off-by: Peter Xu Reviewed-by: Mike Rapoport (IBM) > --- > arch/x86/mm/fault.c | 4 ++-- > arch/x86/mm/init_64.c | 2 +- > arch/x86/mm/pat/set_memory.c | 4 ++-- > arch/x86/mm/pti.c | 2 +- > arch/x86/power/hibernate.c | 2 +- > arch/x86/xen/mmu_pv.c | 2 +- > 6 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c > index 679b09cfe241..8b69ce3f4115 100644 > --- a/arch/x86/mm/fault.c > +++ b/arch/x86/mm/fault.c > @@ -368,7 +368,7 @@ static void dump_pagetable(unsigned long address) > goto bad; > > pr_cont("P4D %lx ", p4d_val(*p4d)); > - if (!p4d_present(*p4d) || p4d_large(*p4d)) > + if (!p4d_present(*p4d) || p4d_leaf(*p4d)) > goto out; > > pud = pud_offset(p4d, address); > @@ -1039,7 +1039,7 @@ spurious_kernel_fault(unsigned long error_code, unsigned long address) > if (!p4d_present(*p4d)) > return 0; > > - if (p4d_large(*p4d)) > + if (p4d_leaf(*p4d)) > return spurious_kernel_fault_check(error_code, (pte_t *) p4d); > > pud = pud_offset(p4d, address); > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index ebdbcae48011..d691e7992a9a 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -1197,7 +1197,7 @@ remove_p4d_table(p4d_t *p4d_start, unsigned long addr, unsigned long end, > if (!p4d_present(*p4d)) > continue; > > - BUILD_BUG_ON(p4d_large(*p4d)); > + BUILD_BUG_ON(p4d_leaf(*p4d)); > > pud_base = pud_offset(p4d, 0); > remove_pud_table(pud_base, addr, next, altmap, direct); > diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c > index e9b448d1b1b7..5359a9c88099 100644 > --- a/arch/x86/mm/pat/set_memory.c > +++ b/arch/x86/mm/pat/set_memory.c > @@ -676,7 +676,7 @@ pte_t *lookup_address_in_pgd(pgd_t *pgd, unsigned long address, > return NULL; > > *level = PG_LEVEL_512G; > - if (p4d_large(*p4d) || !p4d_present(*p4d)) > + if (p4d_leaf(*p4d) || !p4d_present(*p4d)) > return (pte_t *)p4d; > > pud = pud_offset(p4d, address); > @@ -739,7 +739,7 @@ pmd_t *lookup_pmd_address(unsigned long address) > return NULL; > > p4d = p4d_offset(pgd, address); > - if (p4d_none(*p4d) || p4d_large(*p4d) || !p4d_present(*p4d)) > + if (p4d_none(*p4d) || p4d_leaf(*p4d) || !p4d_present(*p4d)) > return NULL; > > pud = pud_offset(p4d, address); > diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c > index 669ba1c345b3..dc0a81f5f60e 100644 > --- a/arch/x86/mm/pti.c > +++ b/arch/x86/mm/pti.c > @@ -206,7 +206,7 @@ static pmd_t *pti_user_pagetable_walk_pmd(unsigned long address) > if (!p4d) > return NULL; > > - BUILD_BUG_ON(p4d_large(*p4d) != 0); > + BUILD_BUG_ON(p4d_leaf(*p4d) != 0); > if (p4d_none(*p4d)) { > unsigned long new_pud_page = __get_free_page(gfp); > if (WARN_ON_ONCE(!new_pud_page)) > diff --git a/arch/x86/power/hibernate.c b/arch/x86/power/hibernate.c > index 6f955eb1e163..28153789f873 100644 > --- a/arch/x86/power/hibernate.c > +++ b/arch/x86/power/hibernate.c > @@ -165,7 +165,7 @@ int relocate_restore_code(void) > pgd = (pgd_t *)__va(read_cr3_pa()) + > pgd_index(relocated_restore_code); > p4d = p4d_offset(pgd, relocated_restore_code); > - if (p4d_large(*p4d)) { > + if (p4d_leaf(*p4d)) { > set_p4d(p4d, __p4d(p4d_val(*p4d) & ~_PAGE_NX)); > goto out; > } > diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c > index e21974f2cf2d..12a43a4abebf 100644 > --- a/arch/x86/xen/mmu_pv.c > +++ b/arch/x86/xen/mmu_pv.c > @@ -1104,7 +1104,7 @@ static void __init xen_cleanmfnmap_p4d(p4d_t *p4d, bool unpin) > pud_t *pud_tbl; > int i; > > - if (p4d_large(*p4d)) { > + if (p4d_leaf(*p4d)) { > pa = p4d_val(*p4d) & PHYSICAL_PAGE_MASK; > xen_free_ro_pages(pa, P4D_SIZE); > return; > -- > 2.44.0 > > -- Sincerely yours, Mike.