From patchwork Wed Jun 20 17:39:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10478245 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 D1E24601D7 for ; Wed, 20 Jun 2018 17:40:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC5A628D69 for ; Wed, 20 Jun 2018 17:40:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B09DB28D9A; Wed, 20 Jun 2018 17:40:39 +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 4E80F28D69 for ; Wed, 20 Jun 2018 17:40:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C55936B026D; Wed, 20 Jun 2018 13:40:23 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C068A6B026E; Wed, 20 Jun 2018 13:40:23 -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 AF4DE6B026F; Wed, 20 Jun 2018 13:40:23 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f70.google.com (mail-wm0-f70.google.com [74.125.82.70]) by kanga.kvack.org (Postfix) with ESMTP id 543C86B026D for ; Wed, 20 Jun 2018 13:40:23 -0400 (EDT) Received: by mail-wm0-f70.google.com with SMTP id w21-v6so282721wmc.4 for ; Wed, 20 Jun 2018 10:40:23 -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=NNTjp1zLzU5TrkbNCH/i6H4SroEd7wqmKsanmk6nVVo=; b=Gw+hqpxhA8K2KDDkJWDpzFCyJNnF8sqVYNgtlpi9AXJg0F7ps+szOMAhn6T2DLaOrS WBtAPvQuQSR/dZ7Rb7tjL0UH0syGxNR+KHCrWz4H+Tt7iw3z7aefxm3ab8A7LqecXS9u M49lx3hREyO8g5FGQKeuIGTtgY9reZSDoMUO3iCR0lF2F2eoSNft0+UDWiBAjEADZHya +/Kcw0rzYVuia2lbT1bYxg7mGYTUysFfNv49j9YgT0q+5CZsczDTl64gMx3MabnYkvw/ NFBjuXaBBgDjP2XQY15ih3ZNMzAPbT8OLY3UlGpbL+B0RUqWKTISgELhAfYtVxE4ccYz LHNA== X-Gm-Message-State: APt69E04RBDQdqzo1QLQHo4X47GuIH9gKv2zBvAKSJzm/gfFTQnfUy6n MDd6PYOLVTFOiowB+W/vTCFxlcaKi9hxa+IRKgApy6mRP+6DsvszcFAS7ifO9pwsZZl0G02pkpo 1F7O0ealvhS3yO3sWNegBsXSdJJTmUFL67NH30iK5AZ14SfQ0Cmv+XHgRG8aa0q0ytTahHLTw7L zoI4cYneUVX80scc57LPx8uCHwLBwGNVkFV+jLNhw+VrZg/zHqbDnDLb67NIrq5XFS89rVqLFmL I48DejU+A2ht30L30YO2S2hFC1lVvEC4O/Wh6R43/FfAZujh3SWkl+Gp1KXTFeeTfZ1jAc4YTxD MBhwVHJiu8Ric3dqn/hdUAgNmkhmeDJlHgUzQ3DramHFXPb6IyVnM+NNladBcL8fkjrSWnodp/j / X-Received: by 2002:a1c:d106:: with SMTP id i6-v6mr2339119wmg.1.1529516422886; Wed, 20 Jun 2018 10:40:22 -0700 (PDT) X-Received: by 2002:a1c:d106:: with SMTP id i6-v6mr2339094wmg.1.1529516422175; Wed, 20 Jun 2018 10:40:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529516422; cv=none; d=google.com; s=arc-20160816; b=PCmHMZpxEGfUkbUYcps7wn/v/k9ta06diPzV2lL9rUC/BfX3Sx8D8bQ66IQodeP4tt toytp7hZM6BPJYPxoVb9t7wejZCocbiaE9JyRT8cNxpWK6Dc6uSlKQG+yFeG7x3mH8tc kORbLFzYY8GeDWLBkf92ZgGV3cmfDGO48iu2tDL3Uls6XPf3EW+RrXoIBjyueEXClYJb bW7iqLb+r9mOggr2l4XV8R3rcSfxQkA0wxlv/a/56iU+J1PNyll9fciQH7F+BvRPQq1W nFtS9J9X5HzA4c6GsPbFmn/6pCUCu2T3watk8erR8ukdAYC3HwjDe/P9xaX8pHFR6E8Z Pu+A== 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=NNTjp1zLzU5TrkbNCH/i6H4SroEd7wqmKsanmk6nVVo=; b=D5K1JpoOxRvdb38BlenA7o9Hhopu/JIsQ1Pb1n2jxejEcnNgPWXO7EN/Px0fBTwuHw ezroOHKJ4vWGWqZV3xhHDOXECqKw2sAiyu1crBi6hAuEWfZKscG+NAACCVQJy95wjETo +hfmI/gkOUE2/4bZ8oPVGwTxLsaIb5kQz6MF2p2WesqOGRWHmGomWPaY2n8uneSuZeNM rY1x1UF/6hn6r4wxCtTdMUR56t3RQ/Mo3HjjDzsp1RoSmNP2fRAdhGlzCdP7pz+8zb6F WboG5Sox/xXCmvOp24h0PjkfM1AYAXht712RlJ+IJ1EzEQPDnUQyWm9/4KLJyoDZV9ht 39Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=bFsStUkr; 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 f19-v6sor952389wmc.53.2018.06.20.10.40.22 for (Google Transport Security); Wed, 20 Jun 2018 10:40:22 -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=bFsStUkr; 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=NNTjp1zLzU5TrkbNCH/i6H4SroEd7wqmKsanmk6nVVo=; b=bFsStUkrQ0iQlrPVOiBmoBIbL39mZFNIc0wIbZll5jQQpzGkz4MbKilvlXwwlEuhSu 0Y0XIZKORt0shALA72NzNHucE9NOplJC+ZsJmZcH08JY+9K7M+6VZkK+TXZ4uOKFUuQ8 D66xYyXBH6zYcG7jlf9CGRPtkDOB8q9dkXOzBAySr4xbBEZigcnPierMx+uJwxP3GhAO UqG+8s7pCsI4W6JGf5xd27Hj9jrL97vRm9pKVfJT1YZZhUxC4z7T4bMcYRc2fTob6obF jlUnW87SdLRkh/dARxA/xlOwS1RNXdnvgH8wH1RP/BJxHEYT8UWxydE28B7/a0QcGcBp psAA== X-Google-Smtp-Source: ADUXVKKR5vFQo+Ie2U5T/+P6vWrH+ix/bPBkxBVosLpjbv2YqXISbPE7Ei1/evj/LtcPzKS7oTWTrw== X-Received: by 2002:a1c:71db:: with SMTP id d88-v6mr2586324wmi.117.1529516421542; Wed, 20 Jun 2018 10:40:21 -0700 (PDT) Received: from andreyknvl0.muc.corp.google.com ([2a00:79e0:15:10:84be:a42a:826d:c530]) by smtp.gmail.com with ESMTPSA id f18-v6sm4388598wro.1.2018.06.20.10.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jun 2018 10:40:20 -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 v3 09/17] khwasan, arm64: enable top byte ignore for the kernel Date: Wed, 20 Jun 2018 19:39:55 +0200 Message-Id: <4d55f61003bfb55d2b37320a5127f182c3a71111.1529515183.git.andreyknvl@google.com> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-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 5f9a73a4452c..f3dfcd74a285 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)) /* @@ -439,7 +445,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 /*