From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> To: Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>, x86@kernel.org, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Arnd Bergmann <arnd@arndb.de>, "H. Peter Anvin" <hpa@zytor.com> Cc: Andi Kleen <ak@linux.intel.com>, Dave Hansen <dave.hansen@intel.com>, Andy Lutomirski <luto@amacapital.net>, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [RFC, PATCHv1 08/28] x86/gup: add 5-level paging support Date: Thu, 8 Dec 2016 19:21:30 +0300 [thread overview] Message-ID: <20161208162150.148763-10-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <20161208162150.148763-1-kirill.shutemov@linux.intel.com> It's simply extension for one more page table level. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> --- arch/x86/mm/gup.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c index b8b6a60b32cf..8b69adc10988 100644 --- a/arch/x86/mm/gup.c +++ b/arch/x86/mm/gup.c @@ -76,9 +76,9 @@ static void undo_dev_pagemap(int *nr, int nr_start, struct page **pages) } /* - * 'pteval' can come from a pte, pmd or pud. We only check + * 'pteval' can come from a pte, pmd, pud or p4d. We only check * _PAGE_PRESENT, _PAGE_USER, and _PAGE_RW in here which are the - * same value on all 3 types. + * same value on all 4 types. */ static inline int pte_allows_gup(unsigned long pteval, int write) { @@ -270,13 +270,13 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr, return 1; } -static int gup_pud_range(pgd_t pgd, unsigned long addr, unsigned long end, +static int gup_pud_range(p4d_t p4d, unsigned long addr, unsigned long end, int write, struct page **pages, int *nr) { unsigned long next; pud_t *pudp; - pudp = pud_offset(&pgd, addr); + pudp = pud_offset(&p4d, addr); do { pud_t pud = *pudp; @@ -295,6 +295,27 @@ static int gup_pud_range(pgd_t pgd, unsigned long addr, unsigned long end, return 1; } +static int gup_p4d_range(pgd_t pgd, unsigned long addr, unsigned long end, + int write, struct page **pages, int *nr) +{ + unsigned long next; + p4d_t *p4dp; + + p4dp = p4d_offset(&pgd, addr); + do { + p4d_t p4d = *p4dp; + + next = p4d_addr_end(addr, end); + if (p4d_none(p4d)) + return 0; + BUILD_BUG_ON(p4d_large(p4d)); + if (!gup_pud_range(p4d, addr, next, write, pages, nr)) + return 0; + } while (p4dp++, addr = next, addr != end); + + return 1; +} + /* * Like get_user_pages_fast() except its IRQ-safe in that it won't fall * back to the regular GUP. @@ -343,7 +364,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, next = pgd_addr_end(addr, end); if (pgd_none(pgd)) break; - if (!gup_pud_range(pgd, addr, next, write, pages, &nr)) + if (!gup_p4d_range(pgd, addr, next, write, pages, &nr)) break; } while (pgdp++, addr = next, addr != end); local_irq_restore(flags); @@ -415,7 +436,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, next = pgd_addr_end(addr, end); if (pgd_none(pgd)) goto slow; - if (!gup_pud_range(pgd, addr, next, write, pages, &nr)) + if (!gup_p4d_range(pgd, addr, next, write, pages, &nr)) goto slow; } while (pgdp++, addr = next, addr != end); local_irq_enable(); -- 2.10.2 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> To: Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>, x86@kernel.org, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Arnd Bergmann <arnd@arndb.de>, "H. Peter Anvin" <hpa@zytor.com> Cc: Andi Kleen <ak@linux.intel.com>, Dave Hansen <dave.hansen@intel.com>, Andy Lutomirski <luto@amacapital.net>, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [RFC, PATCHv1 08/28] x86/gup: add 5-level paging support Date: Thu, 8 Dec 2016 19:21:30 +0300 [thread overview] Message-ID: <20161208162150.148763-10-kirill.shutemov@linux.intel.com> (raw) Message-ID: <20161208162130.PV35t7ErOBBqkp-KSRAF6lBCgZkq2D0KhbrAtvIGgRM@z> (raw) In-Reply-To: <20161208162150.148763-1-kirill.shutemov@linux.intel.com> It's simply extension for one more page table level. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> --- arch/x86/mm/gup.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c index b8b6a60b32cf..8b69adc10988 100644 --- a/arch/x86/mm/gup.c +++ b/arch/x86/mm/gup.c @@ -76,9 +76,9 @@ static void undo_dev_pagemap(int *nr, int nr_start, struct page **pages) } /* - * 'pteval' can come from a pte, pmd or pud. We only check + * 'pteval' can come from a pte, pmd, pud or p4d. We only check * _PAGE_PRESENT, _PAGE_USER, and _PAGE_RW in here which are the - * same value on all 3 types. + * same value on all 4 types. */ static inline int pte_allows_gup(unsigned long pteval, int write) { @@ -270,13 +270,13 @@ static noinline int gup_huge_pud(pud_t pud, unsigned long addr, return 1; } -static int gup_pud_range(pgd_t pgd, unsigned long addr, unsigned long end, +static int gup_pud_range(p4d_t p4d, unsigned long addr, unsigned long end, int write, struct page **pages, int *nr) { unsigned long next; pud_t *pudp; - pudp = pud_offset(&pgd, addr); + pudp = pud_offset(&p4d, addr); do { pud_t pud = *pudp; @@ -295,6 +295,27 @@ static int gup_pud_range(pgd_t pgd, unsigned long addr, unsigned long end, return 1; } +static int gup_p4d_range(pgd_t pgd, unsigned long addr, unsigned long end, + int write, struct page **pages, int *nr) +{ + unsigned long next; + p4d_t *p4dp; + + p4dp = p4d_offset(&pgd, addr); + do { + p4d_t p4d = *p4dp; + + next = p4d_addr_end(addr, end); + if (p4d_none(p4d)) + return 0; + BUILD_BUG_ON(p4d_large(p4d)); + if (!gup_pud_range(p4d, addr, next, write, pages, nr)) + return 0; + } while (p4dp++, addr = next, addr != end); + + return 1; +} + /* * Like get_user_pages_fast() except its IRQ-safe in that it won't fall * back to the regular GUP. @@ -343,7 +364,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, next = pgd_addr_end(addr, end); if (pgd_none(pgd)) break; - if (!gup_pud_range(pgd, addr, next, write, pages, &nr)) + if (!gup_p4d_range(pgd, addr, next, write, pages, &nr)) break; } while (pgdp++, addr = next, addr != end); local_irq_restore(flags); @@ -415,7 +436,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, next = pgd_addr_end(addr, end); if (pgd_none(pgd)) goto slow; - if (!gup_pud_range(pgd, addr, next, write, pages, &nr)) + if (!gup_p4d_range(pgd, addr, next, write, pages, &nr)) goto slow; } while (pgdp++, addr = next, addr != end); local_irq_enable(); -- 2.10.2
next prev parent reply other threads:[~2016-12-08 16:21 UTC|newest] Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-08 16:21 [RFC, PATCHv1 00/28] 5-level paging Kirill A. Shutemov 2016-12-08 16:21 ` [QEMU, PATCH] x86: implement la57 paging mode Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:48 ` [Qemu-devel] " no-reply 2016-12-08 16:48 ` no-reply 2016-12-08 16:21 ` [RFC, PATCHv1 01/28] asm-generic: introduce 5level-fixup.h Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 02/28] asm-generic: introduce __ARCH_USE_5LEVEL_HACK Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 03/28] arch, mm: convert all architectures to use 5level-fixup.h Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 04/28] asm-generic: introduce <asm-generic/pgtable-nop4d.h> Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 05/28] mm: convert generic code to 5-level paging Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 06/28] x86: basic changes into headers for " Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 07/28] x86: trivial portion of 5-level paging conversion Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov [this message] 2016-12-08 16:21 ` [RFC, PATCHv1 08/28] x86/gup: add 5-level paging support Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 09/28] x86/ident_map: " Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 10/28] x86/mm: add support of p4d_t in vmalloc_fault() Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 11/28] x86/power: support p4d_t in hibernate code Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 12/28] x86/kexec: support p4d_t Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 13/28] x86: convert the rest of the code to " Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 14/28] mm: introduce __p4d_alloc() Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 15/28] x86: detect 5-level paging support Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 20:05 ` Borislav Petkov 2016-12-08 20:08 ` Linus Torvalds 2016-12-08 20:08 ` Linus Torvalds 2016-12-08 20:20 ` Borislav Petkov 2016-12-13 22:44 ` H. Peter Anvin 2016-12-13 22:44 ` H. Peter Anvin 2016-12-13 23:07 ` Boris Petkov 2016-12-13 23:07 ` Boris Petkov 2016-12-15 14:39 ` Borislav Petkov 2016-12-15 14:39 ` Borislav Petkov 2016-12-15 17:52 ` hpa 2016-12-15 17:52 ` hpa 2016-12-15 19:09 ` Borislav Petkov 2016-12-15 19:20 ` Andi Kleen 2016-12-15 19:20 ` Andi Kleen 2016-12-15 20:52 ` hpa 2016-12-15 20:52 ` hpa 2016-12-15 20:57 ` hpa 2016-12-15 20:57 ` hpa 2016-12-09 15:32 ` Kirill A. Shutemov 2016-12-09 16:33 ` Borislav Petkov 2016-12-13 22:50 ` H. Peter Anvin 2016-12-13 22:50 ` H. Peter Anvin 2016-12-08 16:21 ` [RFC, PATCHv1 16/28] x86/asm: remove __VIRTUAL_MASK_SHIFT==47 assert Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 18:39 ` Andy Lutomirski 2016-12-08 19:22 ` Kirill A. Shutemov 2016-12-08 19:22 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 17/28] x86/mm: define virtual memory map for 5-level paging Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 18:56 ` Randy Dunlap 2016-12-08 19:24 ` Kirill A. Shutemov 2016-12-08 19:24 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 18/28] x86/paravirt: make paravirt code support " Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 19/28] x86/mm: basic defines/helpers for CONFIG_X86_5LEVEL Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 20/28] x86/dump_pagetables: support 5-level paging Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 21/28] x86/mm: extend kasan to " Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 22/28] x86/espfix: " Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 18:40 ` Andy Lutomirski 2016-12-08 18:40 ` Andy Lutomirski 2016-12-12 14:22 ` Kirill A. Shutemov 2016-12-12 14:22 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 23/28] x86/mm: add support of additional page table level during early boot Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 24/28] x86/mm: add sync_global_pgds() for configuration with 5-level paging Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 18:42 ` Andy Lutomirski 2016-12-08 19:33 ` Kirill A. Shutemov 2016-12-08 19:33 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 25/28] x86/mm: make kernel_physical_mapping_init() support " Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 26/28] x86/mm: add support for 5-level paging for KASLR Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 27/28] x86: enable la57 support Kirill A. Shutemov 2016-12-08 16:21 ` Kirill A. Shutemov 2016-12-08 16:21 ` [RFC, PATCHv1 28/28] TESTING-ONLY: bump TASK_SIZE_MAX Kirill A. Shutemov 2016-12-08 18:16 ` [RFC, PATCHv1 00/28] 5-level paging Linus Torvalds 2016-12-08 18:16 ` Linus Torvalds 2016-12-08 18:26 ` hpa 2016-12-08 18:26 ` hpa 2016-12-08 19:20 ` Kirill A. Shutemov 2016-12-08 19:20 ` Kirill A. Shutemov 2016-12-09 5:01 ` Ingo Molnar 2016-12-09 5:01 ` Ingo Molnar 2016-12-09 10:24 ` Arnd Bergmann 2016-12-09 10:51 ` Catalin Marinas 2016-12-09 10:51 ` Catalin Marinas 2016-12-09 10:37 ` Kirill A. Shutemov 2016-12-09 10:37 ` Kirill A. Shutemov 2016-12-09 16:40 ` Andi Kleen 2016-12-09 17:21 ` Kirill A. Shutemov 2016-12-09 17:21 ` Kirill A. Shutemov 2016-12-09 16:49 ` Dave Hansen 2016-12-09 16:49 ` Dave Hansen 2016-12-13 21:06 ` Dave Hansen 2016-12-13 21:06 ` Dave Hansen
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=20161208162150.148763-10-kirill.shutemov@linux.intel.com \ --to=kirill.shutemov@linux.intel.com \ --cc=ak@linux.intel.com \ --cc=akpm@linux-foundation.org \ --cc=arnd@arndb.de \ --cc=dave.hansen@intel.com \ --cc=hpa@zytor.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=luto@amacapital.net \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.org \ --cc=x86@kernel.org \ /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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).