Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1630329 > unrolled thread

[PATCH] x86/mm/64: Fix crash in remove_pagetable()

Started by"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
First post2017-04-25 11:30 +0200
Last post2017-04-26 10:40 +0200
Articles 5 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] x86/mm/64: Fix crash in remove_pagetable() "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-04-25 11:30 +0200
    Re: [PATCH] x86/mm/64: Fix crash in remove_pagetable() Dan Williams <dan.j.williams@intel.com> - 2017-04-25 18:50 +0200
      Re: [PATCH] x86/mm/64: Fix crash in remove_pagetable() Ingo Molnar <mingo@kernel.org> - 2017-04-25 21:00 +0200
        Re: [PATCH] x86/mm/64: Fix crash in remove_pagetable() Dan Williams <dan.j.williams@intel.com> - 2017-04-25 21:10 +0200
    [tip:x86/mm] x86/mm/64: Fix crash in remove_pagetable() "tip-bot for Kirill A. Shutemov" <tipbot@zytor.com> - 2017-04-26 10:40 +0200

#1630329 — [PATCH] x86/mm/64: Fix crash in remove_pagetable()

From"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Date2017-04-25 11:30 +0200
Subject[PATCH] x86/mm/64: Fix crash in remove_pagetable()
Message-ID<tA4Xf-2Ow-5@gated-at.bofh.it>
remove_pagetable() does page walk using p*d_page_vaddr() plus cast.
It's not canonical approach -- we usually use p*d_offset() for that.

It works fine as long as all page table levels are present. We broke the
invariant by introducing folded p4d page table level.

As result, remove_pagetable() interprets PMD as PUD and it leads to
crash:

	BUG: unable to handle kernel paging request at ffff880300000000
	IP: memchr_inv+0x60/0x110
	PGD 317d067
	P4D 317d067
	PUD 3180067
	PMD 33f102067
	PTE 8000000300000060

Let's fix this by using p*d_offset() instead of p*d_page_vaddr() for
page walk.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reported-by: Dan Williams <dan.j.williams@intel.com>
Fixes: f2a6a7050109 ("x86: Convert the rest of the code to support p4d_t")
---
 arch/x86/mm/init_64.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a242139df8fe..745e5e183169 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -962,7 +962,7 @@ remove_pud_table(pud_t *pud_start, unsigned long addr, unsigned long end,
 			continue;
 		}
 
-		pmd_base = (pmd_t *)pud_page_vaddr(*pud);
+		pmd_base = pmd_offset(pud, 0);
 		remove_pmd_table(pmd_base, addr, next, direct);
 		free_pmd_table(pmd_base, pud);
 	}
@@ -988,7 +988,7 @@ remove_p4d_table(p4d_t *p4d_start, unsigned long addr, unsigned long end,
 
 		BUILD_BUG_ON(p4d_large(*p4d));
 
-		pud_base = (pud_t *)p4d_page_vaddr(*p4d);
+		pud_base = pud_offset(p4d, 0);
 		remove_pud_table(pud_base, addr, next, direct);
 		free_pud_table(pud_base, p4d);
 	}
@@ -1013,7 +1013,7 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct)
 		if (!pgd_present(*pgd))
 			continue;
 
-		p4d = (p4d_t *)pgd_page_vaddr(*pgd);
+		p4d = p4d_offset(pgd, 0);
 		remove_p4d_table(p4d, addr, next, direct);
 	}
 
-- 
2.11.0

[toc] | [next] | [standalone]

#1630781

FromDan Williams <dan.j.williams@intel.com>
Date2017-04-25 18:50 +0200
Message-ID<tAbP3-7aO-5@gated-at.bofh.it>
In reply to#1630329
On Tue, Apr 25, 2017 at 2:25 AM, Kirill A. Shutemov
<kirill.shutemov@linux.intel.com> wrote:
> remove_pagetable() does page walk using p*d_page_vaddr() plus cast.
> It's not canonical approach -- we usually use p*d_offset() for that.
>
> It works fine as long as all page table levels are present. We broke the
> invariant by introducing folded p4d page table level.
>
> As result, remove_pagetable() interprets PMD as PUD and it leads to
> crash:
>
>         BUG: unable to handle kernel paging request at ffff880300000000
>         IP: memchr_inv+0x60/0x110
>         PGD 317d067
>         P4D 317d067
>         PUD 3180067
>         PMD 33f102067
>         PTE 8000000300000060
>
> Let's fix this by using p*d_offset() instead of p*d_page_vaddr() for
> page walk.
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> Reported-by: Dan Williams <dan.j.williams@intel.com>
> Fixes: f2a6a7050109 ("x86: Convert the rest of the code to support p4d_t")

Thanks! This patch on top of tip/master passes a full run of the
nvdimm regression suite.

Tested-by: Dan Williams <dan.j.williams@intel.com>

[toc] | [prev] | [next] | [standalone]

#1630910

FromIngo Molnar <mingo@kernel.org>
Date2017-04-25 21:00 +0200
Message-ID<tAdQR-8r1-1@gated-at.bofh.it>
In reply to#1630781
* Dan Williams <dan.j.williams@intel.com> wrote:

> On Tue, Apr 25, 2017 at 2:25 AM, Kirill A. Shutemov
> <kirill.shutemov@linux.intel.com> wrote:
> > remove_pagetable() does page walk using p*d_page_vaddr() plus cast.
> > It's not canonical approach -- we usually use p*d_offset() for that.
> >
> > It works fine as long as all page table levels are present. We broke the
> > invariant by introducing folded p4d page table level.
> >
> > As result, remove_pagetable() interprets PMD as PUD and it leads to
> > crash:
> >
> >         BUG: unable to handle kernel paging request at ffff880300000000
> >         IP: memchr_inv+0x60/0x110
> >         PGD 317d067
> >         P4D 317d067
> >         PUD 3180067
> >         PMD 33f102067
> >         PTE 8000000300000060
> >
> > Let's fix this by using p*d_offset() instead of p*d_page_vaddr() for
> > page walk.
> >
> > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> > Reported-by: Dan Williams <dan.j.williams@intel.com>
> > Fixes: f2a6a7050109 ("x86: Convert the rest of the code to support p4d_t")
> 
> Thanks! This patch on top of tip/master passes a full run of the
> nvdimm regression suite.
> 
> Tested-by: Dan Williams <dan.j.williams@intel.com>

Does a re-application of:

  "x86/mm/gup: Switch GUP to the generic get_user_page_fast() implementation"

still work (which you can achive via 'git revert 6dd29b3df975'), or is that 
another breakage?

Thanks,

	Ingo

[toc] | [prev] | [next] | [standalone]

#1630918

FromDan Williams <dan.j.williams@intel.com>
Date2017-04-25 21:10 +0200
Message-ID<tAe0y-hF-11@gated-at.bofh.it>
In reply to#1630910
On Tue, Apr 25, 2017 at 11:53 AM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * Dan Williams <dan.j.williams@intel.com> wrote:
>
>> On Tue, Apr 25, 2017 at 2:25 AM, Kirill A. Shutemov
>> <kirill.shutemov@linux.intel.com> wrote:
>> > remove_pagetable() does page walk using p*d_page_vaddr() plus cast.
>> > It's not canonical approach -- we usually use p*d_offset() for that.
>> >
>> > It works fine as long as all page table levels are present. We broke the
>> > invariant by introducing folded p4d page table level.
>> >
>> > As result, remove_pagetable() interprets PMD as PUD and it leads to
>> > crash:
>> >
>> >         BUG: unable to handle kernel paging request at ffff880300000000
>> >         IP: memchr_inv+0x60/0x110
>> >         PGD 317d067
>> >         P4D 317d067
>> >         PUD 3180067
>> >         PMD 33f102067
>> >         PTE 8000000300000060
>> >
>> > Let's fix this by using p*d_offset() instead of p*d_page_vaddr() for
>> > page walk.
>> >
>> > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
>> > Reported-by: Dan Williams <dan.j.williams@intel.com>
>> > Fixes: f2a6a7050109 ("x86: Convert the rest of the code to support p4d_t")
>>
>> Thanks! This patch on top of tip/master passes a full run of the
>> nvdimm regression suite.
>>
>> Tested-by: Dan Williams <dan.j.williams@intel.com>
>
> Does a re-application of:
>
>   "x86/mm/gup: Switch GUP to the generic get_user_page_fast() implementation"
>
> still work (which you can achive via 'git revert 6dd29b3df975'), or is that
> another breakage?

That's another breakage. We're discussing how to resolve it in this thread:

    http://www.spinics.net/lists/linux-mm/msg126056.html

[toc] | [prev] | [next] | [standalone]

#1631242 — [tip:x86/mm] x86/mm/64: Fix crash in remove_pagetable()

From"tip-bot for Kirill A. Shutemov" <tipbot@zytor.com>
Date2017-04-26 10:40 +0200
Subject[tip:x86/mm] x86/mm/64: Fix crash in remove_pagetable()
Message-ID<tAqEq-8cm-7@gated-at.bofh.it>
In reply to#1630329
Commit-ID:  e6ab9c4d437764c7fb728d428dc9e717cdb183d0
Gitweb:     http://git.kernel.org/tip/e6ab9c4d437764c7fb728d428dc9e717cdb183d0
Author:     Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate: Tue, 25 Apr 2017 12:25:57 +0300
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 26 Apr 2017 08:26:43 +0200

x86/mm/64: Fix crash in remove_pagetable()

remove_pagetable() does page walk using p*d_page_vaddr() plus cast.
It's not canonical approach -- we usually use p*d_offset() for that.

It works fine as long as all page table levels are present. We broke the
invariant by introducing folded p4d page table level.

As result, remove_pagetable() interprets PMD as PUD and it leads to
crash:

	BUG: unable to handle kernel paging request at ffff880300000000
	IP: memchr_inv+0x60/0x110
	PGD 317d067
	P4D 317d067
	PUD 3180067
	PMD 33f102067
	PTE 8000000300000060

Let's fix this by using p*d_offset() instead of p*d_page_vaddr() for
page walk.

Reported-by: Dan Williams <dan.j.williams@intel.com>
Tested-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Fixes: f2a6a7050109 ("x86: Convert the rest of the code to support p4d_t")
Link: http://lkml.kernel.org/r/20170425092557.21852-1-kirill.shutemov@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/mm/init_64.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a242139..745e5e1 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -962,7 +962,7 @@ remove_pud_table(pud_t *pud_start, unsigned long addr, unsigned long end,
 			continue;
 		}
 
-		pmd_base = (pmd_t *)pud_page_vaddr(*pud);
+		pmd_base = pmd_offset(pud, 0);
 		remove_pmd_table(pmd_base, addr, next, direct);
 		free_pmd_table(pmd_base, pud);
 	}
@@ -988,7 +988,7 @@ remove_p4d_table(p4d_t *p4d_start, unsigned long addr, unsigned long end,
 
 		BUILD_BUG_ON(p4d_large(*p4d));
 
-		pud_base = (pud_t *)p4d_page_vaddr(*p4d);
+		pud_base = pud_offset(p4d, 0);
 		remove_pud_table(pud_base, addr, next, direct);
 		free_pud_table(pud_base, p4d);
 	}
@@ -1013,7 +1013,7 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct)
 		if (!pgd_present(*pgd))
 			continue;
 
-		p4d = (p4d_t *)pgd_page_vaddr(*pgd);
+		p4d = p4d_offset(pgd, 0);
 		remove_p4d_table(p4d, addr, next, direct);
 	}

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web