From patchwork Thu Aug 9 19:21:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10561787 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 BF62D1057 for ; Thu, 9 Aug 2018 19:22:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF0E62B950 for ; Thu, 9 Aug 2018 19:22:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC5CE2B95D; Thu, 9 Aug 2018 19:22:33 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D5752B962 for ; Thu, 9 Aug 2018 19:22:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727650AbeHIVrr (ORCPT ); Thu, 9 Aug 2018 17:47:47 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46239 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727599AbeHIVrq (ORCPT ); Thu, 9 Aug 2018 17:47:46 -0400 Received: by mail-wr1-f65.google.com with SMTP id h14-v6so6067834wrw.13 for ; Thu, 09 Aug 2018 12:21:32 -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=oD+7K3NJxiAR9JTdyTtA3ICMxYFdVVudUaNngrniyVw=; b=bZPgstXbwZxXDVi2nvh6WzmRfMpGDSA/Fne0ZVeSm8mxfScPujTYtuwX15ylbHkvoc c/CUjAYYRDyjPKkQu0phNVRCGIclqn91uWdAj/0u2yNyNdXYKfI/TpYgcpDV/qnl3qMp Fnq56xNwUj9aAPfL9FR8I49xffr+6JEYJopN+OUgqrUgB6boViYqjt5RxXcC3HRTkn3Y 4ag8Fc1odQbVpT4/brI/VO2Umgdm/QW1JLQIt+ds4fXeZncAAUtjLUXIILemlq80hu8z mtSHWNbAsCGa3lV0+WRa/ADf2/FGivoGULA+O36urx/7C7AN3u3MJsVGmhddajSYooka FZRg== 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=oD+7K3NJxiAR9JTdyTtA3ICMxYFdVVudUaNngrniyVw=; b=Snl2mj36A9va03ZRqUu4PI2rm0vBccRgsjv5yhfkXp1tTuID97/gfgf0BwIC4QWn/i ZCQrh+5nS4OtCtaEDJGkLhvz9KHjGZSYBtIyTconBjdoYHgwvBS6hKOjQA6jf/A68Uuu 0WwFbnAT/FaGImvUTCIGmM6md4z9i0SeN3pEzXPuDA/QSEdtLcQP4rctHLfDUIGDaZ68 Epqo9GKkJzOxahhiF2urgNI9XU1a8qEjy06wDJEPLeAKQDs4c/8+9H8qpmrCpnok0934 GFNY0M6np4EQcLuYYZ5K+CgYA4S9XNHU1WW2jYW7i/h91iZafGzKotk6GZSKrRkTKCpx t41A== X-Gm-Message-State: AOUpUlHuSXMWJJyVahVUGOQTnjJeb/o6ryM1qLQRDg0wA7qjDz84uKez MFSGBY9wOEafr9fENr69GSG+dw== X-Google-Smtp-Source: AA+uWPyIKsGrs3/6MSHl7R25hDOnzR5k5iYFLEI9aiR4odNOMfVMIRu3E50s0D493xzNbwmsjkTjJw== X-Received: by 2002:adf:fac1:: with SMTP id a1-v6mr2167983wrs.74.1533842491567; Thu, 09 Aug 2018 12:21:31 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id o14-v6sm14738797wmd.35.2018.08.09.12.21.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 12:21:30 -0700 (PDT) From: Andrey Konovalov To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Catalin Marinas , Will Deacon , Christoph Lameter , Andrew Morton , Mark Rutland , Nick Desaulniers , Marc Zyngier , Dave Martin , Ard Biesheuvel , "Eric W . Biederman" , Ingo Molnar , Paul Lawrence , Geert Uytterhoeven , Arnd Bergmann , "Kirill A . Shutemov" , Greg Kroah-Hartman , Kate Stewart , Mike Rapoport , 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 Cc: Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Jann Horn , Mark Brand , Chintan Pandya , Vishwath Mohan , Andrey Konovalov Subject: [PATCH v5 10/18] khwasan, arm64: enable top byte ignore for the kernel Date: Thu, 9 Aug 2018 21:21:02 +0200 Message-Id: <5f0609d502b690ef28a142fd4b96fae6ff4ee722.1533842385.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog In-Reply-To: References: MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP KHWASAN 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 KHWASAN is used. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/pgtable-hwdef.h | 1 + arch/arm64/mm/proc.S | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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..c5175e098d02 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_HW +#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 /*