From: "Baicar, Tyler" <tbaicar@codeaurora.org> To: Punit Agrawal <punit.agrawal@arm.com>, catalin.marinas@arm.com, will.deacon@arm.com Cc: linux-arm-kernel@lists.infradead.org, steve.capper@arm.com, linux-kernel@vger.kernel.org, David Woods <dwoods@mellanox.com> Subject: Re: [PATCH 1/3] arm64: hugetlb: Fix huge_pte_offset to return poisoned page table entries Date: Fri, 14 Apr 2017 13:29:42 -0600 [thread overview] Message-ID: <a9377db2-715d-acba-bd5c-3b7b8e4d5db7@codeaurora.org> (raw) In-Reply-To: <20170412140459.21824-2-punit.agrawal@arm.com> On 4/12/2017 8:04 AM, Punit Agrawal wrote: > When memory failure is enabled, a poisoned hugepage pte is marked as a > swap entry. huge_pte_offset() does not return the poisoned page table > entries when it encounters PUD/PMD hugepages. > > This behaviour of huge_pte_offset() leads to error such as below when > munmap is called on poisoned hugepages. > > [ 344.165544] mm/pgtable-generic.c:33: bad pmd 000000083af00074. > > Fix huge_pte_offset() to return the poisoned pte which is then > appropriately handled by the generic layer code. > > Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Steve Capper <steve.capper@arm.com> > Cc: David Woods <dwoods@mellanox.com> Tested-by: Tyler Baicar <tbaicar@codeaurora.org> Thanks, Tyler > --- > arch/arm64/mm/hugetlbpage.c | 20 +++++++++++++++----- > 1 file changed, 15 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c > index 7514a000e361..5f1832165d69 100644 > --- a/arch/arm64/mm/hugetlbpage.c > +++ b/arch/arm64/mm/hugetlbpage.c > @@ -143,15 +143,24 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) > pr_debug("%s: addr:0x%lx pgd:%p\n", __func__, addr, pgd); > if (!pgd_present(*pgd)) > return NULL; > - pud = pud_offset(pgd, addr); > - if (!pud_present(*pud)) > - return NULL; > > - if (pud_huge(*pud)) > + pud = pud_offset(pgd, addr); > + /* > + * In case of HW Poisoning, a hugepage pud/pmd can contain > + * poisoned entries. Poisoned entries are marked as swap > + * entries. > + * > + * For puds/pmds that are not present, check to see if it > + * could be a swap entry (!present and !none). > + */ > + if ((!pte_present(pud_pte(*pud)) && !pud_none(*pud)) || pud_huge(*pud)) > return (pte_t *)pud; > + > pmd = pmd_offset(pud, addr); > - if (!pmd_present(*pmd)) > + if (pmd_none(*pmd)) > return NULL; > + if (!pmd_present(*pmd) && !pmd_none(*pmd)) > + return (pte_t *)pmd; > > if (pte_cont(pmd_pte(*pmd))) { > pmd = pmd_offset( > @@ -160,6 +169,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) > } > if (pmd_huge(*pmd)) > return (pte_t *)pmd; > + > pte = pte_offset_kernel(pmd, addr); > if (pte_present(*pte) && pte_cont(*pte)) { > pte = pte_offset_kernel( -- Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
WARNING: multiple messages have this Message-ID (diff)
From: tbaicar@codeaurora.org (Baicar, Tyler) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] arm64: hugetlb: Fix huge_pte_offset to return poisoned page table entries Date: Fri, 14 Apr 2017 13:29:42 -0600 [thread overview] Message-ID: <a9377db2-715d-acba-bd5c-3b7b8e4d5db7@codeaurora.org> (raw) In-Reply-To: <20170412140459.21824-2-punit.agrawal@arm.com> On 4/12/2017 8:04 AM, Punit Agrawal wrote: > When memory failure is enabled, a poisoned hugepage pte is marked as a > swap entry. huge_pte_offset() does not return the poisoned page table > entries when it encounters PUD/PMD hugepages. > > This behaviour of huge_pte_offset() leads to error such as below when > munmap is called on poisoned hugepages. > > [ 344.165544] mm/pgtable-generic.c:33: bad pmd 000000083af00074. > > Fix huge_pte_offset() to return the poisoned pte which is then > appropriately handled by the generic layer code. > > Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Steve Capper <steve.capper@arm.com> > Cc: David Woods <dwoods@mellanox.com> Tested-by: Tyler Baicar <tbaicar@codeaurora.org> Thanks, Tyler > --- > arch/arm64/mm/hugetlbpage.c | 20 +++++++++++++++----- > 1 file changed, 15 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c > index 7514a000e361..5f1832165d69 100644 > --- a/arch/arm64/mm/hugetlbpage.c > +++ b/arch/arm64/mm/hugetlbpage.c > @@ -143,15 +143,24 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) > pr_debug("%s: addr:0x%lx pgd:%p\n", __func__, addr, pgd); > if (!pgd_present(*pgd)) > return NULL; > - pud = pud_offset(pgd, addr); > - if (!pud_present(*pud)) > - return NULL; > > - if (pud_huge(*pud)) > + pud = pud_offset(pgd, addr); > + /* > + * In case of HW Poisoning, a hugepage pud/pmd can contain > + * poisoned entries. Poisoned entries are marked as swap > + * entries. > + * > + * For puds/pmds that are not present, check to see if it > + * could be a swap entry (!present and !none). > + */ > + if ((!pte_present(pud_pte(*pud)) && !pud_none(*pud)) || pud_huge(*pud)) > return (pte_t *)pud; > + > pmd = pmd_offset(pud, addr); > - if (!pmd_present(*pmd)) > + if (pmd_none(*pmd)) > return NULL; > + if (!pmd_present(*pmd) && !pmd_none(*pmd)) > + return (pte_t *)pmd; > > if (pte_cont(pmd_pte(*pmd))) { > pmd = pmd_offset( > @@ -160,6 +169,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) > } > if (pmd_huge(*pmd)) > return (pte_t *)pmd; > + > pte = pte_offset_kernel(pmd, addr); > if (pte_present(*pte) && pte_cont(*pte)) { > pte = pte_offset_kernel( -- Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2017-04-14 19:29 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-12 14:04 [PATCH 0/3] arm64: Add support for handling memory corruption Punit Agrawal 2017-04-12 14:04 ` Punit Agrawal 2017-04-12 14:04 ` [PATCH 1/3] arm64: hugetlb: Fix huge_pte_offset to return poisoned page table entries Punit Agrawal 2017-04-12 14:04 ` Punit Agrawal 2017-04-14 19:29 ` Baicar, Tyler [this message] 2017-04-14 19:29 ` Baicar, Tyler 2017-05-03 12:49 ` Catalin Marinas 2017-05-03 12:49 ` Catalin Marinas 2017-05-04 15:55 ` Punit Agrawal 2017-05-04 15:55 ` Punit Agrawal 2017-05-17 14:35 ` Timur Tabi 2017-05-17 14:35 ` Timur Tabi 2017-05-17 15:27 ` Punit Agrawal 2017-05-17 15:27 ` Punit Agrawal 2017-04-12 14:04 ` [PATCH 2/3] arm64: hwpoison: add VM_FAULT_HWPOISON[_LARGE] handling Punit Agrawal 2017-04-12 14:04 ` Punit Agrawal 2017-04-12 14:04 ` [PATCH 3/3] arm64: kconfig: allow support for memory failure handling Punit Agrawal 2017-04-12 14:04 ` Punit Agrawal
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=a9377db2-715d-acba-bd5c-3b7b8e4d5db7@codeaurora.org \ --to=tbaicar@codeaurora.org \ --cc=catalin.marinas@arm.com \ --cc=dwoods@mellanox.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=punit.agrawal@arm.com \ --cc=steve.capper@arm.com \ --cc=will.deacon@arm.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.