From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1757435AbdJKIcn (ORCPT <rfc822;w@1wt.eu>);
        Wed, 11 Oct 2017 04:32:43 -0400
Received: from szxga05-in.huawei.com ([45.249.212.191]:7559 "EHLO
        szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S932693AbdJKI2M (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 11 Oct 2017 04:28:12 -0400
From: Abbott Liu <liuwenliang@huawei.com>
To: <linux@armlinux.org.uk>, <aryabinin@virtuozzo.com>,
        <liuwenliang@huawei.com>, <afzal.mohd.ma@gmail.com>,
        <f.fainelli@gmail.com>, <labbott@redhat.com>,
        <kirill.shutemov@linux.intel.com>, <mhocko@suse.com>,
        <cdall@linaro.org>, <marc.zyngier@arm.com>, <catalin.marinas@arm.com>,
        <akpm@linux-foundation.org>, <mawilcox@microsoft.com>,
        <tglx@linutronix.de>, <thgarnie@google.com>, <keescook@chromium.org>,
        <arnd@arndb.de>, <vladimir.murzin@arm.com>, <tixy@linaro.org>,
        <ard.biesheuvel@linaro.org>, <robin.murphy@arm.com>,
        <mingo@kernel.org>, <grygorii.strashko@linaro.org>
CC: <glider@google.com>, <dvyukov@google.com>, <opendmb@gmail.com>,
        <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
        <kasan-dev@googlegroups.com>, <linux-mm@kvack.org>,
        <jiazhenghua@huawei.com>, <dylix.dailei@huawei.com>,
        <zengweilin@huawei.com>, <heshaoliang@huawei.com>
Subject: [PATCH 11/11] Add KASan layout
Date: Wed, 11 Oct 2017 16:22:27 +0800
Message-ID: <20171011082227.20546-12-liuwenliang@huawei.com>
X-Mailer: git-send-email 2.9.0
In-Reply-To: <20171011082227.20546-1-liuwenliang@huawei.com>
References: <20171011082227.20546-1-liuwenliang@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.67.54.198]
X-CFilter-Loop: Reflected
X-Mirapoint-Virus-RAPID-Raw: score=unknown(0),
        refid=str=0001.0A020205.59DDD540.00A4,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0,
        ip=0.0.0.0,
        so=2014-11-16 11:51:01,
        dmn=2013-03-21 17:37:32
X-Mirapoint-Loop-Id: 562eb21c0277f287a5f203acf4964f8d
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add KASan layout into virtual kernel memory layout.

Cc: Andrey Ryabinin <a.ryabinin@samsung.com>
---
 arch/arm/mm/init.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index ad80548..b490cf4 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -537,6 +537,9 @@ void __init mem_init(void)
 #ifdef CONFIG_MODULES
 			"    modules : 0x%08lx - 0x%08lx   (%4ld MB)\n"
 #endif
+#ifdef CONFIG_KASAN
+			"    kasan   : 0x%08lx - 0x%08lx   (%4ld MB)\n"
+#endif
 			"      .text : 0x%p" " - 0x%p" "   (%4td kB)\n"
 			"      .init : 0x%p" " - 0x%p" "   (%4td kB)\n"
 			"      .data : 0x%p" " - 0x%p" "   (%4td kB)\n"
@@ -557,6 +560,9 @@ void __init mem_init(void)
 #ifdef CONFIG_MODULES
 			MLM(MODULES_VADDR, MODULES_END),
 #endif
+#ifdef CONFIG_KASAN
+			MLM(KASAN_SHADOW_START, KASAN_SHADOW_END),
+#endif
 
 			MLK_ROUNDUP(_text, _etext),
 			MLK_ROUNDUP(__init_begin, __init_end),
-- 
2.9.0