From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753266AbdFMKQ2 (ORCPT ); Tue, 13 Jun 2017 06:16:28 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57329 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752354AbdFMKQZ (ORCPT ); Tue, 13 Jun 2017 06:16:25 -0400 Date: Tue, 13 Jun 2017 03:09:33 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: linux-kernel@vger.kernel.org, dave.hansen@intel.com, jpoimboe@redhat.com, bp@alien8.de, luto@kernel.org, luto@amacapital.net, hpa@zytor.com, mingo@kernel.org, brgerst@gmail.com, peterz@infradead.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, tglx@linutronix.de, kirill.shutemov@linux.intel.com, dvlasenk@redhat.com Reply-To: linux-kernel@vger.kernel.org, jpoimboe@redhat.com, dave.hansen@intel.com, bp@alien8.de, luto@kernel.org, luto@amacapital.net, hpa@zytor.com, mingo@kernel.org, peterz@infradead.org, brgerst@gmail.com, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, tglx@linutronix.de, torvalds@linux-foundation.org, dvlasenk@redhat.com In-Reply-To: <20170606113133.22974-11-kirill.shutemov@linux.intel.com> References: <20170606113133.22974-11-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm: Add sync_global_pgds() for configuration with 5-level paging Git-Commit-ID: 141efad7d7fa4f4abb3a1b19f6a968d1b1f21903 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 141efad7d7fa4f4abb3a1b19f6a968d1b1f21903 Gitweb: http://git.kernel.org/tip/141efad7d7fa4f4abb3a1b19f6a968d1b1f21903 Author: Kirill A. Shutemov AuthorDate: Tue, 6 Jun 2017 14:31:29 +0300 Committer: Ingo Molnar CommitDate: Tue, 13 Jun 2017 08:56:56 +0200 x86/mm: Add sync_global_pgds() for configuration with 5-level paging This basically restores slightly modified version of original sync_global_pgds() which we had before folded p4d was introduced. The only modification is protection against 'addr' overflow. Signed-off-by: Kirill A. Shutemov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20170606113133.22974-11-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/mm/init_64.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 95651dc..7a9497a 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -92,6 +92,44 @@ __setup("noexec32=", nonx32_setup); * When memory was added make sure all the processes MM have * suitable PGD entries in the local PGD level page. */ +#ifdef CONFIG_X86_5LEVEL +void sync_global_pgds(unsigned long start, unsigned long end) +{ + unsigned long addr; + + for (addr = start; addr <= end; addr = ALIGN(addr + 1, PGDIR_SIZE)) { + const pgd_t *pgd_ref = pgd_offset_k(addr); + struct page *page; + + /* Check for overflow */ + if (addr < start) + break; + + if (pgd_none(*pgd_ref)) + continue; + + spin_lock(&pgd_lock); + list_for_each_entry(page, &pgd_list, lru) { + pgd_t *pgd; + spinlock_t *pgt_lock; + + pgd = (pgd_t *)page_address(page) + pgd_index(addr); + /* the pgt_lock only for Xen */ + pgt_lock = &pgd_page_get_mm(page)->page_table_lock; + spin_lock(pgt_lock); + + if (!pgd_none(*pgd_ref) && !pgd_none(*pgd)) + BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref)); + + if (pgd_none(*pgd)) + set_pgd(pgd, *pgd_ref); + + spin_unlock(pgt_lock); + } + spin_unlock(&pgd_lock); + } +} +#else void sync_global_pgds(unsigned long start, unsigned long end) { unsigned long addr; @@ -135,6 +173,7 @@ void sync_global_pgds(unsigned long start, unsigned long end) spin_unlock(&pgd_lock); } } +#endif /* * NOTE: This function is marked __ref because it calls __init function