From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C867C4346E for ; Thu, 24 Sep 2020 22:52:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 32C9B2344C for ; Thu, 24 Sep 2020 22:52:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="aE6bW7ZD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 32C9B2344C Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id C13A18E001C; Thu, 24 Sep 2020 18:52:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9BDB8E0001; Thu, 24 Sep 2020 18:52:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A89F98E001C; Thu, 24 Sep 2020 18:52:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0239.hostedemail.com [216.40.44.239]) by kanga.kvack.org (Postfix) with ESMTP id 9021E8E0001 for ; Thu, 24 Sep 2020 18:52:07 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 59FB5180AD801 for ; Thu, 24 Sep 2020 22:52:07 +0000 (UTC) X-FDA: 77299454694.02.wood21_1b0837c27162 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin02.hostedemail.com (Postfix) with ESMTP id 30A271018ADDF for ; Thu, 24 Sep 2020 22:52:07 +0000 (UTC) X-HE-Tag: wood21_1b0837c27162 X-Filterd-Recvd-Size: 5090 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Thu, 24 Sep 2020 22:52:06 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id a7so327985wmc.2 for ; Thu, 24 Sep 2020 15:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=ISpXqi6MEt5kdGDveTeyFeZjiJg33x31XXLtNJOX90w=; b=aE6bW7ZDlkLgWzGa4o3PRAmLiBp3IRcgh5N7h4FNoVyd6AmscujV9JlWq8dKljxlC4 523n/Y8i6ZrEXWAGM10ylIXaT9VSUlUo/q1y7jMxJTxGoRKHXZsVU+VxTg09dnzxtEbD 19Mk0NQSrnAEHsTaq414dsxpbVsGA13Z4r2092REN2jpW9aTyE6HZcGf0RIyN00skHGv hrPrZptQh/k8srB8zWpu/LLo9neRTFmmGfSjvaZX6UJOskQAD54nSGk30kdAI8M2++s3 KtYqNM+uEMLjiBC4sNDBQOXBaQfS5KGXKWJ1AaUCiUACAr5+tBsq94cciSXeRPI4hnF/ bn1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ISpXqi6MEt5kdGDveTeyFeZjiJg33x31XXLtNJOX90w=; b=nJD8IG/7oWdtTQi5SufwROw9EfD0XBzhcxbKaWAwR4iVHrFiQFZoqaJ0Cd73cIu3NE ccqJRDNqNBs7D/WolV4jhdccib9YYXvqhOhENyGLmoC9/ikUhlsEvkQwjpNw8/8pPyUB ywNkZJHwbS3r/ulR6gUJbX5gSWX+llRB5jhOMKfm1e1x62xo1Emc7AA+exbgbuFLaL7y 2Hsp4lWRO2WvkrpKxO2dJP9Bf4YYOcLUhKHcF2Zol6h9EROr0KF4kPwI4+fXXq22UDxS 1Q/aTwkuS3ApwsIPKA0E5KRkFRIelx2ImEOLxfFf+I3UusxIUVuwZCJUhYaqnLQ+gVEG uCeA== X-Gm-Message-State: AOAM532+y0We2/70zie5FH04HJYG1FGzdn6S1oMB+CH2L9pt9Pk1t/9Z vLHKPeUdxk2dysdngE8ZsGYpW4JUFWyGS0R7 X-Google-Smtp-Source: ABdhPJzhV6ORp8E+PJLlYV1e4UYVrlVysMgIWJSr++y4qyiS9CmeuzTQVo6Ea/EmYKbrlqlyS8hMPkCXlel3wibI X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:4d0c:: with SMTP id o12mr202wmh.0.1600987925110; Thu, 24 Sep 2020 15:52:05 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:37 +0200 In-Reply-To: Message-Id: <733e94d7368b54473b242bb6a38e421cf459c9ad.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 30/39] arm64: kasan: Enable TBI EL1 From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" 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: From: Vincenzo Frascino Hardware tag-based KASAN relies on Memory Tagging Extension (MTE) that is built on top of the Top Byte Ignore (TBI) feature. Enable in-kernel TBI when CONFIG_KASAN_HW_TAGS is turned on by enabling the TCR_TBI1 bit in proc.S. Signed-off-by: Vincenzo Frascino Co-developed-by: Andrey Konovalov Signed-off-by: Andrey Konovalov --- Change-Id: I91944903bc9c9c9044f0d50e74bcd6b9971d21ff --- arch/arm64/mm/proc.S | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 12ba98bc3b3f..dce06e553c7c 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -40,9 +40,13 @@ #define TCR_CACHE_FLAGS TCR_IRGN_WBWA | TCR_ORGN_WBWA #ifdef CONFIG_KASAN_SW_TAGS -#define TCR_KASAN_FLAGS TCR_TBI1 +#define TCR_KASAN_SW_FLAGS TCR_TBI1 #else -#define TCR_KASAN_FLAGS 0 +#define TCR_KASAN_SW_FLAGS 0 +#endif + +#ifdef CONFIG_KASAN_HW_TAGS +#define TCR_KASAN_HW_FLAGS TCR_TBI1 #endif /* @@ -454,6 +458,9 @@ SYM_FUNC_START(__cpu_setup) /* set the TCR_EL1 bits */ orr mte_tcr, mte_tcr, #SYS_TCR_EL1_TCMA1 +#ifdef CONFIG_KASAN_HW_TAGS + orr mte_tcr, mte_tcr, #TCR_KASAN_HW_FLAGS +#endif 1: #endif msr mair_el1, x5 @@ -463,7 +470,7 @@ SYM_FUNC_START(__cpu_setup) */ mov_q x10, TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \ TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \ - TCR_TBI0 | TCR_A1 | TCR_KASAN_FLAGS + TCR_TBI0 | TCR_A1 | TCR_KASAN_SW_FLAGS #ifdef CONFIG_ARM64_MTE orr x10, x10, mte_tcr .unreq mte_tcr -- 2.28.0.681.g6f77f65b4e-goog