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 34028C25B78 for ; Sat, 25 May 2024 04:54:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 368116B007B; Sat, 25 May 2024 00:54:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 318AA6B0083; Sat, 25 May 2024 00:54:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E02B6B0085; Sat, 25 May 2024 00:54:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 00EAA6B007B for ; Sat, 25 May 2024 00:54:56 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 7654580BA2 for ; Sat, 25 May 2024 04:54:56 +0000 (UTC) X-FDA: 82155703392.04.D8C8493 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf17.hostedemail.com (Postfix) with ESMTP id 2473040002 for ; Sat, 25 May 2024 04:54:53 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Zt1MCyQ5; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RZuyb9y7; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Zt1MCyQ5; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RZuyb9y7; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf17.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 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=1716612894; 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=btAdsS+hCf3mFF4waPo4jB02fuvhLt2lHJ3C41E1r4k=; b=OOguBqiTTEQX037rIsUYFJGJAW2nOSil6C/51zNpOm2lpusdUkOdNNi9K7rJUm9HeNaS6h 0ujkwWlT/+cQYDFQBNxT/77tbufXEBTyiCn8u23dX1nvd8Shs+TkZqHpARClFTK6szMPlQ okfXVVwPot6XtpVRCxwW84xgPtT2gK0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716612894; a=rsa-sha256; cv=none; b=e/wFMt29GVoqUSGS4uHMLjwajaQIeJCraAYSWEUzjKnop2FykmnOY5JPtXkZlT+6WLej16 WNzQ/p+xuv+/QYV8Mexjh0VEO+O8SmrmO0m6VNlNcfATgq8QCpE9FTSdphHwspmsdAbXV6 S/sQn3WgVFi/bqRiJ40DKCx5hhDSQiI= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Zt1MCyQ5; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RZuyb9y7; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Zt1MCyQ5; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RZuyb9y7; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf17.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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-out1.suse.de (Postfix) with ESMTPS id 2C22D340C0; Sat, 25 May 2024 04:54:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716612892; 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=btAdsS+hCf3mFF4waPo4jB02fuvhLt2lHJ3C41E1r4k=; b=Zt1MCyQ5caV8HNnwgF8lwsk22p2c7ocPBHhIpu1+r0u7/0j2uJG4XFPYMhC3BDXIzoiWRT EXWHelIIA5hoIhDl5nnnwoEV1T0aoCrayngeE7kDsvPD+4ot7UzfJXl9of72KRvk0Z0ryr uTn3RiqzjohITJ5ijXqL2GnwQWeaaYc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716612892; 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=btAdsS+hCf3mFF4waPo4jB02fuvhLt2lHJ3C41E1r4k=; b=RZuyb9y704LokAfoEqSC095O5lJp5/RlnWrO/4ZNb7F2kOyCkNwXWXRqW1Cjr4UhBo0cbs 8equLFiPPUMasiCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716612892; 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=btAdsS+hCf3mFF4waPo4jB02fuvhLt2lHJ3C41E1r4k=; b=Zt1MCyQ5caV8HNnwgF8lwsk22p2c7ocPBHhIpu1+r0u7/0j2uJG4XFPYMhC3BDXIzoiWRT EXWHelIIA5hoIhDl5nnnwoEV1T0aoCrayngeE7kDsvPD+4ot7UzfJXl9of72KRvk0Z0ryr uTn3RiqzjohITJ5ijXqL2GnwQWeaaYc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716612892; 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=btAdsS+hCf3mFF4waPo4jB02fuvhLt2lHJ3C41E1r4k=; b=RZuyb9y704LokAfoEqSC095O5lJp5/RlnWrO/4ZNb7F2kOyCkNwXWXRqW1Cjr4UhBo0cbs 8equLFiPPUMasiCQ== 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 9887D13A6B; Sat, 25 May 2024 04:54:51 +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 dPMWIhtvUWZnCwAAD6G6ig (envelope-from ); Sat, 25 May 2024 04:54:51 +0000 Date: Sat, 25 May 2024 06:54:46 +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 15/20] powerpc/85xx: Switch to 64 bits PGD Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Action: no action X-Stat-Signature: 6xu41c3diptsh4qoous9nzfuquoeacue X-Rspamd-Queue-Id: 2473040002 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1716612893-409890 X-HE-Meta: U2FsdGVkX1/BDjyAN7vdNjGHvQWeMCc/zSOJOzhvRhwgJyp9pMFIJw5Hv3Zo5rwy6h3tidh9m69rHVFHxxVmLyxtAeZp/APA2qjdgDxuXj1houB/7DVRuiMNOAYhhuG4FrseQrBe2VVszpl3seMetHywdV/tj6rrC5blmKwS4k2QdXAYz4BmZTI8TlDCzSemfrtFOa9DT+RNANVCRCaoo4cT15HfOMUnVFHzodrFx+ieVrJj0B423aEuwOiuUzLtKPWtU1960Mi/DcsQiaj1krBicRTrpdpezUQmMBq/YHmnn4/6A0fu7hZh9ZuNXUOo0Wg+mKDrmZRCeZS43RikZc1Itq4s8M3XY897ZQ+pMqR2/yXrM6eACkP+BuHbdBTdVHnBnG6BBHmIi/IFsgjq3L28OxwYh6X1OIQfMHechzH221W/iprS0keTmv3zCJ2MTeebeSdR4gV5Cct0+VfrGDWbrXf3Mw+04GLsaySOKjYfJgPf2ryjTYYT09We4+kPJb0CeJUnz0+eEig8wjfMaJUUoLHdmMet+8REcyTMFMAouuApjlhrh5t32cL22OCiB3I6hnHi0dnMkZ31z0xiBJvsE4+AQVf4pCWi9vi2Q6CzjE/Z2XvcvIpZncbj0NA12VibDG3eNz9kxXj1eYYls4bx+8ruILlOD4ySCWrWXc7kvws2r2YaMFFHQMTtAHfb8GraqVPAtzYFLJ1HRYUfYIOGf4Iv1/xKraE6K3tHExWdyzvSnxZZgfphmXQSPAcRfv+IBkqn1ztJWN3BoAIM2HtQzJk/C3CNPaRyXCFFWKHXKZJu26lHodYhAC05BzYvQc/Mua5Od96tQBRb1L3miS6K0zLvwv9Iw16z7WjP3CuAQyAt06Yoy8mWMnJExwceqohEk2IRhLSbHdoj4dBw1PYHf4fIQc9ic4jZ+nt45Zf4klIfOXM2t7ibOYqDeWb8lu3wZ6u11+8G1S1hQYm Utf28dlN ywJ5K1ca/5m4o+4GqwJneoi5Jdt6hUdyw2BTtnPaCyrBLNjFUSa92KS7/jW4Zokn0BrgUmn/AU2vboEltzx4P66UXwxljhFsXF7+cOetVl/cD5dL23JoS8UwGGd4LgLlTXAGudSINeVbhXDFD1WmEl6bJVFyzfKUvPjW/5vszZpjPCJAqkH7fJCnMgOAwZuaGwLv+vfLcpziAREuosTupE5sUeOjHT0c3FeH8tIicdQL5ELkRZrGDHBBaOW8E/wkuOSnw 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:09PM +0200, Christophe Leroy wrote: > In order to allow leaf PMD entries, switch the PGD to 64 bits entries. > > Signed-off-by: Christophe Leroy I do not quite understand this change. Are not powerE500 and power85xx two different things? You are changing making it 64 for PPC_E500_64bits, but you are updating head_85xx. Are they sharing this code? Also, we would benefit from a slightly bigger changelog, explaining why do we need this change in some more detail. > diff --git a/arch/powerpc/include/asm/pgtable-types.h b/arch/powerpc/include/asm/pgtable-types.h > index 082c85cc09b1..db965d98e0ae 100644 > --- a/arch/powerpc/include/asm/pgtable-types.h > +++ b/arch/powerpc/include/asm/pgtable-types.h > @@ -49,7 +49,11 @@ static inline unsigned long pud_val(pud_t x) > #endif /* CONFIG_PPC64 */ > > /* PGD level */ > +#if defined(CONFIG_PPC_E500) && defined(CONFIG_PTE_64BIT) > +typedef struct { unsigned long long pgd; } pgd_t; > +#else > typedef struct { unsigned long pgd; } pgd_t; > +#endif > #define __pgd(x) ((pgd_t) { (x) }) > static inline unsigned long pgd_val(pgd_t x) > { > diff --git a/arch/powerpc/kernel/head_85xx.S b/arch/powerpc/kernel/head_85xx.S > index 39724ff5ae1f..a305244afc9f 100644 > --- a/arch/powerpc/kernel/head_85xx.S > +++ b/arch/powerpc/kernel/head_85xx.S > @@ -307,8 +307,9 @@ set_ivor: > #ifdef CONFIG_PTE_64BIT > #ifdef CONFIG_HUGETLB_PAGE > #define FIND_PTE \ > - rlwinm r12, r10, 13, 19, 29; /* Compute pgdir/pmd offset */ \ > - lwzx r11, r12, r11; /* Get pgd/pmd entry */ \ > + rlwinm r12, r10, 14, 18, 28; /* Compute pgdir/pmd offset */ \ > + add r12, r11, r12; You add the offset to pgdir? > + lwz r11, 4(r12); /* Get pgd/pmd entry */ \ What is i offset 4? -- Oscar Salvador SUSE Labs