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.5 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=unavailable 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 01A1AC433E2 for ; Tue, 15 Sep 2020 21:56:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B749A207DE for ; Tue, 15 Sep 2020 21:56:56 +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="Yy3NAxKG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728002AbgIOV4x (ORCPT ); Tue, 15 Sep 2020 17:56:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728105AbgIOV3Y (ORCPT ); Tue, 15 Sep 2020 17:29:24 -0400 Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 470FEC061226 for ; Tue, 15 Sep 2020 14:17:32 -0700 (PDT) Received: by mail-wr1-x44a.google.com with SMTP id a12so1706664wrg.13 for ; Tue, 15 Sep 2020 14:17:32 -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=gQNZi1xbbNqueATb+Ofst812z+wTX6Uhy5JHBLW29HQ=; b=Yy3NAxKGs0090BOPTba/nzO4cFPD9qSiFj0muhX6uXXMpAPGomh/ZDVdoYoyMlJR2H lIazQ2HvczoFsJTOWPdKzJYfc2/WOOw9C0hGyRF9UQYgPE3AgqDYVZNtdqTPibhmoXf1 VMf+YKRB6flrLwpkd/7RoFRlnJ08ZGYvHEW2PcJoF+BsjcFwlCOhxqpdr/MY9g7x5o7R VH9u2MeaeqzIdTc+ZxJb27i3vPDxpiSRfNRQmZDcS6TPnaY9a9KOzceh+71b+fUis8/9 GkMM1tMTE9Ao04l35J6odqEAVgW/k0Ib0q1fXWI+cyy/5MUehNYMowaBVV3WbqukJYDt FAgw== 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=gQNZi1xbbNqueATb+Ofst812z+wTX6Uhy5JHBLW29HQ=; b=DrWxgnHPxwIz/6Lj8oL3eu89wQKhc1cWkghbFL3auwMYXDC8IdeWkPhNcpY5MpaLH3 yiib/GtcQ4EKrOui8i+2tMo8xv39YjsIERKogK26a9lHIlS3ihF/cG7r39GzxBoruv8I +B5eioyv4M7UAnanYGpLryTe8OzlMY+IdSPgtS1HevHJAo50AaoWpqlO/UKSmuDjYtxf nVTYmCz8nll4xwSn6VqK+tMa0tOfGGKMDkHjMCgtGcrhx6rFBprivQoBw9gEJ9uiq9zJ mFoVoegANHM6yS41fY4UEE8RNpjVO46VQBkLDc0tRr8ucnuk9XSob9LDZUt6ZOMD4TEm qR2Q== X-Gm-Message-State: AOAM533rDBzukHJXutywRwhre5NwFYg3QpfJucLO+fHWhTuQTx1TO49U DuPlyk7FphDJgfORReZ7JeXwt4+mHvf5iXAn X-Google-Smtp-Source: ABdhPJxSdz7eZtkr4LcxuG7RUBwuiBQj3nl4wipePG7BDeui7hcx3jwqP/ZGF3lGDPtyJkewnREY16db2QT71g3F X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:adf:dd44:: with SMTP id u4mr22386734wrm.22.1600204650809; Tue, 15 Sep 2020 14:17:30 -0700 (PDT) Date: Tue, 15 Sep 2020 23:16:10 +0200 In-Reply-To: Message-Id: <9ecc27d43a01ca32bcacf44b393a9a100e0dfdb2.1600204505.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 28/37] 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" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 5ba7ac5e9c77..1687447dee7a 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 /* @@ -462,7 +466,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 tcr_clear_errata_bits x10, x9, x5 #ifdef CONFIG_ARM64_VA_BITS_52 @@ -495,6 +499,9 @@ SYM_FUNC_START(__cpu_setup) /* Update TCR_EL1 if MTE is supported (ID_AA64PFR1_EL1[11:8] > 1) */ cbz mte_present, 1f orr x10, x10, #SYS_TCR_EL1_TCMA1 +#ifdef CONFIG_KASAN_HW_TAGS + orr x10, x10, #TCR_KASAN_HW_FLAGS +#endif 1: .unreq mte_present #endif -- 2.28.0.618.gf4bc123cb7-goog