From patchwork Thu Aug 3 21:23:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Tatashin X-Patchwork-Id: 9879833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 25B7A60360 for ; Thu, 3 Aug 2017 21:26:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECD1428971 for ; Thu, 3 Aug 2017 21:26:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CEAAC28968; Thu, 3 Aug 2017 21:26:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2245D2896D for ; Thu, 3 Aug 2017 21:26:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OIljXKmLAKfIZIRZ05U9rsrJ/6yUwx/2SsuzMGlAoSE=; b=Xe2N7qownp2+F/ 7/gXgrZ103tW3c51A43sxrmqV7QhVDs+7+FgvyLNZYkssD8kdMRjkcFaKPFHfYIJE4A0b+z9hQ2bf R+7mdC/n+03zefmuIlstlLypt+I+/OIPllIi0GSI6m+HVjV1eScRcAq0PpvePi5QfaHMEAosR6jyF gz5T3JsPskfNNZJwod+L1G1lvEeQXg401JAwr2+iH2jCe1pdKF42QXVEhzbrednzKhsO8TVNpghhA hblElf3pk36t/pHIKWZQegV9ImbtizUS+jrpA7C11E4ngp/EjQy0U+B/m5ZcGI6P/Vzm24iMeuyp7 g3aRzHopQxEqdB1jEMTw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ddNd6-00066j-6M; Thu, 03 Aug 2017 21:26:04 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ddNcS-0005Oy-To for linux-arm-kernel@bombadil.infradead.org; Thu, 03 Aug 2017 21:25:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=1TN2ODzX91xBy/GjsWCNOFtZnJbvXtqSzcpQQ2Ttp5A=; b=VXBktXk+HYgXQ9P4kFgcMyTcU 9MqvaaD6auTEND3aR2J94jWlaAu8qAyQs5V+vMs8dvRbHIdiNixN4L3oyEyguWkm4RU/+uT0uRIlz W8d1bKZndxbcRCZ16xkfn9/PwtkjamUGIsliXKYXL8PLYn2GsdzYizVNtkgpwkWMG7zqDLCdZyUGI PK80gjtYR6ZJqzl1WODunoPnXms/Qh+/X1xDoI9KjhPcEOjQzNhJF1nsQtkzF5d/b/p4U5WH6ZSz8 /hHWXP/JZ3B84yOzeJ3iFQ1qKruVGbpu0ZdlNoUwsH/r6QN1F3vH6SEj2Fy1cZNOOOz1eFZkLeQpy 9ut2ZZ0WA==; Received: from aserp1040.oracle.com ([141.146.126.69]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ddNcP-0007Mz-Rl for linux-arm-kernel@lists.infradead.org; Thu, 03 Aug 2017 21:25:23 +0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v73LOB61002472 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Aug 2017 21:24:11 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v73LOBBG031451 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Aug 2017 21:24:11 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v73LOBgF028524; Thu, 3 Aug 2017 21:24:11 GMT Received: from ca-ldom-ol-build-1.us.oracle.com (/10.129.68.23) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 03 Aug 2017 14:24:10 -0700 From: Pavel Tatashin To: linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org, kasan-dev@googlegroups.com, borntraeger@de.ibm.com, heiko.carstens@de.ibm.com, davem@davemloft.net, willy@infradead.org, mhocko@kernel.org Subject: [v5 10/15] x86/kasan: explicitly zero kasan shadow memory Date: Thu, 3 Aug 2017 17:23:48 -0400 Message-Id: <1501795433-982645-11-git-send-email-pasha.tatashin@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1501795433-982645-1-git-send-email-pasha.tatashin@oracle.com> References: <1501795433-982645-1-git-send-email-pasha.tatashin@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170803_222522_116129_8735331F X-CRM114-Status: GOOD ( 12.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To optimize the performance of struct page initialization, vmemmap_populate() will no longer zero memory. We must explicitly zero the memory that is allocated by vmemmap_populate() for kasan, as this memory does not go through struct page initialization path. Signed-off-by: Pavel Tatashin Reviewed-by: Steven Sistare Reviewed-by: Daniel Jordan Reviewed-by: Bob Picco --- arch/x86/mm/kasan_init_64.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 02c9d7553409..7d06cf0b0b6e 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -84,6 +84,28 @@ static struct notifier_block kasan_die_notifier = { }; #endif +/* + * Memory that was allocated by vmemmap_populate is not zeroed, so we must + * zero it here explicitly. + */ +static void +zero_vemmap_populated_memory(void) +{ + u64 i, start, end; + + for (i = 0; i < E820_MAX_ENTRIES && pfn_mapped[i].end; i++) { + void *kaddr_start = pfn_to_kaddr(pfn_mapped[i].start); + void *kaddr_end = pfn_to_kaddr(pfn_mapped[i].end); + + start = (u64)kasan_mem_to_shadow(kaddr_start); + end = (u64)kasan_mem_to_shadow(kaddr_end); + memset((void *)start, 0, end - start); + } + start = (u64)kasan_mem_to_shadow(_stext); + end = (u64)kasan_mem_to_shadow(_end); + memset((void *)start, 0, end - start); +} + void __init kasan_early_init(void) { int i; @@ -156,6 +178,13 @@ void __init kasan_init(void) pte_t pte = __pte(__pa(kasan_zero_page) | __PAGE_KERNEL_RO); set_pte(&kasan_zero_pte[i], pte); } + + /* + * vmemmap_populate does not zero the memory, so we need to zero it + * explicitly + */ + zero_vemmap_populated_memory(); + /* Flush TLBs again to be sure that write protection applied. */ __flush_tlb_all();