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=-16.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, 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 0F987C4361B for ; Wed, 9 Dec 2020 18:24:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B9F9B23BC6 for ; Wed, 9 Dec 2020 18:24:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B9F9B23BC6 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 420378D0038; Wed, 9 Dec 2020 13:24:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D1AC8D0037; Wed, 9 Dec 2020 13:24:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C4A18D0038; Wed, 9 Dec 2020 13:24:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0249.hostedemail.com [216.40.44.249]) by kanga.kvack.org (Postfix) with ESMTP id 1353D8D0037 for ; Wed, 9 Dec 2020 13:24:30 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id CF8DC180AD81A for ; Wed, 9 Dec 2020 18:24:29 +0000 (UTC) X-FDA: 77574569058.15.wrist50_0a11cb0273f1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id A35881814B0C7 for ; Wed, 9 Dec 2020 18:24:29 +0000 (UTC) X-HE-Tag: wrist50_0a11cb0273f1 X-Filterd-Recvd-Size: 4606 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Wed, 9 Dec 2020 18:24:29 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id u17so1699330qku.17 for ; Wed, 09 Dec 2020 10:24:28 -0800 (PST) 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=u1bxfC07ZuZBOWsTyyUWqPiXaJQ6KPVo7f7CpicouQI=; b=jtZIxOGhOaY8oAUb8BvD+E79MIfynRleHrjdAsL7FWljVpVMiW+9Os1KVux0owqEVe kMtJVVMUdf40DWsrihpEssIeQvMKLCF7OFDI5UN+uL+0VG3PlWmY+CXC0qOxGNfPMgbB NfRJVSkGoC/wzm3y/97pFIYkMUwMSxktEWQ+N/D0jQWx9QJsSB7gzjwQLCUSeH/FmSJe dh8Qe7dcOeX2MgbUWfd9W9mQlAGniesJc4ri3yHSy+ZogRa9j74wYqIyVNcD5OVEUMnZ aBoOQ8V14gfhZObvQwUWgtENIiXQrwT5r9VXz94S/1UsAeJCHm6UagGVBZFv53XqMazv R2Og== 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=u1bxfC07ZuZBOWsTyyUWqPiXaJQ6KPVo7f7CpicouQI=; b=Z8qX83feNLaOTLoWIfdzMeZYihAZyroOpxhu36FJmVoe+ihxPE7AKUHJmd/I9idL/R PQfcY6DYF8vshaQIxnvrBCIMJiic8G3IW0T8IlhTeqPfAHt4pC83uakTHTSfU98U4z0l VM4ocEGRfHt16gn4pEKaRDWCc8+egLpezbz+oWbBQnhUyqdqyL4ypSB5LqfiE2nOkv3v vltJZXPd5c549auaKZnt+Zq1WFoCNK2Uvw0lenp4fb1SqXCgajxoIb+Tom/PBGSmBD1m WpUI0w8TBaAMXX3Hp6Kwd9rWo4YVNjGD3xckczdegWRahsK8X4EJ7utfaZFP3AzX3Iny DSLg== X-Gm-Message-State: AOAM5315cFAvGUKEGJESXl4+U2nKSv0aZ3a7sjugnGcwt80oL5wHFhL7 4Hwk4JT68sxEdj8Ls+K5NC7aHlXx8Z3wCplb X-Google-Smtp-Source: ABdhPJxjO35UNSehkB4BGFZLOWZ+ziczwvX3GKaWDtrA9OavTleg8eROATOV1foJb2L/aZPp+CXzNseKMOST5KYg X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:47c4:: with SMTP id p4mr4509202qvw.23.1607538268306; Wed, 09 Dec 2020 10:24:28 -0800 (PST) Date: Wed, 9 Dec 2020 19:24:16 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog Subject: [PATCH mm 2/2] Revert "kasan, arm64: don't allow SW_TAGS with ARM64_MTE" From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, 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: This reverts "kasan, arm64: don't allow SW_TAGS with ARM64_MTE". In earlier versions on the hardware tag-based KASAN patchset in-kernel MTE used to be always enabled when CONFIG_ARM64_MTE is on. This caused conflicts with the software tag-based KASAN mode. This is no logner the case: in-kernel MTE is never enabled unless the CONFIG_KASAN_HW_TAGS is enabled, so there are no more conflicts with CONFIG_KASAN_SW_TAGS. Allow CONFIG_KASAN_SW_TAGS to be enabled even when CONFIG_ARM64_MTE is enabled. Signed-off-by: Andrey Konovalov --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 6fefab9041d8..62a7668976a2 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -135,7 +135,7 @@ config ARM64 select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_JUMP_LABEL_RELATIVE select HAVE_ARCH_KASAN if !(ARM64_16K_PAGES && ARM64_VA_BITS_48) - select HAVE_ARCH_KASAN_SW_TAGS if (HAVE_ARCH_KASAN && !ARM64_MTE) + select HAVE_ARCH_KASAN_SW_TAGS if HAVE_ARCH_KASAN select HAVE_ARCH_KASAN_HW_TAGS if (HAVE_ARCH_KASAN && ARM64_MTE) select HAVE_ARCH_KFENCE select HAVE_ARCH_KGDB -- 2.29.2.576.ga3fc446d84-goog