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 965E4C54E41 for ; Thu, 7 Mar 2024 03:05:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 227F56B00EE; Wed, 6 Mar 2024 22:05:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B16E6B00EF; Wed, 6 Mar 2024 22:05:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF8976B00F0; Wed, 6 Mar 2024 22:05:43 -0500 (EST) 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 D94EA6B00EE for ; Wed, 6 Mar 2024 22:05:43 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B363A1C09B0 for ; Thu, 7 Mar 2024 03:05:43 +0000 (UTC) X-FDA: 81868752966.27.3BF43B7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 48F7CC0018 for ; Thu, 7 Mar 2024 03:05:40 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GVtYZ27h; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709780741; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=MzMLg/wee/vTp+db4excwyCMDdB7x1g/wFRknWJCpvA2fbwMFTPVgnIWzcU5C0buJKVA3Q EikOm0RyHj83PmgqX9YovsCeq2FadVQfNtoFPmFR4T07PxlfG6IxjbPfhkvRPOgOT0xJsA UDEfWdvPdxuYWZw5nONFeOuYG7w5ZIg= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GVtYZ27h; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709780741; a=rsa-sha256; cv=none; b=bU6e1XUOIVY+yKJC/68duyyeGbHxcgGZEX8Kc9H6LgPcLc7XU8znHl2c7NB3H/HNCrGtwZ uNxItLoDy4yc3i1ap0+P62BRue4CMDcvQhsHA8mF/lpob0lYhNUMp47CnR83wm8xnT67Nd bX+57JUB+z7qEeZ0Y+Eem5Xit7frNQ4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709780739; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=GVtYZ27hOned6302mTfm4cRb4FJ6q43zFKebqHzBlOk8RNEhYDXJeGGKqJiF6BKU28r5Ep SoKAyyZHrEHk5HnnjM+F37CE1yZsO4ADVqZ6p0py9F0H1Qt2e7jIwWGEGijD2D+6HpTdd4 SHVaChCnVTm63r/x+orBBOdWlUBaM74= Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-542-q2B82f2NMs638iQiRed_Uw-1; Wed, 06 Mar 2024 22:05:37 -0500 X-MC-Unique: q2B82f2NMs638iQiRed_Uw-1 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-6dbd919aba8so112075b3a.0 for ; Wed, 06 Mar 2024 19:05:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709780736; x=1710385536; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=nrtuaFZ5QAJrTTjLK2KcFpY2mXg0giasaRRYn4lOJGiRJyY1jizFw9tYbPdyqVEVTj yghs3cOqrSaYVQEak4LK6PZ6jtuKz3y/XH3cLzzJW3Q4O6jOKnz/FxzHM5jQx8BLT6sx VCjTrk0LtroAVByG2/6MS9SAqiK6f9tGOcWs5HyPCtIr1a29GyrQ852K2EaGiKQXGE68 rrAnhzMpwSgN8vROBMXM5jyRjNgunwP9oJ1r9rvm9TUIKtPIFMj/2JYDeq01qVHtTkEX u4DF4eNDG7tEpTE5KHqsZ1YIHkR+CLQxvw4P2/dr8YFTsqYuUv0GN6AvUOsksPMB6T2Y uxGQ== X-Gm-Message-State: AOJu0YzlKxT5Kic6Mr5cZ9MeaGeyynFtCSa4+pbaqZmqzhtJFwqx85ng /QQYcqTEtDzSrzLmFkx7ftpV6O+qMZzggDZM7w1WlBOhKxSZ2OvxPV0+CVZm8DGjLb63N5cc5Sb nhOedPwdgwxnV/XdaOXbfZALYEaFtiEGOUJqOe1uQhw9r7JLq X-Received: by 2002:a05:6a00:cce:b0:6e6:c6f:dc7e with SMTP id b14-20020a056a000cce00b006e60c6fdc7emr1026111pfv.3.1709780736637; Wed, 06 Mar 2024 19:05:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkCBHVN9ZAc+1XyRReKazlag268zheivJJl2EtGptHK/Yo1IMFuR7cjV0MKh9sysGGci92ug== X-Received: by 2002:a05:6a00:cce:b0:6e6:c6f:dc7e with SMTP id b14-20020a056a000cce00b006e60c6fdc7emr1026089pfv.3.1709780736228; Wed, 06 Mar 2024 19:05:36 -0800 (PST) Received: from x1n ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id n11-20020a056a000d4b00b006e65720e892sm568324pfv.94.2024.03.06.19.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 19:05:35 -0800 (PST) Date: Thu, 7 Mar 2024 11:05:21 +0800 From: Peter Xu To: Michael Ellerman Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Andrew Morton , Muchun Song , Jason Gunthorpe , Matthew Wilcox , Mike Rapoport , Christophe Leroy , x86@kernel.org, sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicholas Piggin , "Aneesh Kumar K.V" , "Naveen N. Rao" Subject: Re: [PATCH RFC 09/13] mm/powerpc: Redefine pXd_huge() with pXd_leaf() Message-ID: References: <20240306104147.193052-1-peterx@redhat.com> <20240306104147.193052-10-peterx@redhat.com> <87v85zo6w7.fsf@mail.lhotse> MIME-Version: 1.0 In-Reply-To: <87v85zo6w7.fsf@mail.lhotse> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 48F7CC0018 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: oj8bytxbdzzc8bpqjp9qj9xfzsy899t4 X-HE-Tag: 1709780740-425644 X-HE-Meta: U2FsdGVkX19tKnPn6g2hCHKtVJAwLOc7yTzapV3geQnkxpfRrccoHHG9cz6d9ddBXLGYEqJE/Y9WGgH+x7VjS2++TYumyKYYXw+vSnBX6nhD0UpnPQyv/5OyEwwpdm350lqknpF3au5HqZpfpeLOAfeaNRsFZ1RRwqD5Ee757UyFDzysu1XiD86PsSHKXRIXoiBVzHcANvu8Q1JN317A/mCs+25qlBmRQQaQB/H36n2b7kjMTp5Ka+BFfP4jZNjgoaxumsMyIhXf7YlSqHzxg79uNdyEmdHlgYkocglRx6EnnofWU+nuH2hHwMklzIWesi/X85B0f54tSj0ZEe4WgiLqMVSIGhtBjyGiMIIIKvn11yNDdnuuTJ0nbqWfy/oD6x9t19QVehx4hPcAV2m78V6l6BZhuSknVFTmvAG/6rXISbNR0KYTqc+lUCtg9BRAza1c4AbPzEYzsINYUa2FME8eVigX44cnLLMOVpuuvNYm+W2TB7PP6q3t5TlLAzmZ7Nd4DrkLQ87jLQXqbzzLPAglXUOmDsO4O8uj4AOFAUmiv839EN4EBQ2HTuRS1bP9ogGfLJeFcyPgSmqUb7VLdNXRhly8ey+gLFZDd9+kpzzKeYSvoJI7aBO29JRkS6YoLKvf/oRSb8Z5Drbz1JzBEb542OaVVHkZs0j/YUdU5i82LQMywIIU7emi0xmUfEr3AsdbMoui5ZqN6KwqhYcl3HWUxlWSFYPjtT+W6UYCUrNk+lh0HcElWES20rIPZQR7n13e1lZy/mMyk79Vlu6HMUvveF644s7Bx3V1KJGXuhQ+YXIq0pnl+yTZ+qwLoqWcI/8DdK3/cHNeerF4fhyuTZQlK3pC0QnOTggyUB2WD3sRWLXYYbRd1AgTb123junRdXHpFM03KA7wBxmj+SyTYnvd3YdSjBOq1jN9GGA9LqVD9s5N6+VeTpqsxTaYM4UfwIqaD2qsAcKk7nrk5az 13k03B+D 3iYLAK8eRWZUkrfZuy990OqAgaIpntwogV+8mjEq9YYVtf/9WQht4AsD0J+qJfQ8m93qDRSX4f1vdrlwxGgdEx7gxJUFK/gOdsct22A7SAFGJepDMuj0TxsiFwQzJTWxeHiYRAXUBFacHIJA= 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 Wed, Mar 06, 2024 at 11:56:56PM +1100, Michael Ellerman wrote: > peterx@redhat.com writes: > > From: Peter Xu > > > > PowerPC book3s 4K mostly has the same definition on both, except pXd_huge() > > constantly returns 0 for hash MMUs. AFAICT that is fine to be removed, > > because pXd_huge() reflects a hugetlb entry, while it's own hugetlb pgtable > > lookup function (__find_linux_pte() shared by all powerpc code) already use > > pXd_leaf() irrelevant of the MMU type. It means pXd_leaf() should work all > > fine with hash MMU pgtables or something could already went wrong. > > Yes I think that's correct. > > 4K Hash MMU doesn't support any hugepage size at PMD or PUD level (the > geometry is wrong), so pmd/pud_huge() were written with that in mind, > ie. they are hard coded to return false. > > But it should be OK to use pmd/pud_leaf(), they will actually look for > _PAGE_PTE, but it should never be set for 4K Hash. > > See eg. arch/powerpc/include/asm/book3s/64/hash-4k.h: > > static inline pmd_t hash__pmd_mkhuge(pmd_t pmd) > { > BUG(); > return pmd; > } Good to get confirmation on this, thanks, Michael. These explanations also look better than what I wrote, I'll amend the commit message. > > > The goal should be that we will have one API pXd_leaf() to detect all kinds > > of huge mappings. AFAICT we need to use the pXd_leaf() impl (rather than > > pXd_huge() ones) to make sure ie. THPs on hash MMU will also return true. > > > > This helps to simplify a follow up patch to drop pXd_huge() treewide. > > > > Cc: Michael Ellerman > > Cc: Nicholas Piggin > > Cc: Christophe Leroy > > Cc: "Aneesh Kumar K.V" > > Cc: "Naveen N. Rao" > > Cc: linuxppc-dev@lists.ozlabs.org > > Signed-off-by: Peter Xu > > --- > > arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 14 ++------------ > > 1 file changed, 2 insertions(+), 12 deletions(-) > > > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > index 48f21820afe2..92545981bb49 100644 > > --- a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > +++ b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > @@ -8,22 +8,12 @@ > > #ifdef CONFIG_HUGETLB_PAGE > > static inline int pmd_huge(pmd_t pmd) > > { > > - /* > > - * leaf pte for huge page > > - */ > > - if (radix_enabled()) > > - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > > - return 0; > > + return pmd_leaf(pmd); > > } > > > > static inline int pud_huge(pud_t pud) > > { > > - /* > > - * leaf pte for huge page > > - */ > > - if (radix_enabled()) > > - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > > - return 0; > > + return pud_leaf(pud); > > } > > This doesn't actually compile though. > > arch/powerpc/include/asm/book3s/64/pgtable-4k.h:11:16: error: implicit declaration of function ‘pmd_leaf’; did you mean ‘pgd_clear’? [-Werror=implicit-function-declaration] > > etc. > > To make it compile we'd need to relocate the pmd/pud_leaf() definitions: > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h > index df66dce8306f..fd7180fded75 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -262,6 +262,18 @@ extern unsigned long __kernel_io_end; > > extern struct page *vmemmap; > extern unsigned long pci_io_base; > + > +#define pmd_leaf pmd_leaf > +static inline bool pmd_leaf(pmd_t pmd) > +{ > + return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > +} > + > +#define pud_leaf pud_leaf > +static inline bool pud_leaf(pud_t pud) > +{ > + return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > +} > #endif /* __ASSEMBLY__ */ > > #include > @@ -1436,20 +1448,5 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va > return false; > } > > -/* > - * Like pmd_huge(), but works regardless of config options > - */ > -#define pmd_leaf pmd_leaf > -static inline bool pmd_leaf(pmd_t pmd) > -{ > - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > -} > - > -#define pud_leaf pud_leaf > -static inline bool pud_leaf(pud_t pud) > -{ > - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > -} > - > #endif /* __ASSEMBLY__ */ > #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */ Thanks for the help, I'll fix that. I'm wondering when syzbot will start to feed my series into the testers; I do still rely on those feedbacks on compilation issues with such treewide changes, but so far I didn't yet receive any reports. I've also attached the new patch directly here in case of any further comment. Thanks, ==========8<=========== >From 9e75aef2141170f241577e7786aaa4bbbfd93360 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Wed, 6 Mar 2024 14:49:48 +0800 Subject: [PATCH] mm/powerpc: Redefine pXd_huge() with pXd_leaf() PowerPC book3s 4K mostly has the same definition on both, except pXd_huge() constantly returns 0 for hash MMUs. As Michael Ellerman pointed out [1], it is safe to check _PAGE_PTE on hash MMUs, as the bit will never be set so it will keep returning false. As a reference, __p[mu]d_mkhuge() will trigger a BUG_ON trying to create such huge mappings for 4K hash MMUs. Meanwhile, the major powerpc hugetlb pgtable walker __find_linux_pte(), already used pXd_leaf() to check hugetlb mappings. The goal should be that we will have one API pXd_leaf() to detect all kinds of huge mappings. AFAICT we need to use the pXd_leaf() impl (rather than pXd_huge() ones) to make sure ie. THPs on hash MMU will also return true. This helps to simplify a follow up patch to drop pXd_huge() treewide. NOTE: *_leaf() definition need to be moved before the inclusion of asm/book3s/64/pgtable-4k.h, which defines pXd_huge() with it. [1] https://lore.kernel.org/r/87v85zo6w7.fsf@mail.lhotse Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: "Aneesh Kumar K.V" Cc: "Naveen N. Rao" Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Peter Xu --- .../include/asm/book3s/64/pgtable-4k.h | 14 ++-------- arch/powerpc/include/asm/book3s/64/pgtable.h | 27 +++++++++---------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h index 48f21820afe2..92545981bb49 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h @@ -8,22 +8,12 @@ #ifdef CONFIG_HUGETLB_PAGE static inline int pmd_huge(pmd_t pmd) { - /* - * leaf pte for huge page - */ - if (radix_enabled()) - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); - return 0; + return pmd_leaf(pmd); } static inline int pud_huge(pud_t pud) { - /* - * leaf pte for huge page - */ - if (radix_enabled()) - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); - return 0; + return pud_leaf(pud); } /* diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index df66dce8306f..fd7180fded75 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -262,6 +262,18 @@ extern unsigned long __kernel_io_end; extern struct page *vmemmap; extern unsigned long pci_io_base; + +#define pmd_leaf pmd_leaf +static inline bool pmd_leaf(pmd_t pmd) +{ + return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); +} + +#define pud_leaf pud_leaf +static inline bool pud_leaf(pud_t pud) +{ + return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); +} #endif /* __ASSEMBLY__ */ #include @@ -1436,20 +1448,5 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va return false; } -/* - * Like pmd_huge(), but works regardless of config options - */ -#define pmd_leaf pmd_leaf -static inline bool pmd_leaf(pmd_t pmd) -{ - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); -} - -#define pud_leaf pud_leaf -static inline bool pud_leaf(pud_t pud) -{ - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); -} - #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */ -- 2.44.0 -- Peter Xu