<html><head></head><body><div class="ydp43be65e7yahoo-style-wrap" style="font-family:Helvetica Neue, Helvetica, Arial, sans-serif;font-size:13px;"><div></div>
<div><br></div><div><br></div>
</div><div class="yahoo_quoted" id="yahoo_quoted_7972670871">
<div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;color:#26282a;">
<div>
On Wednesday, April 22, 2020, 05:52:05 PM EDT, Anders Roxell <anders.roxell@linaro.org> wrote:
</div>
<div><br></div>
<div><br></div>
<div><div dir="ltr">On Mon, 20 Apr 2020 at 23:43, Mike Kravetz <<a href="mailto:mike.kravetz@oracle.com" ymailto="mailto:mike.kravetz@oracle.com">mike.kravetz@oracle.com</a>> wrote:<br></div><div dir="ltr">><br></div><div dir="ltr">> On 4/20/20 1:29 PM, Anders Roxell wrote:<br></div><div dir="ltr">> > On Mon, 20 Apr 2020 at 20:23, Mike Kravetz <<a href="mailto:mike.kravetz@oracle.com" ymailto="mailto:mike.kravetz@oracle.com">mike.kravetz@oracle.com</a>> wrote:<br></div><div dir="ltr">> >> On 4/20/20 8:34 AM, Qian Cai wrote:<br></div><div dir="ltr">> >>><br></div><div dir="ltr">> >>> Reverted this series fixed many undefined behaviors on arm64 with the config,<br></div><div dir="ltr">> >> While rearranging the code (patch 3 in series), I made the incorrect<br></div><div dir="ltr">> >> assumption that CONT_XXX_SIZE == (1UL << CONT_XXX_SHIFT). However,<br></div><div dir="ltr">> >> this is not the case. Does the following patch fix these issues?<br></div><div dir="ltr">> >><br></div><div dir="ltr">> >> From b75cb4a0852e208bee8c4eb347dc076fcaa88859 Mon Sep 17 00:00:00 2001<br></div><div dir="ltr">> >> From: Mike Kravetz <<a href="mailto:mike.kravetz@oracle.com" ymailto="mailto:mike.kravetz@oracle.com">mike.kravetz@oracle.com</a>><br></div><div dir="ltr">> >> Date: Mon, 20 Apr 2020 10:41:18 -0700<br></div><div dir="ltr">> >> Subject: [PATCH] arm64/hugetlb: fix hugetlb initialization<br></div><div dir="ltr">> >><br></div><div dir="ltr">> >> When calling hugetlb_add_hstate() to initialize a new hugetlb size,<br></div><div dir="ltr">> >> be sure to use correct huge pages size order.<br></div><div dir="ltr">> >><br></div><div dir="ltr">> >> Signed-off-by: Mike Kravetz <<a href="mailto:mike.kravetz@oracle.com" ymailto="mailto:mike.kravetz@oracle.com">mike.kravetz@oracle.com</a>><br></div><div dir="ltr">> >> ---<br></div><div dir="ltr">> >> arch/arm64/mm/hugetlbpage.c | 8 ++++----<br></div><div dir="ltr">> >> 1 file changed, 4 insertions(+), 4 deletions(-)<br></div><div dir="ltr">> >><br></div><div dir="ltr">> >> diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c<br></div><div dir="ltr">> >> index 9ca840527296..a02411a1f19a 100644<br></div><div dir="ltr">> >> --- a/arch/arm64/mm/hugetlbpage.c<br></div><div dir="ltr">> >> +++ b/arch/arm64/mm/hugetlbpage.c<br></div><div dir="ltr">> >> @@ -453,11 +453,11 @@ void huge_ptep_clear_flush(struct vm_area_struct *vma,<br></div><div dir="ltr">> >> static int __init hugetlbpage_init(void)<br></div><div dir="ltr">> >> {<br></div><div dir="ltr">> >> #ifdef CONFIG_ARM64_4K_PAGES<br></div><div dir="ltr">> >> - hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT);<br></div><div dir="ltr">> >> + hugetlb_add_hstate(ilog2(PUD_SIZE) - PAGE_SHIFT);<br></div><div dir="ltr">> >> #endif<br></div><div dir="ltr">> >> - hugetlb_add_hstate(CONT_PMD_SHIFT - PAGE_SHIFT);<br></div><div dir="ltr">> >> - hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT);<br></div><div dir="ltr">> >> - hugetlb_add_hstate(CONT_PTE_SHIFT - PAGE_SHIFT);<br></div><div dir="ltr">> >> + hugetlb_add_hstate(ilog2(CONT_PMD_SIZE) - PAGE_SHIFT);<br></div><div dir="ltr">> >> + hugetlb_add_hstate(ilog2(PMD_SIZE) - PAGE_SHIFT);<br></div><div dir="ltr">> >> + hugetlb_add_hstate(ilog2(CONT_PTE_SIZE) - PAGE_SHIFT);<br></div><div dir="ltr">> >><br></div><div dir="ltr">> >> return 0;<br></div><div dir="ltr">> >> }<br></div><div dir="ltr">> ><br></div><div dir="ltr">> > I build this for an arm64 kernel and ran it in qemu and it worked.<br></div><div dir="ltr">><br></div><div dir="ltr">> Thanks for testing Anders!<br></div><div dir="ltr">><br></div><div dir="ltr">> Will, here is an updated version of the patch based on your suggestion.<br></div><div dir="ltr">> I added the () for emphasis but that may just be noise for some. Also,<br></div><div dir="ltr">> the naming differences and values for CONT_PTE may make some people<br></div><div dir="ltr">> look twice. Not sure if being consistent here helps?<br></div><div dir="ltr">><br></div><div dir="ltr">> I have only built this. No testing.<br></div><div dir="ltr">><br></div><div dir="ltr">> From daf833ab6b806ecc0816d84d45dcbacc052a7eec Mon Sep 17 00:00:00 2001<br></div><div dir="ltr">> From: Mike Kravetz <<a href="mailto:mike.kravetz@oracle.com" ymailto="mailto:mike.kravetz@oracle.com">mike.kravetz@oracle.com</a>><br></div><div dir="ltr">> Date: Mon, 20 Apr 2020 13:56:15 -0700<br></div><div dir="ltr">> Subject: [PATCH] arm64/hugetlb: fix hugetlb initialization<br></div><div dir="ltr">><br></div><div dir="ltr">> When calling hugetlb_add_hstate() to initialize a new hugetlb size,<br></div><div dir="ltr">> be sure to use correct huge pages size order.<br></div><div dir="ltr">><br></div><div dir="ltr">> Signed-off-by: Mike Kravetz <<a href="mailto:mike.kravetz@oracle.com" ymailto="mailto:mike.kravetz@oracle.com">mike.kravetz@oracle.com</a>><br></div><div dir="ltr"><br></div><div dir="ltr">Tested-by: Anders Roxell <<a href="mailto:anders.roxell@linaro.org" ymailto="mailto:anders.roxell@linaro.org">anders.roxell@linaro.org</a>><br></div><div dir="ltr"><br></div><div dir="ltr">I tested this patch on qemu-aarch64.<br></div><div dir="ltr"><br></div><div dir="ltr">Cheers,<br></div><div dir="ltr">Anders<br></div><div dir="ltr"><br></div><div dir="ltr">> ---<br></div><div dir="ltr">> arch/arm64/mm/hugetlbpage.c | 4 ++--<br></div><div dir="ltr">> 1 file changed, 2 insertions(+), 2 deletions(-)<br></div><div dir="ltr">><br></div><div dir="ltr">> diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c<br></div><div dir="ltr">> index 9ca840527296..bed6dc7c4276 100644<br></div><div dir="ltr">> --- a/arch/arm64/mm/hugetlbpage.c<br></div><div dir="ltr">> +++ b/arch/arm64/mm/hugetlbpage.c<br></div><div dir="ltr">> @@ -455,9 +455,9 @@ static int __init hugetlbpage_init(void)<br></div><div dir="ltr">> #ifdef CONFIG_ARM64_4K_PAGES<br></div><div dir="ltr">> hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT);<br></div><div dir="ltr">> #endif<br></div><div dir="ltr">> - hugetlb_add_hstate(CONT_PMD_SHIFT - PAGE_SHIFT);<br></div><div dir="ltr">> + hugetlb_add_hstate((CONT_PMD_SHIFT + PMD_SHIFT) - PAGE_SHIFT);<br></div><div dir="ltr">> hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT);<br></div><div dir="ltr">> - hugetlb_add_hstate(CONT_PTE_SHIFT - PAGE_SHIFT);<br></div><div dir="ltr">> + hugetlb_add_hstate((CONT_PTE_SHIFT + PAGE_SHIFT) - PAGE_SHIFT);<br></div><div dir="ltr">><br></div><div dir="ltr">> return 0;<br></div><div dir="ltr">> }<br></div><div dir="ltr">> --<br></div><div dir="ltr">> 2.25.2<br></div><div dir="ltr">><br></div><div dir="ltr"><br></div><div dir="ltr">_______________________________________________<br></div><div dir="ltr">linux-arm-kernel mailing list<br></div><div dir="ltr"><a href="mailto:linux-arm-kernel@lists.infradead.org" ymailto="mailto:linux-arm-kernel@lists.infradead.org">linux-arm-kernel@lists.infradead.org</a><br></div><div dir="ltr"><a href="http://lists.infradead.org/mailman/listinfo/linux-arm-kernel" target="_blank">http://lists.infradead.org/mailman/listinfo/linux-arm-kernel</a><br></div><div dir="ltr"><br></div><div dir="ltr">-- <br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp <br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">derp<br></div><div dir="ltr">--- <br></div><div dir="ltr">You received this message because you are subscribed to the Google Groups "derpyderpderp" group.<br></div><div dir="ltr">To unsubscribe from this group and stop receiving emails from it, send an email to derpyderpderp+<a href="mailto:unsubscribe@googlegroups.com." ymailto="mailto:unsubscribe@googlegroups.com.">unsubscribe@googlegroups.com.</a><br></div></div>
</div>
</div></body></html>