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 927DCC25B78 for ; Sat, 25 May 2024 04:29:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0B7046B007B; Sat, 25 May 2024 00:29:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 067176B0083; Sat, 25 May 2024 00:29:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E6FE36B0085; Sat, 25 May 2024 00:29:54 -0400 (EDT) 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 CAD8B6B007B for ; Sat, 25 May 2024 00:29:54 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 77274A23DD for ; Sat, 25 May 2024 04:29:54 +0000 (UTC) X-FDA: 82155640308.07.591B422 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf22.hostedemail.com (Postfix) with ESMTP id 5421AC0008 for ; Sat, 25 May 2024 04:29:52 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=l1u02PQ7; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="/P4sqCWy"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=l1u02PQ7; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="/P4sqCWy"; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf22.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716611392; 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=0jMHt0Q/JR84IkdUwzp1Rd4JSoh8dVTU4aWoOj2QTcg=; b=2NbdddZit9jA0D4sOfSFmwbiEBCiAdRe76BZxK/0eMQLd1SfZrzSzeHUeSbRJcIKvuI8nw ql5YRdjcYPSIyEuFWg/aI8MJua51f1KJLcW7fqZlbD7yDW75fZpNb4CYTNtWc6+e2S6A+T 7NeQMDqgU54qAwa2ukuai49BOVi9V6E= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=l1u02PQ7; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="/P4sqCWy"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=l1u02PQ7; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="/P4sqCWy"; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf22.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716611392; a=rsa-sha256; cv=none; b=dc64X/pVTC5WlG5Jir+BkYEfe5H9oTSaoUp3wtQXVJUVjAY/GqRouTNu9Nle4meJLNwxG0 G3/0Jj1QIv9hZxd223xIBc/1YUg2GEWh8mU5tRMbxpqspMsL72xp/rWbTGCk4WVltkA+I9 nukMgR+GybFTvXFTk0G2FbKbPWoPnWc= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id B90FE210B7; Sat, 25 May 2024 04:29:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716611390; h=from:from:reply-to: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=0jMHt0Q/JR84IkdUwzp1Rd4JSoh8dVTU4aWoOj2QTcg=; b=l1u02PQ7mUeizPUtziKZMSjLfSDrBiAuCREz31HsHEIKq6Y05wZ/ksZDnm96yJCEyTPp89 s+woPlXhybRjXGtzwwPgGx4OyhUH2WiS/97dN6hchsbJ593I1ri2VE0E9y1EHydxnEf6Jq zRIaWjIMf0LqWRyNkCQmi3MLLt8gtr0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716611390; h=from:from:reply-to: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=0jMHt0Q/JR84IkdUwzp1Rd4JSoh8dVTU4aWoOj2QTcg=; b=/P4sqCWykN268llQRDZDNDK/3U5kd/JdBzk4bO/RCBrUwi8Yi3n/+zg7ms3JYCFIumrcNw wnHCd3Mdif0hhBDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716611390; h=from:from:reply-to: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=0jMHt0Q/JR84IkdUwzp1Rd4JSoh8dVTU4aWoOj2QTcg=; b=l1u02PQ7mUeizPUtziKZMSjLfSDrBiAuCREz31HsHEIKq6Y05wZ/ksZDnm96yJCEyTPp89 s+woPlXhybRjXGtzwwPgGx4OyhUH2WiS/97dN6hchsbJ593I1ri2VE0E9y1EHydxnEf6Jq zRIaWjIMf0LqWRyNkCQmi3MLLt8gtr0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716611390; h=from:from:reply-to: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=0jMHt0Q/JR84IkdUwzp1Rd4JSoh8dVTU4aWoOj2QTcg=; b=/P4sqCWykN268llQRDZDNDK/3U5kd/JdBzk4bO/RCBrUwi8Yi3n/+zg7ms3JYCFIumrcNw wnHCd3Mdif0hhBDg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 3F5F513A6B; Sat, 25 May 2024 04:29:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id vwuLDD5pUWaVPAAAD6G6ig (envelope-from ); Sat, 25 May 2024 04:29:50 +0000 Date: Sat, 25 May 2024 06:29:48 +0200 From: Oscar Salvador To: Christophe Leroy Cc: Andrew Morton , Jason Gunthorpe , Peter Xu , Michael Ellerman , Nicholas Piggin , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [RFC PATCH v2 11/20] powerpc/mm: Complement huge_pte_alloc() for all non HUGEPD setups Message-ID: References: <59a1390923c40b0b83ae062e3041873292186577.1715971869.git.christophe.leroy@csgroup.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <59a1390923c40b0b83ae062e3041873292186577.1715971869.git.christophe.leroy@csgroup.eu> X-Rspamd-Queue-Id: 5421AC0008 X-Stat-Signature: 18kmzz7gw8s1j8xi8qz7erj5soif9d9z X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1716611392-821162 X-HE-Meta: U2FsdGVkX1+HubH5Tn7KojiCX4sG48g0h029/kelcoKLTdoCWpJYAD+tfs2zcvbfK4mxp/NbS3Feput3PMbTNQNrKTjVRpZ0d5VvPtHurU1eKmzjM6VSZJTE2rnXCFUKiVVgQT6tkqNWAyY/XN95Qq1hesdBSeZdhTVPM4meylqAGB6ORm0LEuSpCVWC9oyTRvxL/CgtQMw5zTdAA/Z1qJTRObyr99KJIkWQV0eIIZn00WiW9IDsOkqc34tUs7Hbv8Agc15wt6A2wKQdRhUytVp5u8Yn/EtBLp4TTUGJq3JV4NskJY09aD0Hjrr4ptzRTas6fJIONFeeGF9gvZn9tmbjRU2toKoQbvacEZs6dv0e7jG6n4FWWzpKEW/voCVGJR+u0gX3QqmhJigZ32HoSfd1ZTPivFsRUCSetIsET2Z29GCrUlkd3plTywt0ypA5ztwBKPjL3xZ6375BPUY6JFaVVdazvoN2AFzwLqF/CZ5o1Jd9P7xER+gGa8ZEGImJnvx5cpUI8Fln8s69Fx4Vc87/nqTNB9dYY0P3kSk1KJ8vhhm2ACcu0Ao/JwjcrIOG5YDzk1Xw+JgUT/Yt/C14aMu65ftSNw9G02OM515f6AAlES+qywx/hHyFhDtqeFSDOL7vC1GKE9+d9PBC26AV6Lux4WRTHDgAY8IUzXMuto4V/Ju0Won+g/1V0vAILAncMbEW62qt02KTOzc0SP9Ehkiwf8cSZRJ0hB3WZlfWhEHu4r3F7J1dgDUfY/79l4Gho7nhpTkxX693mf3KLvRyMTmfru61vxxDFv9L0L149GMa5NEyGRCrPiUswtvc/mgbtxOJ/xa2SUf2HTFjImwQaQe2HNuLEhEnB6cELFYdv5FnYtWuLaaxMtB9xuQqEflCj3TuyaFTa+TY82cgvDDjLvkM+pOuyJVywGV22KP1ntT5SHzjBiZ3ftEhJ7EaNCgswuC8mzeYMYaxNMYbo2n nsS8jAQY Fbo2Q2OOi2KRGPX8wMlA8xkPBy5C45FcADTMfxTKCYcbk2rDyDEDrRm6M4EhYCkokqJhPxzNHw/eGCZ0tZowOeOPhhhf/BCaeeMM7iN3mUINZUqMevPgdm9I+1NCtXIz8MUDubNCmROamnwQr6eDPEdixYuwEM+aw2rUFR9UxFiEDqPLcb1oQP5w281/a8prWkcubxERiCjP2WNBn9nGdc9RwyvfHerML/ugWMWFkHWTk1y/3/y2TvKKpahucxF0/ZYpFMJ28dS/VSWzEuQR9K6zmGV4eKnhuUInqhfQ26UXaO8XPPfj0DHYFSA== 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 Fri, May 17, 2024 at 09:00:05PM +0200, Christophe Leroy wrote: > huge_pte_alloc() for non-HUGEPD targets is reserved for 8xx at the > moment. In order to convert other targets for non-HUGEPD, complement > huge_pte_alloc() to support any standard cont-PxD setup. > > Signed-off-by: Christophe Leroy > --- > arch/powerpc/mm/hugetlbpage.c | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c > index 42b12e1ec851..f8aefa1e7363 100644 > --- a/arch/powerpc/mm/hugetlbpage.c > +++ b/arch/powerpc/mm/hugetlbpage.c > @@ -195,11 +195,34 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, > pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, > unsigned long addr, unsigned long sz) > { > - pmd_t *pmd = pmd_off(mm, addr); > + pgd_t *pgd; > + p4d_t *p4d; > + pud_t *pud; > + pmd_t *pmd; > + > + addr &= ~(sz - 1); > + pgd = pgd_offset(mm, addr); > + > + p4d = p4d_offset(pgd, addr); > + if (sz >= PGDIR_SIZE) > + return (pte_t *)p4d; > + > + pud = pud_alloc(mm, p4d, addr); > + if (!pud) > + return NULL; > + if (sz >= PUD_SIZE) > + return (pte_t *)pud; > + > + pmd = pmd_alloc(mm, pud, addr); > + if (!pmd) > + return NULL; > > if (sz < PMD_SIZE) > return pte_alloc_huge(mm, pmd, addr, sz); > > + if (!IS_ENABLED(CONFIG_PPC_8xx)) > + return (pte_t *)pmd; So only 8xx has cont-PMD for hugepages? > + > if (sz != SZ_8M) > return NULL; Since this function is the core for allocation huge pages, I think it would benefit from a comment at the top explaining the possible layouts. e.g: Who can have cont-{P4d,PUD,PMD} etc. A brief explanation of the possible scheme for all powerpc platforms. That would help people looking into this in a future. -- Oscar Salvador SUSE Labs