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=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 BE249C433E2 for ; Tue, 15 Sep 2020 21:29:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EF68E2078E for ; Tue, 15 Sep 2020 21:29:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="TIPPZ9st"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="Yy3NAxKG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF68E2078E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TerMnyLVxABkFcPNDKGJLLzNRO91AFxFueHj+qiK/xU=; b=TIPPZ9stvy9e4ML4V8YTrkYST odsDhkK58yoLvQXqMzT0I5cUug9fFEUBiwlSm8Gffih+NwNgCx8VbWKo+IaTrw3++fUPD6EaSEMPU fpou88E8xlk5+lWSpsrUMrxg26rEuLFMWfUb6h0DEmLHNGAoMlLlDNJeq24UxY1ncUwts95h1dGTP Ynwa8a877afziSFE3QRTyNdG4N5VLdQ4g8YF8ozThP5RLHYVEb0Nl/EAkoiP3Py4F51V1NSXUJpFW ahVd0K0D50IkeKIl5xtg6nXRqa6xd4uE8ru8dpkn8C0Ciax7E5pwYb7paWSHcsJhtBk4GD+G5tvBu qYYITKFow==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIITb-0003Ok-Kp; Tue, 15 Sep 2020 21:26:59 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIIKU-0007EU-Sp for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 21:17:37 +0000 Received: by mail-wr1-x44a.google.com with SMTP id a10so1680723wrw.22 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=p625h5UAW4jWKMFc/DwzLVpBnDkSPv6npbixa9zKW0i2I/x0+Yqa7IEEsLZKuI88vG XMb3taIazQl7G2GrwoIzCP/+jz/1AzeisO4JabQUXs6Y4WJ4Gu7bzPlR+94GqTyUzNEf zOxD4E821vwECii538bcPpCWXP0Iq7ZJSS17+hhNM3vTryvR9n/Twwwzz7+NcZ6UD9nW tMwJMUjmP0wYEV4DegZGjLVnlkeBuoZkBnq9l/zj5KhQ+qQfDbOk9l8VkXHIxOhL361R MUFg90TSV2Dema9iXk8wwp2ePKpcXxhNnBVIg1Ajh4CsYU7SaVoL4Ao99H0lTDn2TE5e MeHw== X-Gm-Message-State: AOAM532Htd/4/fz7rI7pO0S2GEcNIY3kApFGx+JMud5NAYEfFmIE7n3u HwyRggj1YUPAQUdoKYYB5e3BlWpCGpElM7Zn 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200915_171735_027710_8F5C646B X-CRM114-Status: GOOD ( 12.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel