From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752692AbdC0Kdq (ORCPT ); Mon, 27 Mar 2017 06:33:46 -0400 Received: from terminus.zytor.com ([65.50.211.136]:48301 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752213AbdC0Kdh (ORCPT ); Mon, 27 Mar 2017 06:33:37 -0400 Date: Mon, 27 Mar 2017 03:24:37 -0700 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: kirill.shutemov@linux.intel.com, tglx@linutronix.de, luto@kernel.org, dvlasenk@redhat.com, arnd@arndb.de, bp@alien8.de, mhocko@suse.com, mingo@kernel.org, linux-kernel@vger.kernel.org, dave.hansen@intel.com, luto@amacapital.net, jpoimboe@redhat.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, dvyukov@google.com, peterz@infradead.org, hpa@zytor.com, brgerst@gmail.com Reply-To: peterz@infradead.org, hpa@zytor.com, brgerst@gmail.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, dvyukov@google.com, jpoimboe@redhat.com, luto@amacapital.net, linux-kernel@vger.kernel.org, dave.hansen@intel.com, bp@alien8.de, dvlasenk@redhat.com, arnd@arndb.de, mhocko@suse.com, mingo@kernel.org, kirill.shutemov@linux.intel.com, tglx@linutronix.de, luto@kernel.org In-Reply-To: <20170317185515.8636-5-kirill.shutemov@linux.intel.com> References: <20170317185515.8636-5-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/kasan: Prepare clear_pgds() to switch to Git-Commit-ID: d691a3cf8004784303f0a4c1c036edfaa7d64d0b 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: d691a3cf8004784303f0a4c1c036edfaa7d64d0b Gitweb: http://git.kernel.org/tip/d691a3cf8004784303f0a4c1c036edfaa7d64d0b Author: Kirill A. Shutemov AuthorDate: Fri, 17 Mar 2017 21:55:13 +0300 Committer: Ingo Molnar CommitDate: Mon, 27 Mar 2017 08:56:41 +0200 x86/kasan: Prepare clear_pgds() to switch to With folded p4d, pgd_clear() is a nop. Change clear_pgds() to use p4d_clear() instead. Signed-off-by: Kirill A. Shutemov Acked-by: Thomas Gleixner Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Arnd Bergmann Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: Dmitry Vyukov Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Michal Hocko Cc: Peter Zijlstra Cc: linux-arch@vger.kernel.org Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/20170317185515.8636-5-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- arch/x86/mm/kasan_init_64.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 8d63d7a..7b81f01 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -32,8 +32,19 @@ static int __init map_range(struct range *range) static void __init clear_pgds(unsigned long start, unsigned long end) { - for (; start < end; start += PGDIR_SIZE) - pgd_clear(pgd_offset_k(start)); + pgd_t *pgd; + + for (; start < end; start += PGDIR_SIZE) { + pgd = pgd_offset_k(start); + /* + * With folded p4d, pgd_clear() is nop, use p4d_clear() + * instead. + */ + if (CONFIG_PGTABLE_LEVELS < 5) + p4d_clear(p4d_offset(pgd, start)); + else + pgd_clear(pgd); + } } static void __init kasan_map_early_shadow(pgd_t *pgd)