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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 486A1CD5BD5 for ; Tue, 26 May 2026 22:40:03 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4gQ7415ZSWz2xS2; Wed, 27 May 2026 08:40:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1779807385; cv=none; b=bOxNXUuIlSeUlqM/qytPyB9yJuxqkcC8FIndoDBOMjDeHPSaOaWc8OfXmkFCmPlMBztwrTK49KVqDTZcnTukgmsh0N2ImXUwllbOqA0Ijyt7XbiYphfyEKuQQRDNxBQmBS+WSAjJiWUd+mOHgMXAgvDGEVzKh6eb3kflKbOMScrKO9fUUcHfbFfvEIJVIFfourcd3uyDB/jbwCwAYW5DXJmEv2bABgYdpJsrJzdlfT58tzMmOSjbJ+uV5KBPjlaKGCXta0duIqWguQ/h54T3OF/dIoXtLaZqBzY4wPDTofE8Q0bOpSVKgDQDFjnsKmjyvgEfTriS97OiXApGJjXpEQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1779807385; c=relaxed/relaxed; bh=PEJKj8MrGm98KFDNsLR6hqBdS/9XHG5DFtB7L96xDQw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=faGJN5WINgP1kPpKLpVXyK5qM/tdkVIthIoiYxupxzzMrYoVpPZ9Kub8TkBnbuHBKCxN154FWGL/57srAnYn+7omPu7mL5SWPUgcDnqqSFrPdbUa3tLCVuhk7807TFsvJ4nAeGv840Ht5BMNsVXCk4qyQDckKICHgthphF2yygFcZAa7yv/tpxyutbsUYXdsvwPZn4OeoddhDpV6DIjBsQqHKBo2npfxqqdTXWSflrjKq0niKsB+09WCVWi1WQH5lWO9DME2CJUSniRwaHqZF5iFA4Wv5B47H074ICfiXOOOo+qSSJm78ZutXbuFQZ/sJKr6BdPYatkruO1uA8P4WQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; dkim=pass (1024-bit key; unprotected) header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256 header.s=dkim header.b=i0YNxHW3; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256 header.s=dkim header.b=i0YNxHW3; dkim-atps=neutral; spf=pass (client-ip=45.249.212.187; helo=szxga01-in.huawei.com; envelope-from=yintirui@huawei.com; receiver=lists.ozlabs.org) smtp.mailfrom=huawei.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256 header.s=dkim header.b=i0YNxHW3; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256 header.s=dkim header.b=i0YNxHW3; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=huawei.com (client-ip=45.249.212.187; helo=szxga01-in.huawei.com; envelope-from=yintirui@huawei.com; receiver=lists.ozlabs.org) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4gPwn20G6Bz2yR5 for ; Wed, 27 May 2026 00:56:21 +1000 (AEST) dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=PEJKj8MrGm98KFDNsLR6hqBdS/9XHG5DFtB7L96xDQw=; b=i0YNxHW3wq3lFr0pxm1PaJNgAVJTO1vRZUeYUiJLUthZy1rqBkAIdd47b8R+6cAyaooBDq9ga Gi+EVanp6M6ViNTwBHbOygCaz+ZLtugXoLZmkLmAljpjW4ksf3jW9FcLRD3EtMD7xBeNQvKhMW1 e2Prn6nGp6met5Qh5OkxH2g= Received: from canpmsgout04.his.huawei.com (unknown [172.19.92.133]) by szxga01-in.huawei.com (SkyGuard) with ESMTPS id 4gPwlz1QYPz1BGPL for ; Tue, 26 May 2026 22:55:27 +0800 (CST) dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=PEJKj8MrGm98KFDNsLR6hqBdS/9XHG5DFtB7L96xDQw=; b=i0YNxHW3wq3lFr0pxm1PaJNgAVJTO1vRZUeYUiJLUthZy1rqBkAIdd47b8R+6cAyaooBDq9ga Gi+EVanp6M6ViNTwBHbOygCaz+ZLtugXoLZmkLmAljpjW4ksf3jW9FcLRD3EtMD7xBeNQvKhMW1 e2Prn6nGp6met5Qh5OkxH2g= Received: from mail.maildlp.com (unknown [172.19.162.197]) by canpmsgout04.his.huawei.com (SkyGuard) with ESMTPS id 4gPwbt2RTYz1prmJ; Tue, 26 May 2026 22:48:26 +0800 (CST) Received: from kwepemr500001.china.huawei.com (unknown [7.202.194.229]) by mail.maildlp.com (Postfix) with ESMTPS id 0107540576; Tue, 26 May 2026 22:56:14 +0800 (CST) Received: from huawei.com (10.50.87.63) by kwepemr500001.china.huawei.com (7.202.194.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 26 May 2026 22:56:12 +0800 From: Yin Tirui To: Andrew Morton , Matthew Wilcox , David Hildenbrand , Lorenzo Stoakes , Juergen Gross , Jonathan Cameron , Will Deacon CC: Catalin Marinas , Peter Xu , Luiz Capitulino , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , "Liam R . Howlett" , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Anshuman Khandual , Rohan McLure , Kevin Brodsky , Alistair Popple , Andrew Donnellan , Pasha Tatashin , Baoquan He , Thomas Huth , Coiby Xu , Dan Williams , Yu-cheng Yu , Lu Baolu , Conor Dooley , Rik van Riel , , , , , , , , , Subject: [PATCH mm-unstable RFC v4 3/7] powerpc/mm: use PTE-level pgprot for huge PFN helpers Date: Tue, 26 May 2026 22:49:59 +0800 Message-ID: <20260526145003.88445-4-yintirui@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260526145003.88445-1-yintirui@huawei.com> References: <20260526145003.88445-1-yintirui@huawei.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.50.87.63] X-ClientProxiedBy: kwepems100001.china.huawei.com (7.221.188.238) To kwepemr500001.china.huawei.com (7.202.194.229) Make the powerpc PMD PFN helper use PTE-level pgprot_t as the basic format. pmd_pgprot() currently derives pgprot_t from the PMD entry through pte_pgprot(). Some PMD leaf entries can carry H_PAGE_THP_HUGE, which is specific to huge PMDs and should not be propagated into PTE-level pgprot_t. Mask H_PAGE_THP_HUGE out in pmd_pgprot(). Signed-off-by: Yin Tirui --- arch/powerpc/include/asm/pgtable.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index d20ff2ae02f5..0f368ea64b1f 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -67,7 +67,16 @@ static inline pgprot_t pte_pgprot(pte_t pte) #define pmd_pgprot pmd_pgprot static inline pgprot_t pmd_pgprot(pmd_t pmd) { - return pte_pgprot(pmd_pte(pmd)); + pgprot_t prot = pte_pgprot(pmd_pte(pmd)); + + /* + * pmd_pgprot() returns PTE-level pgprot_t. H_PAGE_THP_HUGE is specific + * to huge PMDs. + */ +#ifdef H_PAGE_THP_HUGE + prot = __pgprot(pgprot_val(prot) & ~H_PAGE_THP_HUGE); +#endif + return prot; } #define pud_pgprot pud_pgprot -- 2.43.0