Message ID | 5e610a513c44a69b2b78476c20f21960696259c6.1537383101.git.andreyknvl@google.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> 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 902C315A6 for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 19 Sep 2018 19:30:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E4EC2C92E for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 19 Sep 2018 19:30:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6ECF62C9CE; Wed, 19 Sep 2018 19:30:01 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE 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 02E592C92E for <patchwork-linux-arm@patchwork.kernel.org>; Wed, 19 Sep 2018 19:30:01 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=W/Z0ZBJnetNM4D0+0QaZYaVf8k8fFI7klLMrRttTVY8=; b=GP3ZVFDewEe16c +kYn63my3ac7RfkRq4qP6McZZ+sNTUtt7GywBFjUA+BTJA/eXM0b2ngerPE84QITZ63Xsvdn53Rk5 VvoJGG32iM+fEGQyt9sGIj4TsxW2Ra7t1nZYYFd6eYkrYwPHGA9FQldPNqSA9fvLTaAosQBGnw+D8 NdLWPNOdIqKfBVoHm6bXKKWUjkANGHHbBlWmeX30lp6CYzxE4PkjboSoAVpovkX1G9UswSa5qWdiu pBuzQen/vDjJp2/eN04MVCkHXwSCiK6YS0Pl4gEuOQQyBU1F1ANdzZB5K1ubuijEcUw/p3PbNxc04 S41QIiI9DoIkCZvnZGXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g2iAZ-0004Va-6P; Wed, 19 Sep 2018 19:29:51 +0000 Received: from merlin.infradead.org ([205.233.59.134]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g2i7A-0002zT-FC for linux-arm-kernel@bombadil.infradead.org; Wed, 19 Sep 2018 19:26:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8pJXKvzLB+e1tJ1Hv9TztYhic7mAKsr7ltM5Jvr+GUA=; b=Bs6mXU37qkUKzKFWfJmntrDB0E csuJZgF3KS2CO2X8gg3Q7REyhSmv/Wg/qcIgl9mfokbACikeikbyI7a3nSeS9AwnSChcEViyKIvQs 9HSNkMWVB/7BSEdAL8WANWs+QGGAfpdIY7KVYCG9lZ/prjF+5fWGTdvU8fhHm0ZJHWYO7IAX6mOYg INSC+QeeUEkQw11M2JyvI4gl5/olXSa0nreCTS199m5gGlgyUbAOGm0JseI7ifguxv4GKfHoyWvSu /mqwOENlg2UO/1autQ+9xKABHvldt745NC5+BdYe6Dk1gurKwAky5NnwhyRBer/pajztCjeqwiS3h 1kYe4nww==; Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g2hdK-0004fI-AT for linux-arm-kernel@lists.infradead.org; Wed, 19 Sep 2018 18:55:31 +0000 Received: by mail-wr1-x443.google.com with SMTP id 20-v6so6862748wrb.12 for <linux-arm-kernel@lists.infradead.org>; Wed, 19 Sep 2018 11:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8pJXKvzLB+e1tJ1Hv9TztYhic7mAKsr7ltM5Jvr+GUA=; b=RSGVy6Ay3KrzIUqWwv/VIcAW0HO7cVr2nUs+V4EzIDJMC+eescAuwUx6jPg+y7ZRSC CwpxO4q7mN7dtW4XG1FH0/6ZaNnKHzY4eI40IwAiTdZaZAOxQYZWoPxBRqdh3qxp6w08 O+OIPMrqSfiA3DBaWK9GkyWxW6H9iRZ40oYPtlYJs6RzPjkYGChmE0xIjlkBhtYZoatS HU7Ce6ZcPbDxVzM7c+yOONxmzw5KhqXZs5MrExSkGOSUvLtluU3adnmErD6bRNYhiMKp ROSOV7iN4cRnsKYvKAmTG/Wn1PgLR7cpYISOMt7scoyppezouNaPS5jVwbLy3y+ch2BU Zwmw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=8pJXKvzLB+e1tJ1Hv9TztYhic7mAKsr7ltM5Jvr+GUA=; b=Ix9Yr4qJqOdscZWyeTiqqlo0qhxRcj2UO8SyicMtQI7czV+hL94Ip8kgwUEqr4I3w5 aaYLd8jV0vVxRwhPBGlGYPYDBLt+bt/UNO3WF7Jqp7olJsSQRlOH1S377DEBOGUWmcAV GORyXMuaNd0iv1bYqtGMOWMDXLXyumC+ZyvzGxswYzMk8tCiryxLnDOX67TETA07Zhvx GQA9IatSuc60PeCOroRrunhR2cWM7h7z+a+472qpMJ1035CsxMi1R2X53zNLIkvXNYr+ wPmIPqnXgcOYZxkPya2HKJgy3HwRByjqDE42Nst4zAqtqvkG4/DQAJGe/aGvR+K7kqsA 34mA== X-Gm-Message-State: APzg51AWl9wAS4jv5mnz7ALVMcD1pxJDoWIpo7vvrZQM5Wy2NlZp9V8y QSEYCkyHrZYmQimEQTP/OuGFQA== X-Google-Smtp-Source: ANB0VdZNjLwlO7+Wx7HL+D4ZNaVYjHeUF1fVI5wO9gQ8YjF80pGa7gqec/EbQRlsPW+CRevVCuOBdg== X-Received: by 2002:a5d:4185:: with SMTP id m5-v6mr5167615wrp.8.1537383322708; Wed, 19 Sep 2018 11:55:22 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id b10-v6sm8510065wmc.28.2018.09.19.11.55.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Sep 2018 11:55:22 -0700 (PDT) From: Andrey Konovalov <andreyknvl@google.com> To: Andrey Ryabinin <aryabinin@virtuozzo.com>, Alexander Potapenko <glider@google.com>, Dmitry Vyukov <dvyukov@google.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Christoph Lameter <cl@linux.com>, Andrew Morton <akpm@linux-foundation.org>, Mark Rutland <mark.rutland@arm.com>, Nick Desaulniers <ndesaulniers@google.com>, Marc Zyngier <marc.zyngier@arm.com>, Dave Martin <dave.martin@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, "Eric W . Biederman" <ebiederm@xmission.com>, Ingo Molnar <mingo@kernel.org>, Paul Lawrence <paullawrence@google.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Arnd Bergmann <arnd@arndb.de>, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Kate Stewart <kstewart@linuxfoundation.org>, Mike Rapoport <rppt@linux.vnet.ibm.com>, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sparse@vger.kernel.org, linux-mm@kvack.org, linux-kbuild@vger.kernel.org Subject: [PATCH v8 12/20] kasan, arm64: enable top byte ignore for the kernel Date: Wed, 19 Sep 2018 20:54:51 +0200 Message-Id: <5e610a513c44a69b2b78476c20f21960696259c6.1537383101.git.andreyknvl@google.com> X-Mailer: git-send-email 2.19.0.397.gdd90340f6a-goog In-Reply-To: <cover.1537383101.git.andreyknvl@google.com> References: <cover.1537383101.git.andreyknvl@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180919_145530_416064_6E21D62D X-CRM114-Status: GOOD ( 15.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Vishwath Mohan <vishwath@google.com>, Chintan Pandya <cpandya@codeaurora.org>, Jacob Bramley <Jacob.Bramley@arm.com>, Jann Horn <jannh@google.com>, Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>, Andrey Konovalov <andreyknvl@google.com>, Lee Smith <Lee.Smith@arm.com>, Kostya Serebryany <kcc@google.com>, Mark Brand <markbrand@google.com>, Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>, Evgeniy Stepanov <eugenis@google.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
kasan: add software tag-based mode for arm64
|
expand
|
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h index fd208eac9f2a..483aceedad76 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -289,6 +289,7 @@ #define TCR_A1 (UL(1) << 22) #define TCR_ASID16 (UL(1) << 36) #define TCR_TBI0 (UL(1) << 37) +#define TCR_TBI1 (UL(1) << 38) #define TCR_HA (UL(1) << 39) #define TCR_HD (UL(1) << 40) #define TCR_NFD1 (UL(1) << 54) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 03646e6a2ef4..b2b44dbdb063 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -47,6 +47,12 @@ /* PTWs cacheable, inner/outer WBWA */ #define TCR_CACHE_FLAGS TCR_IRGN_WBWA | TCR_ORGN_WBWA +#ifdef CONFIG_KASAN_SW_TAGS +#define TCR_KASAN_FLAGS TCR_TBI1 +#else +#define TCR_KASAN_FLAGS 0 +#endif + #define MAIR(attr, mt) ((attr) << ((mt) * 8)) /* @@ -440,7 +446,7 @@ ENTRY(__cpu_setup) */ ldr x10, =TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \ TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \ - TCR_TBI0 | TCR_A1 + TCR_TBI0 | TCR_A1 | TCR_KASAN_FLAGS tcr_set_idmap_t0sz x10, x9 /*
Tag-based KASAN uses the Top Byte Ignore feature of arm64 CPUs to store a pointer tag in the top byte of each pointer. This commit enables the TCR_TBI1 bit, which enables Top Byte Ignore for the kernel, when tag-based KASAN is used. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> --- arch/arm64/include/asm/pgtable-hwdef.h | 1 + arch/arm64/mm/proc.S | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-)