From: Nathan Chancellor <nathan@kernel.org> To: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Cc: linux-mm@kvack.org, akpm@linux-foundation.org, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, kaleshsingh@google.com, npiggin@gmail.com, joel@joelfernandes.org, Christophe Leroy <christophe.leroy@csgroup.eu> Subject: Re: [PATCH v5 3/9] mm/mremap: Use pmd/pud_poplulate to update page table entries Date: Wed, 19 May 2021 11:02:37 -0700 [thread overview] Message-ID: <4bc25749-9ae8-6591-f4f6-4ef1c209d3a0@kernel.org> (raw) In-Reply-To: <87mtsrqqk0.fsf@linux.ibm.com> On 5/18/2021 9:46 PM, Aneesh Kumar K.V wrote: > Nathan Chancellor <nathan@kernel.org> writes: > >> Hi Aneesh, >> >> On Thu, Apr 22, 2021 at 11:13:17AM +0530, Aneesh Kumar K.V wrote: >>> pmd/pud_populate is the right interface to be used to set the respective >>> page table entries. Some architectures like ppc64 do assume that set_pmd/pud_at >>> can only be used to set a hugepage PTE. Since we are not setting up a hugepage >>> PTE here, use the pmd/pud_populate interface. >>> >>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> >>> --- >>> mm/mremap.c | 7 +++---- >>> 1 file changed, 3 insertions(+), 4 deletions(-) >>> >>> diff --git a/mm/mremap.c b/mm/mremap.c >>> index ec8f840399ed..574287f9bb39 100644 >>> --- a/mm/mremap.c >>> +++ b/mm/mremap.c >>> @@ -26,6 +26,7 @@ >>> >>> #include <asm/cacheflush.h> >>> #include <asm/tlbflush.h> >>> +#include <asm/pgalloc.h> >>> >>> #include "internal.h" >>> >>> @@ -257,9 +258,8 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr, >>> pmd_clear(old_pmd); >>> >>> VM_BUG_ON(!pmd_none(*new_pmd)); >>> + pmd_populate(mm, new_pmd, (pgtable_t)pmd_page_vaddr(pmd)); >>> >>> - /* Set the new pmd */ >>> - set_pmd_at(mm, new_addr, new_pmd, pmd); >>> flush_tlb_range(vma, old_addr, old_addr + PMD_SIZE); >>> if (new_ptl != old_ptl) >>> spin_unlock(new_ptl); >>> @@ -306,8 +306,7 @@ static bool move_normal_pud(struct vm_area_struct *vma, unsigned long old_addr, >>> >>> VM_BUG_ON(!pud_none(*new_pud)); >>> >>> - /* Set the new pud */ >>> - set_pud_at(mm, new_addr, new_pud, pud); >>> + pud_populate(mm, new_pud, (pmd_t *)pud_page_vaddr(pud)); >>> flush_tlb_range(vma, old_addr, old_addr + PUD_SIZE); >>> if (new_ptl != old_ptl) >>> spin_unlock(new_ptl); >>> -- >>> 2.30.2 >>> >>> >> >> This commit causes my WSL2 VM to close when compiling something memory >> intensive, such as an x86_64_defconfig + CONFIG_LTO_CLANG_FULL=y kernel >> or LLVM/Clang. Unfortunately, I do not have much further information to >> provide since I do not see any sort of splat in dmesg right before it >> closes and I have found zero information about getting the previous >> kernel message in WSL2 (custom init so no systemd or anything). >> >> The config file is the stock one from Microsoft: >> >> https://github.com/microsoft/WSL2-Linux-Kernel/blob/a571dc8cedc8e0e56487c0dc93243e0b5db8960a/Microsoft/config-wsl >> >> I have attached my .config anyways, which includes CONFIG_DEBUG_VM, >> which does not appear to show anything out of the ordinary. I have also >> attached a dmesg just in case anything sticks out. I am happy to provide >> any additional information or perform additional debugging steps as >> needed. >> > > Can you try this change? Thank you for the quick diff! This resolves my issue. Tested-by: Nathan Chancellor <nathan@kernel.org> > modified mm/mremap.c > @@ -279,7 +279,7 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr, > pmd_clear(old_pmd); > > VM_BUG_ON(!pmd_none(*new_pmd)); > - pmd_populate(mm, new_pmd, (pgtable_t)pmd_page_vaddr(pmd)); > + pmd_populate(mm, new_pmd, pmd_pgtable(pmd)); > > if (new_ptl != old_ptl) > spin_unlock(new_ptl); >
WARNING: multiple messages have this Message-ID (diff)
From: Nathan Chancellor <nathan@kernel.org> To: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Cc: npiggin@gmail.com, linux-mm@kvack.org, kaleshsingh@google.com, joel@joelfernandes.org, akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v5 3/9] mm/mremap: Use pmd/pud_poplulate to update page table entries Date: Wed, 19 May 2021 11:02:37 -0700 [thread overview] Message-ID: <4bc25749-9ae8-6591-f4f6-4ef1c209d3a0@kernel.org> (raw) In-Reply-To: <87mtsrqqk0.fsf@linux.ibm.com> On 5/18/2021 9:46 PM, Aneesh Kumar K.V wrote: > Nathan Chancellor <nathan@kernel.org> writes: > >> Hi Aneesh, >> >> On Thu, Apr 22, 2021 at 11:13:17AM +0530, Aneesh Kumar K.V wrote: >>> pmd/pud_populate is the right interface to be used to set the respective >>> page table entries. Some architectures like ppc64 do assume that set_pmd/pud_at >>> can only be used to set a hugepage PTE. Since we are not setting up a hugepage >>> PTE here, use the pmd/pud_populate interface. >>> >>> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> >>> --- >>> mm/mremap.c | 7 +++---- >>> 1 file changed, 3 insertions(+), 4 deletions(-) >>> >>> diff --git a/mm/mremap.c b/mm/mremap.c >>> index ec8f840399ed..574287f9bb39 100644 >>> --- a/mm/mremap.c >>> +++ b/mm/mremap.c >>> @@ -26,6 +26,7 @@ >>> >>> #include <asm/cacheflush.h> >>> #include <asm/tlbflush.h> >>> +#include <asm/pgalloc.h> >>> >>> #include "internal.h" >>> >>> @@ -257,9 +258,8 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr, >>> pmd_clear(old_pmd); >>> >>> VM_BUG_ON(!pmd_none(*new_pmd)); >>> + pmd_populate(mm, new_pmd, (pgtable_t)pmd_page_vaddr(pmd)); >>> >>> - /* Set the new pmd */ >>> - set_pmd_at(mm, new_addr, new_pmd, pmd); >>> flush_tlb_range(vma, old_addr, old_addr + PMD_SIZE); >>> if (new_ptl != old_ptl) >>> spin_unlock(new_ptl); >>> @@ -306,8 +306,7 @@ static bool move_normal_pud(struct vm_area_struct *vma, unsigned long old_addr, >>> >>> VM_BUG_ON(!pud_none(*new_pud)); >>> >>> - /* Set the new pud */ >>> - set_pud_at(mm, new_addr, new_pud, pud); >>> + pud_populate(mm, new_pud, (pmd_t *)pud_page_vaddr(pud)); >>> flush_tlb_range(vma, old_addr, old_addr + PUD_SIZE); >>> if (new_ptl != old_ptl) >>> spin_unlock(new_ptl); >>> -- >>> 2.30.2 >>> >>> >> >> This commit causes my WSL2 VM to close when compiling something memory >> intensive, such as an x86_64_defconfig + CONFIG_LTO_CLANG_FULL=y kernel >> or LLVM/Clang. Unfortunately, I do not have much further information to >> provide since I do not see any sort of splat in dmesg right before it >> closes and I have found zero information about getting the previous >> kernel message in WSL2 (custom init so no systemd or anything). >> >> The config file is the stock one from Microsoft: >> >> https://github.com/microsoft/WSL2-Linux-Kernel/blob/a571dc8cedc8e0e56487c0dc93243e0b5db8960a/Microsoft/config-wsl >> >> I have attached my .config anyways, which includes CONFIG_DEBUG_VM, >> which does not appear to show anything out of the ordinary. I have also >> attached a dmesg just in case anything sticks out. I am happy to provide >> any additional information or perform additional debugging steps as >> needed. >> > > Can you try this change? Thank you for the quick diff! This resolves my issue. Tested-by: Nathan Chancellor <nathan@kernel.org> > modified mm/mremap.c > @@ -279,7 +279,7 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr, > pmd_clear(old_pmd); > > VM_BUG_ON(!pmd_none(*new_pmd)); > - pmd_populate(mm, new_pmd, (pgtable_t)pmd_page_vaddr(pmd)); > + pmd_populate(mm, new_pmd, pmd_pgtable(pmd)); > > if (new_ptl != old_ptl) > spin_unlock(new_ptl); >
next prev parent reply other threads:[~2021-05-19 18:02 UTC|newest] Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-22 5:43 [PATCH v5 0/9] Speedup mremap on ppc64 Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-04-22 5:43 ` [PATCH v5 1/9] selftest/mremap_test: Update the test to handle pagesize other than 4K Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-04-22 5:43 ` [PATCH v5 2/9] selftest/mremap_test: Avoid crash with static build Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-04-22 5:43 ` [PATCH v5 3/9] mm/mremap: Use pmd/pud_poplulate to update page table entries Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-05-18 20:04 ` Nathan Chancellor 2021-05-18 20:04 ` Nathan Chancellor 2021-05-19 4:46 ` Aneesh Kumar K.V 2021-05-19 4:46 ` Aneesh Kumar K.V 2021-05-19 18:02 ` Nathan Chancellor [this message] 2021-05-19 18:02 ` Nathan Chancellor 2021-05-20 2:18 ` Peter Xu 2021-05-20 2:18 ` Peter Xu 2021-05-20 8:26 ` Aneesh Kumar K.V 2021-05-20 8:26 ` Aneesh Kumar K.V 2021-05-20 12:46 ` Peter Xu 2021-05-20 12:46 ` Peter Xu 2021-05-20 13:23 ` Aneesh Kumar K.V 2021-05-20 13:23 ` Aneesh Kumar K.V 2021-05-20 13:37 ` Aneesh Kumar K.V 2021-05-20 13:37 ` Aneesh Kumar K.V 2021-05-20 14:57 ` Peter Xu 2021-05-20 14:57 ` Peter Xu 2021-05-20 19:06 ` Zi Yan 2021-05-20 19:06 ` Zi Yan 2021-05-20 20:01 ` Peter Xu 2021-05-20 20:01 ` Peter Xu 2021-05-20 20:25 ` Kalesh Singh 2021-05-20 20:25 ` Kalesh Singh 2021-04-22 5:43 ` [PATCH v5 4/9] powerpc/mm/book3s64: Fix possible build error Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-04-22 5:43 ` [PATCH v5 5/9] powerpc/mm/book3s64: Update tlb flush routines to take a page walk cache flush argument Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-05-15 16:35 ` Guenter Roeck 2021-05-15 16:35 ` Guenter Roeck 2021-05-15 20:41 ` Andrew Morton 2021-05-15 20:41 ` Andrew Morton 2021-05-15 23:05 ` Guenter Roeck 2021-05-15 23:05 ` Guenter Roeck 2021-05-17 8:40 ` Aneesh Kumar K.V 2021-05-17 8:40 ` Aneesh Kumar K.V 2021-05-17 13:38 ` Guenter Roeck 2021-05-17 13:38 ` Guenter Roeck 2021-05-17 13:55 ` Aneesh Kumar K.V 2021-05-17 13:55 ` Aneesh Kumar K.V 2021-05-17 14:18 ` Guenter Roeck 2021-05-17 14:18 ` Guenter Roeck 2021-05-19 0:26 ` Michael Ellerman 2021-05-19 0:26 ` Michael Ellerman 2021-05-19 0:45 ` Segher Boessenkool 2021-05-19 0:45 ` Segher Boessenkool 2021-05-19 12:03 ` Segher Boessenkool 2021-05-19 13:37 ` Guenter Roeck 2021-05-19 14:20 ` Segher Boessenkool 2021-05-19 14:20 ` Segher Boessenkool 2021-05-19 15:28 ` Guenter Roeck 2021-05-19 15:28 ` Guenter Roeck 2021-05-20 7:37 ` Michael Ellerman 2021-05-20 12:17 ` Segher Boessenkool 2021-05-19 1:08 ` Guenter Roeck 2021-05-19 1:08 ` Guenter Roeck 2021-05-20 11:38 ` Michael Ellerman 2021-05-20 11:38 ` Michael Ellerman 2021-05-20 11:56 ` Guenter Roeck 2021-05-20 11:56 ` Guenter Roeck 2021-04-22 5:43 ` [PATCH v5 6/9] mm/mremap: Use range flush that does TLB and page walk cache flush Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-04-22 5:43 ` [PATCH v5 7/9] mm/mremap: Move TLB flush outside page table lock Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-05-20 15:26 ` Aneesh Kumar K.V 2021-05-20 15:26 ` Aneesh Kumar K.V 2021-05-20 16:57 ` Aneesh Kumar K.V 2021-05-20 16:57 ` Aneesh Kumar K.V 2021-05-21 2:40 ` Linus Torvalds 2021-05-21 2:40 ` Linus Torvalds 2021-05-21 3:03 ` Aneesh Kumar K.V 2021-05-21 3:03 ` Aneesh Kumar K.V 2021-05-21 3:28 ` Aneesh Kumar K.V 2021-05-21 3:28 ` Aneesh Kumar K.V 2021-05-21 6:13 ` Linus Torvalds 2021-05-21 6:13 ` Linus Torvalds 2021-05-21 12:50 ` Aneesh Kumar K.V 2021-05-21 12:50 ` Aneesh Kumar K.V 2021-05-21 13:03 ` Aneesh Kumar K.V 2021-05-21 13:03 ` Aneesh Kumar K.V 2021-05-21 16:03 ` Linus Torvalds 2021-05-21 16:03 ` Linus Torvalds 2021-05-21 16:29 ` Aneesh Kumar K.V 2021-05-21 16:29 ` Aneesh Kumar K.V 2021-05-24 14:24 ` Aneesh Kumar K.V 2021-05-24 14:24 ` Aneesh Kumar K.V 2021-05-21 15:24 ` Liam Howlett 2021-05-21 15:24 ` Liam Howlett 2021-05-21 16:02 ` Aneesh Kumar K.V 2021-05-21 16:02 ` Aneesh Kumar K.V 2021-05-21 16:05 ` Linus Torvalds 2021-05-21 16:05 ` Linus Torvalds 2021-04-22 5:43 ` [PATCH v5 8/9] mm/mremap: Allow arch runtime override Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-04-22 5:43 ` [PATCH v5 9/9] powerpc/mm: Enable move pmd/pud Aneesh Kumar K.V 2021-04-22 5:43 ` Aneesh Kumar K.V 2021-05-11 22:19 ` Andrew Morton 2021-05-11 22:19 ` Andrew Morton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4bc25749-9ae8-6591-f4f6-4ef1c209d3a0@kernel.org \ --to=nathan@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=aneesh.kumar@linux.ibm.com \ --cc=christophe.leroy@csgroup.eu \ --cc=joel@joelfernandes.org \ --cc=kaleshsingh@google.com \ --cc=linux-mm@kvack.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.