From patchwork Wed Jan 8 15:20:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 11323911 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E00E96C1 for ; Wed, 8 Jan 2020 15:22:23 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1CEB20673 for ; Wed, 8 Jan 2020 15:22:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="a+kQydgx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1CEB20673 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ipD9B-0003oK-1I; Wed, 08 Jan 2020 15:21:25 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ipD9A-0003nx-8V for xen-devel@lists.xen.org; Wed, 08 Jan 2020 15:21:24 +0000 X-Inumbo-ID: 8227be69-322a-11ea-b82c-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8227be69-322a-11ea-b82c-12813bfff9fa; Wed, 08 Jan 2020 15:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1578496874; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=ZJuSUJ02rylweO0QTHeZK87XYdE2eEfNMSYEfZ4ISFU=; b=a+kQydgxFvlyDSw0YNezEjXH3qmAA0fqpWNlXazO+Ar21k+MvXGyGXRT IqDF2FFg5oyDbPabMLBNxJKVz6PfK0wUgj9J7nFXOB7TCxQxOeYfqgBlp tQwCdg8INza5hzv7VABI7AJz17uTZh7iNSMWd3Akfir9pZU9Sx5YkPHDD A=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=sergey.dyasli@citrix.com; spf=Pass smtp.mailfrom=sergey.dyasli@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of sergey.dyasli@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="sergey.dyasli@citrix.com"; x-sender="sergey.dyasli@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of sergey.dyasli@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="sergey.dyasli@citrix.com"; x-sender="sergey.dyasli@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="sergey.dyasli@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: DX+ggOVcUV+qjAM+GH2sUSi46yljxph9UiDZ5OvdtBvqC5kMO1PziVlbeWDiErFsikLJupbr6j e1GJp5zCy/6F3zEoqeeNBUnp1jCorCX2Lv0Aiur8r6exMyKmwDqJuw2jGva+/nJJXFvTQ2Ugl7 MsXEecRWjr/VWKfr79oqpWhGuobCwHKJmBbBKn4tqnGTrqWdR7mqh2Qt3c/YNqtAyzHNee9e/R zXaizezM7fqVpwm8zpKNd8k535daqotbAfc1B7wEgWYPCbpvlXlweSc7xS8pQwblpvCKKTD4np 1yI= X-SBRS: 2.7 X-MesageID: 11004137 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,410,1571716800"; d="scan'208";a="11004137" From: Sergey Dyasli To: , , , Date: Wed, 8 Jan 2020 15:20:58 +0000 Message-ID: <20200108152100.7630-3-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200108152100.7630-1-sergey.dyasli@citrix.com> References: <20200108152100.7630-1-sergey.dyasli@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v1 2/4] x86/xen: add basic KASAN support for PV kernel X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Sergey Dyasli , Stefano Stabellini , George Dunlap , Ross Lagerwall , Alexander Potapenko , Andrey Ryabinin , Boris Ostrovsky , Andrew Morton , Dmitry Vyukov Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This enables to use Outline instrumentation for Xen PV kernels. KASAN_INLINE and KASAN_VMALLOC options currently lead to boot crashes and hence disabled. Signed-off-by: Sergey Dyasli Reported-by: kbuild test robot Reported-by: kbuild test robot --- RFC --> v1: - New functions with declarations in xen/xen-ops.h - Fixed the issue with free_kernel_image_pages() with the help of xen_pv_kasan_unpin_pgd() --- arch/x86/mm/kasan_init_64.c | 12 ++++++++++++ arch/x86/xen/Makefile | 7 +++++++ arch/x86/xen/enlighten_pv.c | 3 +++ arch/x86/xen/mmu_pv.c | 39 +++++++++++++++++++++++++++++++++++++ drivers/xen/Makefile | 2 ++ include/xen/xen-ops.h | 4 ++++ kernel/Makefile | 2 ++ lib/Kconfig.kasan | 3 ++- 8 files changed, 71 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index cf5bc37c90ac..902a6a152d33 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -13,6 +13,9 @@ #include #include +#include +#include + #include #include #include @@ -332,6 +335,11 @@ void __init kasan_early_init(void) for (i = 0; pgtable_l5_enabled() && i < PTRS_PER_P4D; i++) kasan_early_shadow_p4d[i] = __p4d(p4d_val); + if (xen_pv_domain()) { + pgd_t *pv_top_pgt = xen_pv_kasan_early_init(); + kasan_map_early_shadow(pv_top_pgt); + } + kasan_map_early_shadow(early_top_pgt); kasan_map_early_shadow(init_top_pgt); } @@ -369,6 +377,8 @@ void __init kasan_init(void) __pgd(__pa(tmp_p4d_table) | _KERNPG_TABLE)); } + xen_pv_kasan_pin_pgd(early_top_pgt); + load_cr3(early_top_pgt); __flush_tlb_all(); @@ -433,6 +443,8 @@ void __init kasan_init(void) load_cr3(init_top_pgt); __flush_tlb_all(); + xen_pv_kasan_unpin_pgd(early_top_pgt); + /* * kasan_early_shadow_page has been used as early shadow memory, thus * it may contain some garbage. Now we can clear and write protect it, diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 084de77a109e..102fad0b0bca 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -1,3 +1,10 @@ +KASAN_SANITIZE_enlighten_pv.o := n +KASAN_SANITIZE_enlighten.o := n +KASAN_SANITIZE_irq.o := n +KASAN_SANITIZE_mmu_pv.o := n +KASAN_SANITIZE_p2m.o := n +KASAN_SANITIZE_multicalls.o := n + # SPDX-License-Identifier: GPL-2.0 OBJECT_FILES_NON_STANDARD_xen-asm_$(BITS).o := y diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index ae4a41ca19f6..27de55699f24 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -72,6 +72,7 @@ #include #include #include +#include #ifdef CONFIG_ACPI #include @@ -1231,6 +1232,8 @@ asmlinkage __visible void __init xen_start_kernel(void) /* Get mfn list */ xen_build_dynamic_phys_to_machine(); + kasan_early_init(); + /* * Set up kernel GDT and segment registers, mainly so that * -fstack-protector code can be executed. diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index c8dbee62ec2a..cf6ff214d9ea 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -1771,6 +1771,36 @@ static void __init set_page_prot(void *addr, pgprot_t prot) { return set_page_prot_flags(addr, prot, UVMF_NONE); } + +pgd_t * __init xen_pv_kasan_early_init(void) +{ + /* PV page tables must be read-only */ + set_page_prot(kasan_early_shadow_pud, PAGE_KERNEL_RO); + set_page_prot(kasan_early_shadow_pmd, PAGE_KERNEL_RO); + set_page_prot(kasan_early_shadow_pte, PAGE_KERNEL_RO); + + /* Return a pointer to the initial PV page tables */ + return (pgd_t *)xen_start_info->pt_base; +} + +void __init xen_pv_kasan_pin_pgd(pgd_t *pgd) +{ + if (!xen_pv_domain()) + return; + + set_page_prot(pgd, PAGE_KERNEL_RO); + pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa_symbol(pgd))); +} + +void __init xen_pv_kasan_unpin_pgd(pgd_t *pgd) +{ + if (!xen_pv_domain()) + return; + + pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa_symbol(pgd))); + set_page_prot(pgd, PAGE_KERNEL); +} + #ifdef CONFIG_X86_32 static void __init xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn) { @@ -1943,6 +1973,15 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) if (i && i < pgd_index(__START_KERNEL_map)) init_top_pgt[i] = ((pgd_t *)xen_start_info->pt_base)[i]; +#ifdef CONFIG_KASAN + /* + * Copy KASAN mappings + * ffffec0000000000 - fffffbffffffffff (=44 bits) kasan shadow memory (16TB) + */ + for (i = 0xec0 >> 3; i < 0xfc0 >> 3; i++) + init_top_pgt[i] = ((pgd_t *)xen_start_info->pt_base)[i]; +#endif + /* Make pagetable pieces RO */ set_page_prot(init_top_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 0c4efa6fe450..1e9e1e41c0a8 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +KASAN_SANITIZE_features.o := n + obj-$(CONFIG_HOTPLUG_CPU) += cpu_hotplug.o obj-y += grant-table.o features.o balloon.o manage.o preempt.o time.o obj-y += mem-reservation.o diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index d89969aa9942..91d66520f0a3 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -241,4 +241,8 @@ static inline void xen_preemptible_hcall_end(void) #endif /* CONFIG_PREEMPT */ +pgd_t *xen_pv_kasan_early_init(void); +void xen_pv_kasan_pin_pgd(pgd_t *pgd); +void xen_pv_kasan_unpin_pgd(pgd_t *pgd); + #endif /* INCLUDE_XEN_OPS_H */ diff --git a/kernel/Makefile b/kernel/Makefile index f2cc0d118a0b..1da6fd93c00c 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,8 @@ obj-y = fork.o exec_domain.o panic.o \ notifier.o ksysfs.o cred.o reboot.o \ async.o range.o smpboot.o ucount.o +KASAN_SANITIZE_cpu.o := n + obj-$(CONFIG_MODULES) += kmod.o obj-$(CONFIG_MULTIUSER) += groups.o diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 81f5464ea9e1..429a638625ea 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -98,6 +98,7 @@ config KASAN_OUTLINE config KASAN_INLINE bool "Inline instrumentation" + depends on !XEN_PV help Compiler directly inserts code checking shadow memory before memory accesses. This is faster than outline (in some workloads @@ -147,7 +148,7 @@ config KASAN_SW_TAGS_IDENTIFY config KASAN_VMALLOC bool "Back mappings in vmalloc space with real shadow memory" - depends on KASAN && HAVE_ARCH_KASAN_VMALLOC + depends on KASAN && HAVE_ARCH_KASAN_VMALLOC && !XEN_PV help By default, the shadow region for vmalloc space is the read-only zero page. This means that KASAN cannot detect errors involving