From patchwork Sun Feb 27 13:47:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lecopzer Chen X-Patchwork-Id: 12761699 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7587CC433FE for ; Sun, 27 Feb 2022 13:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9NSvYQdc7EXilW7jHNanRwVHHKQ+UWU7DuosPYzDMY0=; b=EqMf1E/9C+WhMY /2FNccsabTAZUWfKjROi+MEZ29ElLq+zqZu5zvVb5fftQ1CEwD/4guCcdpEPT8TwcixSHc2HgBxsP xEjOzXrHB/Xq31cdIt0rb2+o933EeujNqGiecd+ub7F4N6UbQ1WhLkAoumMwS1FJ9Ka2fsHfufZ63 9deHJMLEQMRNyqr69ubjtlIZf+LLZ7f3KlRMmq6k+wWBJ7K43/9TU/d9f9jtCwBHSXtzqmAafpJfg 1KWlroA5d0f6kTXeX4jXzUIV/N2osaGtFUB+LdbNQiE9yv4iOIY/Vk8v4kDhhHsPDhWI5qK61/WoL hr+KI081k/ojzR94QJHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOJuU-009H68-MR; Sun, 27 Feb 2022 13:48:26 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOJuI-009H4J-RT for linux-arm-kernel@lists.infradead.org; Sun, 27 Feb 2022 13:48:20 +0000 X-UUID: 50a68fe01fb04c5a8d6fe377c4b560a1-20220227 X-UUID: 50a68fe01fb04c5a8d6fe377c4b560a1-20220227 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2104388539; Sun, 27 Feb 2022 06:48:06 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 27 Feb 2022 05:48:05 -0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Sun, 27 Feb 2022 21:48:03 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sun, 27 Feb 2022 21:48:03 +0800 From: Lecopzer Chen To: , CC: , , , , , , , , , , , , , , , , , Subject: [PATCH v3 1/2] arm: kasan: support CONFIG_KASAN_VMALLOC Date: Sun, 27 Feb 2022 21:47:25 +0800 Message-ID: <20220227134726.27584-2-lecopzer.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220227134726.27584-1-lecopzer.chen@mediatek.com> References: <20220227134726.27584-1-lecopzer.chen@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220227_054814_920338_1DB72B21 X-CRM114-Status: GOOD ( 12.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Simply make shadow of vmalloc area mapped on demand. Since the virtual address of vmalloc for Arm is also between MODULE_VADDR and 0x100000000 (ZONE_HIGHMEM), which means the shadow address has already included between KASAN_SHADOW_START and KASAN_SHADOW_END. Thus we need to change nothing for memory map of Arm. This can fix ARM_MODULE_PLTS with KASan, support KASan for higmem and provide the first step to support CONFIG_VMAP_STACK with Arm. Signed-off-by: Lecopzer Chen --- arch/arm/Kconfig | 1 + arch/arm/include/asm/kasan_def.h | 11 ++++++++++- arch/arm/mm/kasan_init.c | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4c97cb40eebb..78250e246cc6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -72,6 +72,7 @@ config ARM select HAVE_ARCH_KFENCE if MMU && !XIP_KERNEL select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL + select HAVE_ARCH_KASAN_VMALLOC if HAVE_ARCH_KASAN select HAVE_ARCH_MMAP_RND_BITS if MMU select HAVE_ARCH_PFN_VALID select HAVE_ARCH_SECCOMP diff --git a/arch/arm/include/asm/kasan_def.h b/arch/arm/include/asm/kasan_def.h index 5739605aa7cf..96fd1d3b5a0c 100644 --- a/arch/arm/include/asm/kasan_def.h +++ b/arch/arm/include/asm/kasan_def.h @@ -19,7 +19,16 @@ * space to use as shadow memory for KASan as follows: * * +----+ 0xffffffff - * | | \ + * | |\ + * | | |-> ZONE_HIGHMEM for vmalloc virtual address space. + * | | | Such as vmalloc(), GFP_HIGHUSER (__GFP__HIGHMEM), + * | | | module address using ARM_MODULE_PLTS, etc. + * | | | + * | | | If CONFIG_KASAN_VMALLOC=y, this area would populate + * | | | shadow address on demand. + * | |/ + * +----+ VMALLOC_START + * | |\ * | | |-> Static kernel image (vmlinux) BSS and page table * | |/ * +----+ PAGE_OFFSET diff --git a/arch/arm/mm/kasan_init.c b/arch/arm/mm/kasan_init.c index 5ad0d6c56d56..29caee9c79ce 100644 --- a/arch/arm/mm/kasan_init.c +++ b/arch/arm/mm/kasan_init.c @@ -236,7 +236,11 @@ void __init kasan_init(void) clear_pgds(KASAN_SHADOW_START, KASAN_SHADOW_END); - kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_START), + if (!IS_ENABLED(CONFIG_KASAN_VMALLOC)) + kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_START), + kasan_mem_to_shadow((void *)VMALLOC_END)); + + kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_END), kasan_mem_to_shadow((void *)-1UL) + 1); for_each_mem_range(i, &pa_start, &pa_end) {