From patchwork Mon Jun 17 22:11:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 11000587 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F08F1395 for ; Mon, 17 Jun 2019 22:11:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C5B6289C4 for ; Mon, 17 Jun 2019 22:11:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D43B289C6; Mon, 17 Jun 2019 22:11:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 617F6289C4 for ; Mon, 17 Jun 2019 22:11:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=fozcE9hO/o/Np6gKEonPn3XKHJfzjH8VTmP5Un47S/Y=; b=Xoy PKA+aWXDasZ77QpzSMIO0bNpkvPgkBipwTWAiavTg9OX/3GJclF/7FF991Cea4+mDQlkswL9WFqWa QAZxNAaxokYu+bjIBJIx1imREz1UT6A2jYgQwu5tk+NfwVjBTwb2Y9C43u4iGRQyJvMPLdJVucU2V wCQ/YtwEPVaCShoKJPDqVbkCHcwSJ5VY3r5DtgsEOBU33lLSgvOtystexuKNugn3u9n5p1NgmxtC9 Cxdqn2Ie3vzeEMlBDL/zboq877yg3fuVnbXpXiROTZGLSFKOwm9Bo2/h1eatPYaEDW75NS+iarvBx 5GoLt8jL29fI2hUzyjC2/YdeCUw7jag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hczqt-0001iL-JY; Mon, 17 Jun 2019 22:11:47 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hczqp-0001gp-IN for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2019 22:11:45 +0000 Received: by mail-pg1-x542.google.com with SMTP id v11so6521913pgl.5 for ; Mon, 17 Jun 2019 15:11:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9hJzxrszcukVONnoGVdeWJlpdRxEpsd4fbXa7dt9GVI=; b=HwbLfFk9zCu8RO6aKIDoD9//6VYMa/bi5ej/nk1WjLFUF3A3k4ZMsHi2G5awRSmVYC mgwDFgpGb0GtpKxQ+AYiJM92As0i70dz/DQ9qzY0F9rlB18Qto2ogV8eAPF6cmF1Gf0P grrdIQPjggp9DSvnNkBD5VvX5+zugW0w0TBx7/BdcgwajdRcjvc5oCEHwlptJVMgehzy WxHZZJlACM0GzJ3xYoUgN1QlOiUtGWjO8AgnRZQG3ja7nIM9ZB1FCTVuoBeAk7LpsVLl j0ATs35YsL92E5vuUbBV0lQMHwaHlF36+QgJvqX6jXqsmCu+Kr6SfpvAc6Tp8MLSWpgW myZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9hJzxrszcukVONnoGVdeWJlpdRxEpsd4fbXa7dt9GVI=; b=HnePN25IK1v+TeAdo2TZFGdS/Zm9zeXwLkX3deF4Ajn42VMLSwAbQ86ti9OyTdn/S5 QG52vsgDIX1qgAI+MiD00M5vNxJFlNqXPGdSmpk+rpGBZrV3SMZUDwCb3LCtdOmhhlMU VOA5yMxb/aEP/HexNKP4EfsUYJQvis0RU7YINLhb716JcSszDxuMNvCsRHKZiS7jg3Gu OacH0uji2yYbR0s7QiBbDWCqxkJ7plJdVtkiEZbZQR5zQXiklmICCx7YDFSGcR2zNRhP S9BtqanUiIG+So1P1NLiIa77A5BFBgEhewRtvQPfQAroBLFmnIRKLPLb111vEQKRThfF sUZg== X-Gm-Message-State: APjAAAWitECx4Z3CiS4PIzhrOdOO3q5CDlRpjyqP2oeHBf+Ogszrknxn byebgl2GVxLRYd2qvx0yoIiwE1x5 X-Google-Smtp-Source: APXvYqyVpnZU7YhX1TKVhuq3lWrEijHNQVywb2UtVZ6Xexiu03m+N7U7NIofFuERZ7mOka3nj6o2Rw== X-Received: by 2002:a62:15c3:: with SMTP id 186mr53022791pfv.141.1560809500847; Mon, 17 Jun 2019 15:11:40 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id s129sm12551020pfb.186.2019.06.17.15.11.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 17 Jun 2019 15:11:40 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 0/6] KASan for arm Date: Mon, 17 Jun 2019 15:11:28 -0700 Message-Id: <20190617221134.9930-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190617_151143_612762_BF7ED67A X-CRM114-Status: GOOD ( 22.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, alexandre.belloni@bootlin.com, mhocko@suse.com, julien.thierry@arm.com, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, dhowells@redhat.com, yamada.masahiro@socionext.com, ryabinin.a.a@gmail.com, glider@google.com, kvmarm@lists.cs.columbia.edu, Florian Fainelli , corbet@lwn.net, liuwenliang@huawei.com, daniel.lezcano@linaro.org, linux@armlinux.org.uk, kasan-dev@googlegroups.com, bcm-kernel-feedback-list@broadcom.com, geert@linux-m68k.org, drjones@redhat.com, vladimir.murzin@arm.com, keescook@chromium.org, arnd@arndb.de, marc.zyngier@arm.com, andre.przywara@arm.com, philip@cog.systems, jinb.park7@gmail.com, tglx@linutronix.de, dvyukov@google.com, nico@fluxnic.net, gregkh@linuxfoundation.org, ard.biesheuvel@linaro.org, linux-doc@vger.kernel.org, christoffer.dall@arm.com, rob@landley.net, pombredanne@nexb.com, akpm@linux-foundation.org, thgarnie@google.com, kirill.shutemov@linux.intel.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Abbott submitted a v5 about a year ago here: and the series was not picked up since then, so I rebased it against v5.2-rc4 and re-tested it on a Brahma-B53 (ARMv8 running AArch32 mode) and Brahma-B15, both LPAE and test-kasan is consistent with the ARM64 counter part. We were in a fairly good shape last time with a few different people having tested it, so I am hoping we can get that included for 5.4 if everything goes well. Changelog: v6 - v5 - Resolve conflicts during rebase, and updated to make use of kasan_early_shadow_pte instead of kasan_zero_pte v5 - v4 - Modify Andrey Ryabinin's email address. v4 - v3 - Remove the fix of type conversion in kasan_cache_create because it has been fix in the latest version in: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git - Change some Reviewed-by tag into Reported-by tag to avoid misleading. ---Reported by: Marc Zyngier Russell King - ARM Linux - Disable instrumentation for arch/arm/mm/physaddr.c v3 - v2 - Remove this patch: 2 1-byte checks more safer for memory_is_poisoned_16 because a unaligned load/store of 16 bytes is rare on arm, and this patch is very likely to affect the performance of modern CPUs. ---Acked by: Russell King - ARM Linux - Fixed some link error which kasan_pmd_populate,kasan_pte_populate and kasan_pud_populate are in section .meminit.text but the function kasan_alloc_block which is called by kasan_pmd_populate, kasan_pte_populate and kasan_pud_populate is in section .init.text. So we need change kasan_pmd_populate,kasan_pte_populate and kasan_pud_populate into the section .init.text. ---Reported by: Florian Fainelli - Fixed some compile error which caused by the wrong access instruction in arch/arm/kernel/entry-common.S. ---Reported by: kbuild test robot - Disable instrumentation for arch/arm/kvm/hyp/*. ---Acked by: Marc Zyngier - Update the set of supported architectures in Documentation/dev-tools/kasan.rst. ---Acked by:Dmitry Vyukov - The version 2 is tested by: Florian Fainelli (compile test) kbuild test robot (compile test) Joel Stanley (on ASPEED ast2500(ARMv5)) v2 - v1 - Fixed some compiling error which happens on changing kernel compression mode to lzma/xz/lzo/lz4. ---Reported by: Florian Fainelli , Russell King - ARM Linux - Fixed a compiling error cause by some older arm instruction set(armv4t) don't suppory movw/movt which is reported by kbuild. - Changed the pte flag from _L_PTE_DEFAULT | L_PTE_DIRTY | L_PTE_XN to pgprot_val(PAGE_KERNEL). ---Reported by: Russell King - ARM Linux - Moved Enable KASan patch as the last one. ---Reported by: Florian Fainelli , Russell King - ARM Linux - Moved the definitions of cp15 registers from arch/arm/include/asm/kvm_hyp.h to arch/arm/include/asm/cp15.h. ---Asked by: Mark Rutland - Merge the following commits into the commit Define the virtual space of KASan's shadow region: 1) Define the virtual space of KASan's shadow region; 2) Avoid cleaning the KASan shadow area's mapping table; 3) Add KASan layout; - Merge the following commits into the commit Initialize the mapping of KASan shadow memory: 1) Initialize the mapping of KASan shadow memory; 2) Add support arm LPAE; 3) Don't need to map the shadow of KASan's shadow memory; ---Reported by: Russell King - ARM Linux 4) Change mapping of kasan_zero_page int readonly. - The version 1 is tested by Florian Fainelli on a Cortex-A5 (no LPAE). Hi,all: These patches add arch specific code for kernel address sanitizer (see Documentation/kasan.txt). 1/8 of kernel addresses reserved for shadow memory. There was no big enough hole for this, so virtual addresses for shadow were stolen from user space. At early boot stage the whole shadow region populated with just one physical page (kasan_zero_page). Later, this page reused as readonly zero shadow for some memory that KASan currently don't track (vmalloc). After mapping the physical memory, pages for shadow memory are allocated and mapped. KASan's stack instrumentation significantly increases stack's consumption, so CONFIG_KASAN doubles THREAD_SIZE. Functions like memset/memmove/memcpy do a lot of memory accesses. If bad pointer passed to one of these function it is important to catch this. Compiler's instrumentation cannot do this since these functions are written in assembly. KASan replaces memory functions with manually instrumented variants. Original functions declared as weak symbols so strong definitions in mm/kasan/kasan.c could replace them. Original functions have aliases with '__' prefix in name, so we could call non-instrumented variant if needed. Some files built without kasan instrumentation (e.g. mm/slub.c). Original mem* function replaced (via #define) with prefixed variants to disable memory access checks for such files. On arm LPAE architecture, the mapping table of KASan shadow memory(if PAGE_OFFSET is 0xc0000000, the KASan shadow memory's virtual space is 0xb6e000000~0xbf000000) can't be filled in do_translation_fault function, because kasan instrumentation maybe cause do_translation_fault function accessing KASan shadow memory. The accessing of KASan shadow memory in do_translation_fault function maybe cause dead circle. So the mapping table of KASan shadow memory need be copyed in pgd_alloc function. Most of the code comes from: https://github.com/aryabinin/linux/commit/0b54f17e70ff50a902c4af05bb92716eb95acefe These patches are tested on vexpress-ca15, vexpress-ca9 Abbott Liu (2): ARM: Add TTBR operator for kasan_init ARM: Define the virtual space of KASan's shadow region Andrey Ryabinin (4): ARM: Disable instrumentation for some code ARM: Replace memory function for kasan ARM: Initialize the mapping of KASan shadow memory ARM: Enable KASan for arm Documentation/dev-tools/kasan.rst | 4 +- arch/arm/Kconfig | 1 + arch/arm/boot/compressed/Makefile | 1 + arch/arm/boot/compressed/decompress.c | 2 + arch/arm/boot/compressed/libfdt_env.h | 2 + arch/arm/include/asm/cp15.h | 106 +++++++++ arch/arm/include/asm/kasan.h | 35 +++ arch/arm/include/asm/kasan_def.h | 64 ++++++ arch/arm/include/asm/kvm_hyp.h | 54 ----- arch/arm/include/asm/memory.h | 5 + arch/arm/include/asm/pgalloc.h | 7 +- arch/arm/include/asm/string.h | 17 ++ arch/arm/include/asm/thread_info.h | 4 + arch/arm/kernel/entry-armv.S | 5 +- arch/arm/kernel/entry-common.S | 9 +- arch/arm/kernel/head-common.S | 7 +- arch/arm/kernel/setup.c | 2 + arch/arm/kernel/unwind.c | 3 +- arch/arm/kvm/hyp/cp15-sr.c | 12 +- arch/arm/kvm/hyp/switch.c | 6 +- arch/arm/lib/memcpy.S | 3 + arch/arm/lib/memmove.S | 5 +- arch/arm/lib/memset.S | 3 + arch/arm/mm/Makefile | 4 + arch/arm/mm/kasan_init.c | 301 ++++++++++++++++++++++++++ arch/arm/mm/mmu.c | 7 +- arch/arm/mm/pgd.c | 14 ++ arch/arm/vdso/Makefile | 2 + 28 files changed, 608 insertions(+), 77 deletions(-) create mode 100644 arch/arm/include/asm/kasan.h create mode 100644 arch/arm/include/asm/kasan_def.h create mode 100644 arch/arm/mm/kasan_init.c