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>, Michal Hocko <mhocko@suse.com>, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCHv2 7/7] mm: introduce __p4d_alloc() Date: Thu, 9 Mar 2017 17:24:08 +0300 [thread overview] Message-ID: <20170309142408.2868-8-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <20170309142408.2868-1-kirill.shutemov@linux.intel.com> For full 5-level paging we need a helper to allocate p4d page table. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Michal Hocko <mhocko@suse.com> --- mm/memory.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 7f1c2163b3ce..235ba51b2fbf 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3906,6 +3906,29 @@ int handle_mm_fault(struct vm_area_struct *vma, unsigned long address, } EXPORT_SYMBOL_GPL(handle_mm_fault); +#ifndef __PAGETABLE_P4D_FOLDED +/* + * Allocate p4d page table. + * We've already handled the fast-path in-line. + */ +int __p4d_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) +{ + p4d_t *new = p4d_alloc_one(mm, address); + if (!new) + return -ENOMEM; + + smp_wmb(); /* See comment in __pte_alloc */ + + spin_lock(&mm->page_table_lock); + if (pgd_present(*pgd)) /* Another has populated it */ + p4d_free(mm, new); + else + pgd_populate(mm, pgd, new); + spin_unlock(&mm->page_table_lock); + return 0; +} +#endif /* __PAGETABLE_P4D_FOLDED */ + #ifndef __PAGETABLE_PUD_FOLDED /* * Allocate page upper directory. -- 2.11.0 -- 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>, Michal Hocko <mhocko@suse.com>, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCHv2 7/7] mm: introduce __p4d_alloc() Date: Thu, 9 Mar 2017 17:24:08 +0300 [thread overview] Message-ID: <20170309142408.2868-8-kirill.shutemov@linux.intel.com> (raw) Message-ID: <20170309142408.ndftI9-wB7HsUd_8pKeQ8CQC-KksaC5Y90VwTIzKEe4@z> (raw) In-Reply-To: <20170309142408.2868-1-kirill.shutemov@linux.intel.com> For full 5-level paging we need a helper to allocate p4d page table. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Michal Hocko <mhocko@suse.com> --- mm/memory.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mm/memory.c b/mm/memory.c index 7f1c2163b3ce..235ba51b2fbf 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3906,6 +3906,29 @@ int handle_mm_fault(struct vm_area_struct *vma, unsigned long address, } EXPORT_SYMBOL_GPL(handle_mm_fault); +#ifndef __PAGETABLE_P4D_FOLDED +/* + * Allocate p4d page table. + * We've already handled the fast-path in-line. + */ +int __p4d_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) +{ + p4d_t *new = p4d_alloc_one(mm, address); + if (!new) + return -ENOMEM; + + smp_wmb(); /* See comment in __pte_alloc */ + + spin_lock(&mm->page_table_lock); + if (pgd_present(*pgd)) /* Another has populated it */ + p4d_free(mm, new); + else + pgd_populate(mm, pgd, new); + spin_unlock(&mm->page_table_lock); + return 0; +} +#endif /* __PAGETABLE_P4D_FOLDED */ + #ifndef __PAGETABLE_PUD_FOLDED /* * Allocate page upper directory. -- 2.11.0
next prev parent reply other threads:[~2017-03-09 14:24 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-09 14:24 [PATCHv2 0/7] 5-level paging: prepare generic code Kirill A. Shutemov 2017-03-09 14:24 ` Kirill A. Shutemov 2017-03-09 14:24 ` [PATCHv2 1/7] x86/cpufeature: Add 5-level paging detection Kirill A. Shutemov 2017-03-09 14:24 ` Kirill A. Shutemov 2017-03-09 14:24 ` [PATCHv2 2/7] asm-generic: introduce 5level-fixup.h Kirill A. Shutemov 2017-03-09 14:24 ` Kirill A. Shutemov 2017-03-09 14:24 ` [PATCHv2 3/7] asm-generic: introduce __ARCH_USE_5LEVEL_HACK Kirill A. Shutemov 2017-03-09 14:24 ` Kirill A. Shutemov 2017-03-09 14:24 ` [PATCHv2 4/7] arch, mm: convert all architectures to use 5level-fixup.h Kirill A. Shutemov 2017-03-09 14:24 ` Kirill A. Shutemov 2017-03-09 14:24 ` [PATCHv2 5/7] asm-generic: introduce <asm-generic/pgtable-nop4d.h> Kirill A. Shutemov 2017-03-09 14:24 ` Kirill A. Shutemov 2017-03-09 14:24 ` [PATCHv2 6/7] mm: convert generic code to 5-level paging Kirill A. Shutemov 2017-03-09 14:24 ` Kirill A. Shutemov 2017-03-14 16:14 ` [PATCHv2,6/7] " Heiko Stübner 2017-03-14 17:06 ` Kirill A. Shutemov 2017-03-14 17:06 ` Kirill A. Shutemov 2017-03-14 18:55 ` Heiko Stübner 2017-03-14 18:55 ` Heiko Stübner 2017-03-09 14:24 ` Kirill A. Shutemov [this message] 2017-03-09 14:24 ` [PATCHv2 7/7] mm: introduce __p4d_alloc() Kirill A. Shutemov 2017-03-09 20:26 ` [PATCHv2 0/7] 5-level paging: prepare generic code Linus Torvalds 2017-03-09 20:26 ` Linus Torvalds
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=20170309142408.2868-8-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=mhocko@suse.com \ --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).