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=-8.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 429B8C4727D for ; Fri, 25 Sep 2020 11:44:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F03BA21775 for ; Fri, 25 Sep 2020 11:44:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728381AbgIYLoc (ORCPT ); Fri, 25 Sep 2020 07:44:32 -0400 Received: from foss.arm.com ([217.140.110.172]:43112 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728069AbgIYLoc (ORCPT ); Fri, 25 Sep 2020 07:44:32 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B9EAB101E; Fri, 25 Sep 2020 04:44:31 -0700 (PDT) Received: from [10.37.12.53] (unknown [10.37.12.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 93BBE3F70D; Fri, 25 Sep 2020 04:44:28 -0700 (PDT) Subject: Re: [PATCH v3 30/39] arm64: kasan: Enable TBI EL1 To: Catalin Marinas , Andrey Konovalov Cc: Dmitry Vyukov , kasan-dev@googlegroups.com, 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 References: <733e94d7368b54473b242bb6a38e421cf459c9ad.1600987622.git.andreyknvl@google.com> <20200925113748.GG4846@gaia> From: Vincenzo Frascino Message-ID: <59c25256-374e-9a13-8098-1543b1768248@arm.com> Date: Fri, 25 Sep 2020 12:47:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200925113748.GG4846@gaia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/25/20 12:37 PM, Catalin Marinas wrote: > On Fri, Sep 25, 2020 at 12:50:37AM +0200, Andrey Konovalov wrote: >> 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 > > I missed this in an earlier patch. Do we need TCMA1 set without > KASAN_HW? If not, we could add them both to TCR_KASAN_HW_FLAGS. > We don't. I will move the code around in the next version. -- Regards, Vincenzo