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 99215C25B74 for ; Tue, 21 May 2024 09:39:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2C50A6B0096; Tue, 21 May 2024 05:39:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 274F46B0098; Tue, 21 May 2024 05:39:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 163D76B0099; Tue, 21 May 2024 05:39:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id EBE926B0096 for ; Tue, 21 May 2024 05:39:32 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 947628118A for ; Tue, 21 May 2024 09:39:32 +0000 (UTC) X-FDA: 82141905384.23.C11F9A4 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf26.hostedemail.com (Postfix) with ESMTP id 605FE140005 for ; Tue, 21 May 2024 09:39:30 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Z+DNslWk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Y6hYJcvc; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Z+DNslWk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Y6hYJcvc; spf=pass (imf26.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716284370; 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=rhOZPVy/TQ6hWgNCMz6JejfnUTc+nQH1jip1vkmWyaI=; b=VtCgKduYazaTpg32BEmU2q/1HoYY2BAKLY2p1jtDcx1DtsCQdMR5AlZr/g9zBqOluteaAE JoL3Ry7ZyZsuYVLY1iQWU1kjtMFDH4acjIjsbc93NQAXIG68SzPwqfoFDfZkneLUmIBvmW GvBTrSPc1l0P/HjwNUxNiGo1z98d2qU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Z+DNslWk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Y6hYJcvc; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Z+DNslWk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Y6hYJcvc; spf=pass (imf26.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716284370; a=rsa-sha256; cv=none; b=e3pOX8G1Ly06d6ae1CRhi1w07KZQ0C/9xliypkN6wexoeN++siNH5M+kS0UmUMitgHwbEx /p/E8p2SrlWoO40AGe9H5VeTjOa0LkMR8SB438KbZ39WuOYuE0aDBUU1UN5hxWUZ/RnTkf SlV86PV07333JCsO2UqElx8cgsbEAqY= 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 B004022A55; Tue, 21 May 2024 09:39:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716284368; 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=rhOZPVy/TQ6hWgNCMz6JejfnUTc+nQH1jip1vkmWyaI=; b=Z+DNslWkYvQspiJaoCwmIGEpwqLAYcnNhbfkmt3CVGMfzXNNgfuxW6kLIiijzevVtKCXvm ljWWKxIfQOOloiEALA22RAQDB6+rMz0aiPE2UE6e2Io7Q7ZqQi9AiC6RKuAgjL17+anZvF aRyzwfwXBdYJeEEFtKuG03WXLTJTNfc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716284368; 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=rhOZPVy/TQ6hWgNCMz6JejfnUTc+nQH1jip1vkmWyaI=; b=Y6hYJcvcKnei1n43mylKq+OrxlTvadkEQrvK/jg02KC9makksyhOtGkzSEhso7PoVm1B6N HfvKcX0mp9jHuXBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716284368; 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=rhOZPVy/TQ6hWgNCMz6JejfnUTc+nQH1jip1vkmWyaI=; b=Z+DNslWkYvQspiJaoCwmIGEpwqLAYcnNhbfkmt3CVGMfzXNNgfuxW6kLIiijzevVtKCXvm ljWWKxIfQOOloiEALA22RAQDB6+rMz0aiPE2UE6e2Io7Q7ZqQi9AiC6RKuAgjL17+anZvF aRyzwfwXBdYJeEEFtKuG03WXLTJTNfc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716284368; 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=rhOZPVy/TQ6hWgNCMz6JejfnUTc+nQH1jip1vkmWyaI=; b=Y6hYJcvcKnei1n43mylKq+OrxlTvadkEQrvK/jg02KC9makksyhOtGkzSEhso7PoVm1B6N HfvKcX0mp9jHuXBw== 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 2999B13A1E; Tue, 21 May 2024 09:39:28 +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 K0CEB9BrTGZiOAAAD6G6ig (envelope-from ); Tue, 21 May 2024 09:39:28 +0000 Date: Tue, 21 May 2024 11:39:26 +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 03/20] mm: Provide pmd to pte_leaf_size() 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: jtin3bia8ogfgk4m85subd6x3pu37yiy X-Rspamd-Queue-Id: 605FE140005 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1716284370-166161 X-HE-Meta: U2FsdGVkX1+0Nnz9quP2l4jcYFlG7S79EqVRhSAn1SoV4SGzpKJNF2SGzDz3gjLTyLczQ92BTYnEVB/w8f1bMMPXF9cNRiKwDzbgKUn59DJdMc6GCdnpsJu5U/t74V0Q+tcfBVevocZUgcyNCmljv8FNoe6ebYthquoil0+4vnFIpixa0lYkS9mKZE0p78vVRT5iWiDknoAon8U25jLZZyUdQSv2WYURE+8qeRu8soavnwXajJEgurgz4IZI9mzMTj1pho0H6LY6JBVAD+LJidGo8SeZ1I7LmiN1SDuQXkkSTAsbHPuawcuy/CgqbHkWIxnNrHsAU7jT8rq+q1AuCVh58xnhxwQvJW8IjjU8a4gHN0R0t0WrDHLq2IJK6R1+3hhg2Z7aMc3zGIaV9wafywYkCkWch+W8QiqGG5K4oGaV8O0o/N2r46ETJLMyosyrMn7puN8BB9gDgKHf/p8lpfIwuWlrcVgcww8bU1cnu41Rf2y3xIGMQgjwgEAg/w2P0gYVX5022nv9jvNfg3mbTcN++yJygvS/7eO3jf06hZBqj7OiZRroQ6hLF2AsmVbWWrnytNuHyamNJVkuMtVsXQUQdGbeu8EVOuOQ4mYd6rt70tIoJVA50oY8RB/5Wbv1t3Sukf7FlIGvVj3kWmqo6gx8Gq+nNfGWdg0yzUoekPIjMC5rjUKS9qt334UVbjnP0jyqNIY0JOPHiHxZYT/U8UXuEmm/inKdJRNAY1hMyk9LbzNvB6FNP2ADlmC1M21iVJ46lIrOPAnGM8v/72oI25f74dohssazi2aPyQpRb9HaiiarcJ4qdgQ9RfQG1a2F9M6NZde87bX7JAlSyqdEBWa0BBUg3WdI6dlzdnRi37/8ii948nfzJOmDwfD7Asp45dm1iWeQirKHBlsaLEnOwqXKHXdTGNU+Um+9FfC94bVlXsVGMTd7MGeEtjXrZsnzHYKNlUB+3sUeAZFeS9U +CD5f1MX sH58E7vTSstBNeHOgFbk007QeBkkJ1iOpBgvaa81ZL0jXTBJVPFZf4g9DqIY6kn/x2TyjNEP9TmeyDDMWIcWGAMJP9BncCx0MSPgHcx3srnzZoehA9YgpgM5oOUIGBP9K52pDEbadQzcLU28Ha6KXwaovRbxdgKMFGBG+kCBtRHAn6CBcj9obWcRlKiDNVkizF9RhER1JUwsd9wptvYAB1Z1f+3K5RO0QO+SIqH4kkuxXhaEYbhglJoAjoaiAsMgFCJVCOyUO/Y9yplHVKVlCgH59LPhPqBXQ7WE6bSZXeyHk89R2FPtzEnNdlA== 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 08:59:57PM +0200, Christophe Leroy wrote: > On powerpc 8xx, when a page is 8M size, the information is in the PMD > entry. So provide it to pte_leaf_size(). > > Signed-off-by: Christophe Leroy Overall looks good to me. Would be nicer if we could left the arch code untouched. I wanted to see how this would be if we go down that road and focus only on 8xx at the risk of being more esoteric. pmd_pte_leaf_size() is a name of hell, but could be replaced with __pte_leaf_size for example. Worth it? Maybe not, anyway, just wanted to give it a go: diff --git a/arch/powerpc/include/asm/nohash/32/pte-8xx.h b/arch/powerpc/include/asm/nohash/32/pte-8xx.h index 137dc3c84e45..9e3fe6e1083f 100644 --- a/arch/powerpc/include/asm/nohash/32/pte-8xx.h +++ b/arch/powerpc/include/asm/nohash/32/pte-8xx.h @@ -151,7 +151,7 @@ static inline unsigned long pgd_leaf_size(pgd_t pgd) #define pgd_leaf_size pgd_leaf_size -static inline unsigned long pte_leaf_size(pte_t pte) +static inline unsigned long pmd_pte_leaf_size(pte_t pte) { pte_basic_t val = pte_val(pte); @@ -162,7 +162,7 @@ static inline unsigned long pte_leaf_size(pte_t pte) return SZ_4K; } -#define pte_leaf_size pte_leaf_size +#define pmd_pte_leaf_size pmd_pte_leaf_size /* * On the 8xx, the page tables are a bit special. For 16k pages, we have diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 18019f037bae..2bc2fe3b2b53 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -1891,6 +1891,9 @@ typedef unsigned int pgtbl_mod_mask; #ifndef pte_leaf_size #define pte_leaf_size(x) PAGE_SIZE #endif +#ifndef pmd_pte_leaf_size +#define pmd_pte_leaf_size(x, y) pte_leaf_size(y) +#endif /* * We always define pmd_pfn for all archs as it's used in lots of generic diff --git a/kernel/events/core.c b/kernel/events/core.c index f0128c5ff278..e90a547d2fb2 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -7596,7 +7596,7 @@ static u64 perf_get_pgtable_size(struct mm_struct *mm, unsigned long addr) pte = ptep_get_lockless(ptep); if (pte_present(pte)) - size = pte_leaf_size(pte); + size = pmd_pte_leaf_size(pmd, pte); pte_unmap(ptep); #endif /* CONFIG_HAVE_GUP_FAST */ -- Oscar Salvador SUSE Labs