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 ABC38C35FF1 for ; Thu, 13 Mar 2025 22:14:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F3F4280003; Thu, 13 Mar 2025 18:14:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A438280001; Thu, 13 Mar 2025 18:14:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76C5D280003; Thu, 13 Mar 2025 18:14:41 -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 56388280001 for ; Thu, 13 Mar 2025 18:14:41 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6A7FB8036D for ; Thu, 13 Mar 2025 22:14:42 +0000 (UTC) X-FDA: 83217933204.21.DB5E601 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) by imf10.hostedemail.com (Postfix) with ESMTP id B7C11C0007 for ; Thu, 13 Mar 2025 22:14:40 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=xFmDbVvP; spf=pass (imf10.hostedemail.com: domain of yosry.ahmed@linux.dev designates 91.218.175.172 as permitted sender) smtp.mailfrom=yosry.ahmed@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741904080; 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=Npr/cUIIYWR/85K080G5nKt+OjIIIOTfx94wcR18LVc=; b=SZToRpcD/E2F7+7ze0+jZEUeeNHeXRwJPGcFv3h/MTN3rihepcwB9/ckXbZw71WvmUelnc ozgxMRieKIc4cXGJ7qKy61nS2JK0o+2w/7iYJQoynHQazmColWhoRNPXwiggdgIsu4mQsV uhQ0QGPjvmgZ8odVS8lgzg8+bKf4gTE= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=xFmDbVvP; spf=pass (imf10.hostedemail.com: domain of yosry.ahmed@linux.dev designates 91.218.175.172 as permitted sender) smtp.mailfrom=yosry.ahmed@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741904080; a=rsa-sha256; cv=none; b=3ars74J0jXwkvwKFPaVpqQWjkTQwK1qu0HEmbjHur8a8txlQfSu4dmyoT2ejxYZAFcDyv2 e7Xk/VUlWQ3OyYjRdveYOxfUJHhUrsxMGRr/TfhtJJI7oqKbo/Hbf61QSeKyKK612+dMvX sRqtN+Om+Cs0l8kP7uEcKYjygqDtwR4= Date: Thu, 13 Mar 2025 22:14:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1741904078; 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: in-reply-to:in-reply-to:references:references; bh=Npr/cUIIYWR/85K080G5nKt+OjIIIOTfx94wcR18LVc=; b=xFmDbVvPphctBosBzvM979mTso0RgFOaEA3DyTg65gQd1tE4NIULTMn8RFTdqlaY2eWCkB BPQg0g7SeQR/KxY4IAb5EW6pfpG0G7ccdbtR0GCTbLbvo+WfU70moz+3Brg7xUZNTnLMl8 z/u3gTifoalhWTJ/rLHfOycqaLv4XU8= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Yosry Ahmed To: Brendan Jackman Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Andrew Morton , David Rientjes , Vlastimil Babka , David Hildenbrand , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Mike Rapoport , Junaid Shahid , Reiji Watanabe , Patrick Bellasi Subject: Re: [PATCH RFC 02/11] x86/mm: Factor out phys_pgd_init() Message-ID: References: <20250313-asi-page-alloc-v1-0-04972e046cea@google.com> <20250313-asi-page-alloc-v1-2-04972e046cea@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250313-asi-page-alloc-v1-2-04972e046cea@google.com> X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Queue-Id: B7C11C0007 X-Rspamd-Server: rspam03 X-Stat-Signature: ewt37pzcgmqq4bj5ibrcbkqs1ppj3u9z X-HE-Tag: 1741904080-552 X-HE-Meta: U2FsdGVkX1//2exJ84nHjJifcUeQ8065I296L7ssWJ2sI4LQCoKAJ/mAsqS4CnmYeqFygiWx0EEqtEORolcSbRb6cn3dxQgfqtpHumOzCrqX5wgP/9jbzlTwfxADQBxSmcJKQziyJoiIOM7IQNdI8D0GLdTTt6u13AkbtTGL6pT8VMpPGby/EayzGDfWWAnH3XLsQmzTmbY2beBX6dPQHVTFxQzOe/achqgCC6xhE8rNSQTHtKtbNBQZ4i4GujjRS5RQO3Zfagp+xxz9PzcgaLpQxM8rx+jplGpazGEqIxG/yIpCPQVoG8bVM7QcM/iWfNrWG1MjQKT6/hXSrTNi2BF+f6Y0BE6bmT1A28E1Dz4PEaVW5ygIX2Ex4xlbCRqV91XzPDOa2S+609wY24mf6UNG/Fm2C+oILu8z3pC/038/G57AXwwNvnyW2ok6g7GjTUMDsi98FhSw4Wab1Op88tvUTBEbAtW4u+1oNgBJRvAzdXVaGXLpyMQQpWvZUkCJW+aMgtZv9a9ZpDz+pDoSre4EclVsuzLtZ2Na9iiRYD0aAbW5iKkG1q0M0ItM/rIHGKpiM4kHJRCFiKMDFGH3X3X0soERK/JudELXEVPFdEbzkrQNwlA1gAFED6NQZWQQ3DkWAeBB93h6R56xEagOWFSviWRlIEWhI6nEzSAx820KcGSxg625l7FP+2noI6roiwm5WnLgmGDR5FQMUB1MjYzUDCRRli9bXl+dwxDFkQStVjPO+aw2JQ3MyYIkDwLDR4QANv9e+6B8owSNoViO0rkcsi+Al2ibd4GpSaSxqBJZlMbAAgzJNqd8b0ZVoh4VcoS6IggvWTL3/cbjRoLSU+ehwsJD8zfGd9mTTZ5Vk6STFAogkrLGV9FxVcF/DiLg40sNWznQ22+3a+/fJ7YebF6lUh5Y2Z0y 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 Thu, Mar 13, 2025 at 06:11:21PM +0000, Brendan Jackman wrote: > __kernel_physical_mapping_init() will soon need to work on multiple > PGDs, so factor out something similar to phys_p4d_init() and friends, > which takes the base of the PGD as an argument. > > Signed-off-by: Brendan Jackman > --- > arch/x86/mm/init_64.c | 33 +++++++++++++++++++++++---------- > 1 file changed, 23 insertions(+), 10 deletions(-) > > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index 01ea7c6df3036bd185cdb3f54ddf244b79cbce8c..8f75274fddd96b8285aff48493ebad93e30daebe 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -731,21 +731,20 @@ phys_p4d_init(p4d_t *p4d_page, unsigned long paddr, unsigned long paddr_end, > } > > static unsigned long __meminit > -__kernel_physical_mapping_init(unsigned long paddr_start, > - unsigned long paddr_end, > - unsigned long page_size_mask, > - pgprot_t prot, bool init) > +phys_pgd_init(pgd_t *pgd_page, unsigned long paddr_start, unsigned long paddr_end, > + unsigned long page_size_mask, pgprot_t prot, bool init, bool *pgd_changed) > { > - bool pgd_changed = false; > unsigned long vaddr, vaddr_start, vaddr_end, vaddr_next, paddr_last; > > + *pgd_changed = false; > + > paddr_last = paddr_end; > vaddr = (unsigned long)__va(paddr_start); > vaddr_end = (unsigned long)__va(paddr_end); > vaddr_start = vaddr; > > for (; vaddr < vaddr_end; vaddr = vaddr_next) { > - pgd_t *pgd = pgd_offset_k(vaddr); > + pgd_t *pgd = pgd_offset_pgd(pgd_page, vaddr); > p4d_t *p4d; > > vaddr_next = (vaddr & PGDIR_MASK) + PGDIR_SIZE; > @@ -771,15 +770,29 @@ __kernel_physical_mapping_init(unsigned long paddr_start, > (pud_t *) p4d, init); > > spin_unlock(&init_mm.page_table_lock); > - pgd_changed = true; > + *pgd_changed = true; > } > > - if (pgd_changed) > - sync_global_pgds(vaddr_start, vaddr_end - 1); > - > return paddr_last; > } > > +static unsigned long __meminit > +__kernel_physical_mapping_init(unsigned long paddr_start, > + unsigned long paddr_end, > + unsigned long page_size_mask, > + pgprot_t prot, bool init) > +{ > + bool pgd_changed; > + unsigned long paddr_last; > + > + paddr_last = phys_pgd_init(init_mm.pgd, paddr_start, paddr_end, page_size_mask, > + prot, init, &pgd_changed); > + if (pgd_changed) > + sync_global_pgds((unsigned long)__va(paddr_start), > + (unsigned long)__va(paddr_end) - 1); This patch keeps the sync_global_pgds() in __kernel_physical_mapping_init(), then a following patch adds it back in phys_pgd_init() (but still leaves it here). Should we just leave sync_global_pgds() in phys_pgd_init() and eliminate the pgd_changed argument? > + > + return paddr_last; > +} > > /* > * Create page table mapping for the physical memory for specific physical > > -- > 2.49.0.rc1.451.g8f38331e32-goog >