From patchwork Fri Feb 7 14:26:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 11370517 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 69AB514B4 for ; Fri, 7 Feb 2020 14:28:05 +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 3BA68217BA for ; Fri, 7 Feb 2020 14:28:05 +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="a0Dvq2+E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3BA68217BA 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 1j04b4-0001eI-AM; Fri, 07 Feb 2020 14:27:06 +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 1j04b3-0001dp-38 for xen-devel@lists.xen.org; Fri, 07 Feb 2020 14:27:05 +0000 X-Inumbo-ID: e68cf395-49b5-11ea-b183-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e68cf395-49b5-11ea-b183-12813bfff9fa; Fri, 07 Feb 2020 14:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1581085620; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=JmXWwk8oHTimwKvrSamYiM0wOxkB9k4nQlVk5d1YLh8=; b=a0Dvq2+EAaGMLRncteE03eq187bXgBs6/jmAvNSPyL5YFZOUZmh6JAcp kcZl7hnaPrr0j7Q7nIALNPJqdGBqojulqD0EQZ2lTLxu7rXeSvcH6bC0W hZk8Pccslei+CZJKsceO3B1oTw6NDyV50SkucC2JDYBtBzzxYNrVVK8Az 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: JVR+CfOyL+tpYmHAlsitcbny7cVCDfpEkdNoxfH9qe1SlGKJAJ3g6EJhzTvj3+s9UDCFdzgiJ8 e9hfHqgfjfh1B5+nE25y09t45e/no+XXb4ywMvS6UtmNeZIUjC5WPpurjMb34uuY/HBajQUxQQ owXrGCfWMF8JUnvvRP9Idg+rXw5TtSSypLeyDkztAqTvHKuPdqD8MbhesrPTnvSWdzet2BQCUh +y2yt1ZnsMxgca7ZHKU/qdg5DrXR8O41IQG5s0fbqmPmxQeWLqGb/KcuAL6GtkLGKEqrcohKAF PO0= X-SBRS: 2.7 X-MesageID: 12479585 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.70,413,1574139600"; d="scan'208";a="12479585" From: Sergey Dyasli To: , , , Date: Fri, 7 Feb 2020 14:26:50 +0000 Message-ID: <20200207142652.670-3-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200207142652.670-1-sergey.dyasli@citrix.com> References: <20200207142652.670-1-sergey.dyasli@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 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" Introduce and use xen_kasan_* functions that are needed to properly initialise KASAN for Xen PV domains. Disable instrumentation for files that are used by xen_start_kernel() before kasan_early_init() could be called. 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 Reviewed-by: Boris Ostrovsky --- v2 --> v3: - Fix compilation without CONFIG_KASAN - Dropped _pv prefixes from new functions - Made xen_kasan_early_init() call kasan_map_early_shadow() directly - Updated description v1 --> v2: - Fix compilation without CONFIG_XEN_PV - Use macros for KASAN_SHADOW_START 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 | 10 ++++++++- arch/x86/xen/Makefile | 7 ++++++ arch/x86/xen/enlighten_pv.c | 3 +++ arch/x86/xen/mmu_pv.c | 43 +++++++++++++++++++++++++++++++++++++ drivers/xen/Makefile | 2 ++ include/linux/kasan.h | 2 ++ include/xen/xen-ops.h | 10 +++++++++ lib/Kconfig.kasan | 3 ++- 8 files changed, 78 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 763e71abc0fe..b862c03a2019 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -13,6 +13,8 @@ #include #include +#include + #include #include #include @@ -231,7 +233,7 @@ static void __init kasan_early_p4d_populate(pgd_t *pgd, } while (p4d++, addr = next, addr != end && p4d_none(*p4d)); } -static void __init kasan_map_early_shadow(pgd_t *pgd) +void __init kasan_map_early_shadow(pgd_t *pgd) { /* See comment in kasan_init() */ unsigned long addr = KASAN_SHADOW_START & PGDIR_MASK; @@ -317,6 +319,8 @@ void __init kasan_early_init(void) kasan_map_early_shadow(early_top_pgt); kasan_map_early_shadow(init_top_pgt); + + xen_kasan_early_init(); } void __init kasan_init(void) @@ -348,6 +352,8 @@ void __init kasan_init(void) __pgd(__pa(tmp_p4d_table) | _KERNPG_TABLE)); } + xen_kasan_pin_pgd(early_top_pgt); + load_cr3(early_top_pgt); __flush_tlb_all(); @@ -412,6 +418,8 @@ void __init kasan_init(void) load_cr3(init_top_pgt); __flush_tlb_all(); + xen_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 bbba8b17829a..a9a47f0bf22e 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -1771,6 +1771,41 @@ static void __init set_page_prot(void *addr, pgprot_t prot) { return set_page_prot_flags(addr, prot, UVMF_NONE); } + +#ifdef CONFIG_KASAN +void __init xen_kasan_early_init(void) +{ + if (!xen_pv_domain()) + return; + + /* 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); + + /* Add KASAN mappings into initial PV page tables */ + kasan_map_early_shadow((pgd_t *)xen_start_info->pt_base); +} + +void __init xen_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_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); +} +#endif /* ifdef CONFIG_KASAN */ + #ifdef CONFIG_X86_32 static void __init xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn) { @@ -1943,6 +1978,14 @@ 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 */ + for (i = pgd_index(KASAN_SHADOW_START); + i < pgd_index(KASAN_SHADOW_END); + i++) + init_top_pgt[i] = ((pgd_t *)xen_start_info->pt_base)[i]; +#endif /* ifdef CONFIG_KASAN */ + /* 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/linux/kasan.h b/include/linux/kasan.h index 5cde9e7c2664..2ab644229217 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -20,6 +20,8 @@ extern pmd_t kasan_early_shadow_pmd[PTRS_PER_PMD]; extern pud_t kasan_early_shadow_pud[PTRS_PER_PUD]; extern p4d_t kasan_early_shadow_p4d[MAX_PTRS_PER_P4D]; +void kasan_map_early_shadow(pgd_t *pgd); + int kasan_populate_early_shadow(const void *shadow_start, const void *shadow_end); diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 095be1d66f31..f67f1f2d73c6 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -241,4 +241,14 @@ static inline void xen_preemptible_hcall_end(void) #endif /* CONFIG_PREEMPTION */ +#if defined(CONFIG_XEN_PV) && defined(CONFIG_KASAN) +void xen_kasan_early_init(void); +void xen_kasan_pin_pgd(pgd_t *pgd); +void xen_kasan_unpin_pgd(pgd_t *pgd); +#else +static inline void xen_kasan_early_init(void) { } +static inline void xen_kasan_pin_pgd(pgd_t *pgd) { } +static inline void xen_kasan_unpin_pgd(pgd_t *pgd) { } +#endif /* if defined(CONFIG_XEN_PV) && defined(CONFIG_KASAN) */ + #endif /* INCLUDE_XEN_OPS_H */ 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 From patchwork Fri Feb 7 14:26:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 11370519 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 1C11C138D for ; Fri, 7 Feb 2020 14:28:07 +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 ED022214AF for ; Fri, 7 Feb 2020 14:28:06 +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="MjT9lM4Z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED022214AF 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 1j04b0-0001cQ-0u; Fri, 07 Feb 2020 14:27:02 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j04ay-0001c6-Pt for xen-devel@lists.xen.org; Fri, 07 Feb 2020 14:27:00 +0000 X-Inumbo-ID: e68e49c4-49b5-11ea-a759-bc764e2007e4 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e68e49c4-49b5-11ea-a759-bc764e2007e4; Fri, 07 Feb 2020 14:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1581085619; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=uXvsgNu6MmeKipdO1plI3DH/B0ELhbFMcurpPA0b8Ak=; b=MjT9lM4ZiseCH4swFZA+JURIMXLiNCZAedEgk4JE0LHcRYbGuTkSdtx0 sNYclCCGgIGv1DEGNegCUyCDlQF+rSwDfDsWJoeUpF73259BjP0PU2mtC gY4RbAuQsSFTJdJw5+DiSRX1xYy4MiZRgADT7qt6BPeo1nvJg3YUFS5bj k=; 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: kMMz1oyZramg5ckLxUaxLPT0jR449vrClgivhA3Gm8ZlVz5SUPPvSuwAPwqhJfmuBnoLUKlldo E+J7QlpDxutZ8TB8H+ybgc3fuUAHYrc0xcqNp+avLDJaZ2qnpb18hAzEQv4+OTQdbt/JjvDsj4 ZSVShM3LgJf74tPuBoogRoUg0zc8a2K/oa4k1g1OX6EJulg+1+I7f94ytjWhEYWSDWKiheSTej 4qyTHoOgsuA9cFUCoVK99dgYp/L2Yj9LBmIw62LAEemsgElBhmTzRPXuV1ZG0Km2IZK39HnLOM BzU= X-SBRS: 2.7 X-MesageID: 12479584 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.70,413,1574139600"; d="scan'208";a="12479584" From: Sergey Dyasli To: , , , Date: Fri, 7 Feb 2020 14:26:51 +0000 Message-ID: <20200207142652.670-4-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200207142652.670-1-sergey.dyasli@citrix.com> References: <20200207142652.670-1-sergey.dyasli@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 3/4] xen: teach KASAN about grant tables 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" From: Ross Lagerwall Otherwise it produces lots of false positives when a guest starts using PV I/O devices. Signed-off-by: Ross Lagerwall Signed-off-by: Sergey Dyasli Reviewed-by: Boris Ostrovsky --- v2 --> v3: no changes v1 --> v2: no changes RFC --> v1: - Slightly clarified the commit message --- drivers/xen/grant-table.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 7b36b51cdb9f..ce95f7232de6 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1048,6 +1048,7 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, foreign = xen_page_foreign(pages[i]); foreign->domid = map_ops[i].dom; foreign->gref = map_ops[i].ref; + kasan_alloc_pages(pages[i], 0); break; } @@ -1084,8 +1085,10 @@ int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops, if (ret) return ret; - for (i = 0; i < count; i++) + for (i = 0; i < count; i++) { ClearPageForeign(pages[i]); + kasan_free_pages(pages[i], 0); + } return clear_foreign_p2m_mapping(unmap_ops, kunmap_ops, pages, count); } From patchwork Fri Feb 7 14:26:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Dyasli X-Patchwork-Id: 11370521 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 350F513A4 for ; Fri, 7 Feb 2020 14:28:17 +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 11BDD214AF for ; Fri, 7 Feb 2020 14:28:17 +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="eQEjheAg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11BDD214AF 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 1j04b5-0001f4-LP; Fri, 07 Feb 2020 14:27:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j04b3-0001e6-Ql for xen-devel@lists.xen.org; Fri, 07 Feb 2020 14:27:05 +0000 X-Inumbo-ID: e7586b64-49b5-11ea-a759-bc764e2007e4 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e7586b64-49b5-11ea-a759-bc764e2007e4; Fri, 07 Feb 2020 14:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1581085620; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=xY2o+FIkzgGVbvvD6Pr6dc1bp4xlArgiFJcFdhlR4wM=; b=eQEjheAgMhztY2r7yZq60rkTRBODKaEtqJ+PCvDsd1PR8W/UQzYJ+Xc+ s+QFUZKL+5c40KDFJDvV74JGuVA2Tc6AD5Q1ZMvROLdvmcIIz6durogE2 mJZ66np9cPKivnjtOSiUZw1Ac5OB3YUgNcHBoPpyMrXVqtP1Yv6Mp6Sh0 c=; 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: 0LSwV5f+ce7LmCuyeNmBPXSPCt25wkJPqq44O0V1EgoVlnukj5AqmkkFejo0CY5l5ERMbV+FBD B9HTCM3bMTG8GxBCwMm19Kw9z4XyUkLs7ZW7Kfol7V6XvpuBIrm0bWGE/NcA5xrwYsAUNlnZJK h6OwQYuh0W6BirgUV/IwqdC4udufQdUKpYVFFhPfiL65EbUtbtW3JqkDnms3Dj4sQxM8Ang2vW 6XTrHCYqY/Hpz6cTLB+pzDrK2qVjF3srYEHaUV3qYfkqBx0oqOswZiQYm718ghYtnIAW8MQ7ym W+w= X-SBRS: 2.7 X-MesageID: 12479586 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.70,413,1574139600"; d="scan'208";a="12479586" From: Sergey Dyasli To: , , , Date: Fri, 7 Feb 2020 14:26:52 +0000 Message-ID: <20200207142652.670-5-sergey.dyasli@citrix.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200207142652.670-1-sergey.dyasli@citrix.com> References: <20200207142652.670-1-sergey.dyasli@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 4/4] xen/netback: fix grant copy across page boundary 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 , Wei Liu , Stefano Stabellini , Paul Durrant , netdev@vger.kernel.org, George Dunlap , "David S. Miller" , Ross Lagerwall , Alexander Potapenko , Andrey Ryabinin , Boris Ostrovsky , Andrew Morton , Dmitry Vyukov Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Ross Lagerwall When KASAN (or SLUB_DEBUG) is turned on, there is a higher chance that non-power-of-two allocations are not aligned to the next power of 2 of the size. Therefore, handle grant copies that cross page boundaries. Signed-off-by: Ross Lagerwall Signed-off-by: Sergey Dyasli Acked-by: Paul Durrant --- v2 --> v3: - Added Acked-by: Paul Durrant CC: "David S. Miller" CC: netdev@vger.kernel.org v1 --> v2: - Use sizeof_field(struct sk_buff, cb)) instead of magic number 48 - Slightly update commit message RFC --> v1: - Added BUILD_BUG_ON to the netback patch - xenvif_idx_release() now located outside the loop CC: Wei Liu CC: Paul Durrant --- drivers/net/xen-netback/common.h | 2 +- drivers/net/xen-netback/netback.c | 60 +++++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 12 deletions(-) diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 05847eb91a1b..e57684415edd 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h @@ -155,7 +155,7 @@ struct xenvif_queue { /* Per-queue data for xenvif */ struct pending_tx_info pending_tx_info[MAX_PENDING_REQS]; grant_handle_t grant_tx_handle[MAX_PENDING_REQS]; - struct gnttab_copy tx_copy_ops[MAX_PENDING_REQS]; + struct gnttab_copy tx_copy_ops[MAX_PENDING_REQS * 2]; struct gnttab_map_grant_ref tx_map_ops[MAX_PENDING_REQS]; struct gnttab_unmap_grant_ref tx_unmap_ops[MAX_PENDING_REQS]; /* passed to gnttab_[un]map_refs with pages under (un)mapping */ diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 315dfc6ea297..41054de38a62 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -320,6 +320,7 @@ static int xenvif_count_requests(struct xenvif_queue *queue, struct xenvif_tx_cb { u16 pending_idx; + u8 copies; }; #define XENVIF_TX_CB(skb) ((struct xenvif_tx_cb *)(skb)->cb) @@ -439,6 +440,7 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue, { struct gnttab_map_grant_ref *gop_map = *gopp_map; u16 pending_idx = XENVIF_TX_CB(skb)->pending_idx; + u8 copies = XENVIF_TX_CB(skb)->copies; /* This always points to the shinfo of the skb being checked, which * could be either the first or the one on the frag_list */ @@ -450,23 +452,26 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue, int nr_frags = shinfo->nr_frags; const bool sharedslot = nr_frags && frag_get_pending_idx(&shinfo->frags[0]) == pending_idx; - int i, err; + int i, err = 0; - /* Check status of header. */ - err = (*gopp_copy)->status; - if (unlikely(err)) { - if (net_ratelimit()) - netdev_dbg(queue->vif->dev, + while (copies) { + /* Check status of header. */ + int newerr = (*gopp_copy)->status; + if (unlikely(newerr)) { + if (net_ratelimit()) + netdev_dbg(queue->vif->dev, "Grant copy of header failed! status: %d pending_idx: %u ref: %u\n", (*gopp_copy)->status, pending_idx, (*gopp_copy)->source.u.ref); - /* The first frag might still have this slot mapped */ - if (!sharedslot) - xenvif_idx_release(queue, pending_idx, - XEN_NETIF_RSP_ERROR); + err = newerr; + } + (*gopp_copy)++; + copies--; } - (*gopp_copy)++; + /* The first frag might still have this slot mapped */ + if (unlikely(err) && !sharedslot) + xenvif_idx_release(queue, pending_idx, XEN_NETIF_RSP_ERROR); check_frags: for (i = 0; i < nr_frags; i++, gop_map++) { @@ -910,6 +915,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, xenvif_tx_err(queue, &txreq, extra_count, idx); break; } + XENVIF_TX_CB(skb)->copies = 0; skb_shinfo(skb)->nr_frags = ret; if (data_len < txreq.size) @@ -933,6 +939,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, "Can't allocate the frag_list skb.\n"); break; } + XENVIF_TX_CB(nskb)->copies = 0; } if (extras[XEN_NETIF_EXTRA_TYPE_GSO - 1].type) { @@ -990,6 +997,31 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, queue->tx_copy_ops[*copy_ops].len = data_len; queue->tx_copy_ops[*copy_ops].flags = GNTCOPY_source_gref; + XENVIF_TX_CB(skb)->copies++; + + if (offset_in_page(skb->data) + data_len > XEN_PAGE_SIZE) { + unsigned int extra_len = offset_in_page(skb->data) + + data_len - XEN_PAGE_SIZE; + + queue->tx_copy_ops[*copy_ops].len -= extra_len; + (*copy_ops)++; + + queue->tx_copy_ops[*copy_ops].source.u.ref = txreq.gref; + queue->tx_copy_ops[*copy_ops].source.domid = + queue->vif->domid; + queue->tx_copy_ops[*copy_ops].source.offset = + txreq.offset + data_len - extra_len; + + queue->tx_copy_ops[*copy_ops].dest.u.gmfn = + virt_to_gfn(skb->data + data_len - extra_len); + queue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF; + queue->tx_copy_ops[*copy_ops].dest.offset = 0; + + queue->tx_copy_ops[*copy_ops].len = extra_len; + queue->tx_copy_ops[*copy_ops].flags = GNTCOPY_source_gref; + + XENVIF_TX_CB(skb)->copies++; + } (*copy_ops)++; @@ -1688,5 +1720,11 @@ static void __exit netback_fini(void) } module_exit(netback_fini); +static void __init __maybe_unused build_assertions(void) +{ + BUILD_BUG_ON(sizeof(struct xenvif_tx_cb) > + sizeof_field(struct sk_buff, cb)); +} + MODULE_LICENSE("Dual BSD/GPL"); MODULE_ALIAS("xen-backend:vif");