Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3717409pxv; Mon, 5 Jul 2021 04:08:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZny6lYTs2f/vnQwjrmq+nNJ2/tf2NiU0F38kgxJs61IxkxoyIwVyO/u1HBgegR+zgRsOp X-Received: by 2002:a17:907:16aa:: with SMTP id hc42mr7485787ejc.137.1625483336540; Mon, 05 Jul 2021 04:08:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625483336; cv=none; d=google.com; s=arc-20160816; b=yRZXGTYSn9cO0lhyqQSfL73UDvZDD2FHQA1uRH61jZ4Iqu0TX7oynGbqLRBEDcmOz8 0BmS2r8Z/wo+IpECy4+5nTL1t5pp6n7NP7Nrle+z3P5nVuorCTG1BIDYdEz0aaNgP38z tq2SS1rm2atIJAAXrQwVp7F9AnG/d0JjSxirfZc7rRs5brON/Ox5N2H8kVR1SsC6mjEg 4Lx3pYK9xAFUnv5wz+2jKXuet52+FKTMEjnIc8skfXjnJQmh3VQM3UNRBzsFVCR3ozkO uR38JtKkVppUCb8g1He7XeyMhelFB1l5s+R+JEY0L8qLVBOTfsqJKTRZxHnj7oRMlbSn 5x3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=GIWo48pOc4a2aKJUl/6oMAOOjO5MIDqjNBsCd6psIZs=; b=HJMy6CedYHvhwXFPdWcN7+R5QHZzWZ0tEeWUYsXtxysuIM7QW01av/v9uxExyeHZVj xaoZ4/byXWHlTFRYMOlZjX6eEQPjPD2FRsnBhrIG++VUjB5v5jxZdjEAxWMWoJo01GAe WIPwW3s3QBSesirFbSXVMvK1u5XHgzAR2suyrZkv0hoi0CRlyKO3yycNHIdemYtCis/C 1j7HGmGTQIe8q3FCzjI5SiNyWW5/Xms36PBAMscpELNyjyDazzSMwIbQPF1Z/+iZ4OMx bRpHaFogPeY0bLcv8WVfJ3m5q6De8RcOiXBnc0Fo930lFYVnoqmwPV4Q6D2ydAY0M4bT XMhw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d25si10795612edx.409.2021.07.05.04.08.33; Mon, 05 Jul 2021 04:08:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231305AbhGELKL (ORCPT + 99 others); Mon, 5 Jul 2021 07:10:11 -0400 Received: from szxga08-in.huawei.com ([45.249.212.255]:10259 "EHLO szxga08-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231243AbhGELKI (ORCPT ); Mon, 5 Jul 2021 07:10:08 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4GJN6z6RkCz1CFPK; Mon, 5 Jul 2021 19:02:03 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 5 Jul 2021 19:07:30 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 5 Jul 2021 19:07:29 +0800 From: Kefeng Wang To: Catalin Marinas , Will Deacon , Andrey Ryabinin , Andrey Konovalov , Dmitry Vyukov CC: , , , , Kefeng Wang Subject: [PATCH -next 3/3] kasan: arm64: Fix pcpu_page_first_chunk crash with KASAN_VMALLOC Date: Mon, 5 Jul 2021 19:14:53 +0800 Message-ID: <20210705111453.164230-4-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210705111453.164230-1-wangkefeng.wang@huawei.com> References: <20210705111453.164230-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With KASAN_VMALLOC and NEED_PER_CPU_PAGE_FIRST_CHUNK, it crashs, Unable to handle kernel paging request at virtual address ffff7000028f2000 ... swapper pgtable: 64k pages, 48-bit VAs, pgdp=0000000042440000 [ffff7000028f2000] pgd=000000063e7c0003, p4d=000000063e7c0003, pud=000000063e7c0003, pmd=000000063e7b0003, pte=0000000000000000 Internal error: Oops: 96000007 [#1] PREEMPT SMP Modules linked in: CPU: 0 PID: 0 Comm: swapper Not tainted 5.13.0-rc4-00003-gc6e6e28f3f30-dirty #62 Hardware name: linux,dummy-virt (DT) pstate: 200000c5 (nzCv daIF -PAN -UAO -TCO BTYPE=--) pc : kasan_check_range+0x90/0x1a0 lr : memcpy+0x88/0xf4 sp : ffff80001378fe20 ... Call trace: kasan_check_range+0x90/0x1a0 pcpu_page_first_chunk+0x3f0/0x568 setup_per_cpu_areas+0xb8/0x184 start_kernel+0x8c/0x328 The vm area used in vm_area_register_early() has no kasan shadow memory, Let's add a new kasan_populate_early_vm_area_shadow() function to populate the vm area shadow memory to fix the issue. Signed-off-by: Kefeng Wang --- arch/arm64/mm/kasan_init.c | 18 ++++++++++++++++++ include/linux/kasan.h | 2 ++ mm/kasan/init.c | 5 +++++ mm/vmalloc.c | 1 + 4 files changed, 26 insertions(+) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index 61b52a92b8b6..c295a256c573 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -287,6 +287,24 @@ static void __init kasan_init_depth(void) init_task.kasan_depth = 0; } +#ifdef CONFIG_KASAN_VMALLOC +void __init __weak kasan_populate_early_vm_area_shadow(void *start, + unsigned long size) +{ + unsigned long shadow_start, shadow_end; + + if (!is_vmalloc_or_module_addr(start)) + return; + + shadow_start = (unsigned long)kasan_mem_to_shadow(start); + shadow_start = ALIGN_DOWN(shadow_start, PAGE_SIZE); + shadow_end = (unsigned long)kasan_mem_to_shadow(start + size); + shadow_end = ALIGN(shadow_end, PAGE_SIZE); + kasan_map_populate(shadow_start, shadow_end, + early_pfn_to_nid(virt_to_pfn(start))); +} +#endif + void __init kasan_init(void) { kasan_init_shadow(); diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 5310e217bd74..79d3895b0240 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -49,6 +49,8 @@ extern p4d_t kasan_early_shadow_p4d[MAX_PTRS_PER_P4D]; int kasan_populate_early_shadow(const void *shadow_start, const void *shadow_end); +void kasan_populate_early_vm_area_shadow(void *start, unsigned long size); + static inline void *kasan_mem_to_shadow(const void *addr) { return (void *)((unsigned long)addr >> KASAN_SHADOW_SCALE_SHIFT) diff --git a/mm/kasan/init.c b/mm/kasan/init.c index cc64ed6858c6..d39577d088a1 100644 --- a/mm/kasan/init.c +++ b/mm/kasan/init.c @@ -279,6 +279,11 @@ int __ref kasan_populate_early_shadow(const void *shadow_start, return 0; } +void __init __weak kasan_populate_early_vm_area_shadow(void *start, + unsigned long size) +{ +} + static void kasan_free_pte(pte_t *pte_start, pmd_t *pmd) { pte_t *pte; diff --git a/mm/vmalloc.c b/mm/vmalloc.c index a98cf97f032f..f19e07314ee5 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2249,6 +2249,7 @@ void __init vm_area_register_early(struct vm_struct *vm, size_t align) vm->addr = (void *)addr; vm_area_add_early(vm); + kasan_populate_early_vm_area_shadow(vm->addr, vm->size); } static void vmap_init_free_space(void) -- 2.26.2