From patchwork Tue Jun 26 13:15:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10488913 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F02A360386 for ; Tue, 26 Jun 2018 13:16:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E00092893B for ; Tue, 26 Jun 2018 13:16:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D35262893F; Tue, 26 Jun 2018 13:16:11 +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=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B18A2893B for ; Tue, 26 Jun 2018 13:16:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A11CE6B0271; Tue, 26 Jun 2018 09:15:52 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9E92F6B0272; Tue, 26 Jun 2018 09:15:52 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 83A086B0273; Tue, 26 Jun 2018 09:15:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr0-f197.google.com (mail-wr0-f197.google.com [209.85.128.197]) by kanga.kvack.org (Postfix) with ESMTP id 279BE6B0271 for ; Tue, 26 Jun 2018 09:15:52 -0400 (EDT) Received: by mail-wr0-f197.google.com with SMTP id b12-v6so11136997wrs.10 for ; Tue, 26 Jun 2018 06:15:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=VCj9H90+ovXjReBaVfSQH5CvcvzciBxLHdjd+ndYlao=; b=NhTYGjQuN1wmB9y4WGLoI3u5iMq4l4Cr4UT8nPVnBXd51c6u6x8fZfJbfpCyBkwZ0Q NcOW8UdSrnMW4qO0S2YyAvPvteqZSwc7U3BHX8xDrqshmUkNdL/WSbzFg+fDODU3eetS RyKMZ31wdP3G0y4uWm1xPR8h3rJhXeQ9Ff7OrYd80OCg3mYhz8vJlcMLah2wl9UF/A3y QsiY7PM//6nJUwxkh9BdFntUPBqvMD9NOGcFA7P8sNOocIFeL5GNSUwCc1fnu7w0cE/H gsDPgFWw5ELkiPYPjY6n7UfdtfTS14OdBdHGRU6fTQDbKTjaHNsPOHpmS0eNCHZTfIIE 6cxQ== X-Gm-Message-State: APt69E3gR4TFC5hWuNzU7755+jbwwi409GqW8X5QQF2BW8Ext6H2GvGB y/r8pAzjEeLjwTs28qbrj8Rndmml8Aj2qN0IRUBwKAV2ufioMOqVYKsckWQ4gCohD2930Ss4sXq vaknCY5A4idOvaRdXlmKjzWu+TX9PFlgsUbJyzeSj5EVtn8ZA6wWOuIy3pDO4eDep3bqniBG9Mt ifEqAwTXv0kv90buu1s5tvti/oO9P0LnvC4voEl18PDJLpZtPfNQHRy5TeUVVFDQVSP3PtRUpYy PulCM8EBcpkvVgi7cRWK4QdqdXrcxr7MTHkkQwMcKkqzEt2mh4vQwxwN0Pj45zY/1/VGCXsZelz sutiv2AAMdpMB/jpoMFox8JNMsIytUP/ixQ2rlh/AEfRGTw7/nqyZXzi+SrP/299yAQSi3yGtnk G X-Received: by 2002:a5d:4a4d:: with SMTP id v13-v6mr1508405wrs.91.1530018951727; Tue, 26 Jun 2018 06:15:51 -0700 (PDT) X-Received: by 2002:a5d:4a4d:: with SMTP id v13-v6mr1508357wrs.91.1530018950959; Tue, 26 Jun 2018 06:15:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530018950; cv=none; d=google.com; s=arc-20160816; b=Olq2InZhk3tIJb9CPtuE9UTs9ZiTU1utJuB/fu6au3mNC8hh6ezzqx89vKtcow7AYA 2lWbfrj4LdvyrpBeATUx6GiGr+R3v9wIcg7dQXmJSKf1xfJYdiMhBthvcP9BXHFZCCya qsf1KA3w01tNBcdQrUriNgPyIX3HRLGQ/vo44fvEJzQE5pQwA5JS4noTu7T2vSDxubPH lZSyECDPPoQYWHrK+UNiR+ICHQkCOObNt7P47an1Rw9zPG63Qs+RmYX1INwqstBPbqnL zO3s37lctLWcAOib0Hd5AYaRVHq2IJH0YvLnini1guKm4ig8cQAc/fM18B2hUX+pDHiX ruQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=VCj9H90+ovXjReBaVfSQH5CvcvzciBxLHdjd+ndYlao=; b=lyauItG4a36082zQAERfAbVol0xwzK3rF8aqFz0k8vvqnADlKI9+FJR1I6V/54LTnZ 50LDkj6pecKN46J1wRPc15xKwDX3v9k8TS1hpMtejrU7oZYuvOBpGBcgL8xnUmEK0DPi PwD9ZBiShXYaeOTPApa0CBJHGdFNybOD5pWncP8kjMUH4SV5KP4UOSYxPbMpZw57TpdP vk4KmT/akoJqO6sgpKAc1vkh+IQCa+RVSCm4GxK7VCLlhqqSqMuZ2PdWuvYfhAPA8xJS QxaqGXZsOR2I4QqoURcuHnUx9Hm7SDks4wc0+MIB28JGAF3TElJyvvCLExi85YBnh0HI 6Sng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="algw/UwA"; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f75-v6sor630501wmh.2.2018.06.26.06.15.50 for (Google Transport Security); Tue, 26 Jun 2018 06:15:50 -0700 (PDT) Received-SPF: pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="algw/UwA"; spf=pass (google.com: domain of andreyknvl@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=andreyknvl@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com 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; bh=VCj9H90+ovXjReBaVfSQH5CvcvzciBxLHdjd+ndYlao=; b=algw/UwANNBO1mP8NOPjPQ7LzR9BXgfrF6JZbe2j23CRiaeC4quc9v2Pm9S+28nZQW Uf1RnrtevSQnDWdy3oME8nUVpfliRZHbflCk1KaJOPBh+s59TQ2rXTVjSXQKYX4xc3rz YZzGV2bP1kDQhyhl4DJjYrVYQ1FAGxZDG+k4fMLnl24PHJYajW8B2l5xnkDzRQ4LmvXb SxsYH1O+NiL3nOvOh1DGsY63j5ex5TO/l1Kr8InZzfDWLgr+XcjnYAvWwyI3RsWLJnyQ E6VXTSe7AJsh27qa/Mziek9jIq97/MtUKUwmCtGqACW66dqg0VgJNVLs6UEfJ3/a0j6H tepg== X-Google-Smtp-Source: AAOMgpf2aPNc18qI7NpSf6WnKXLP4rIHGIUXeOMxVhHuHs/y7iMs+6rYMoW3PHAwctKy6CsBoOJ11Q== X-Received: by 2002:a1c:5c93:: with SMTP id q141-v6mr1611058wmb.77.1530018950315; Tue, 26 Jun 2018 06:15:50 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id w15-v6sm2162639wrn.25.2018.06.26.06.15.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 06:15:48 -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 , Andrey Konovalov Subject: [PATCH v4 09/17] khwasan, arm64: enable top byte ignore for the kernel Date: Tue, 26 Jun 2018 15:15:19 +0200 Message-Id: <82571a6721547446b789f759f93bf7f3930541be.1530018818.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc2.346.g013aa6912e-goog In-Reply-To: References: X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 /*