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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 D8F1AC4346E for ; Thu, 24 Sep 2020 22:52:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E62123899 for ; Thu, 24 Sep 2020 22:52:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jivKxzVo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727074AbgIXWwU (ORCPT ); Thu, 24 Sep 2020 18:52:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727044AbgIXWwL (ORCPT ); Thu, 24 Sep 2020 18:52:11 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C1F8C0613D3 for ; Thu, 24 Sep 2020 15:52:11 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id b54so494174qtk.17 for ; Thu, 24 Sep 2020 15:52:11 -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=sJr1Ezt1QTZM7xCujMwarLHpec0t/6/LWXnFkCD3rjo=; b=jivKxzVoAqHEDzrLm2QWD+GaZd20HIIDkT7YFuurx42lKizh/iMLEE23jRxB12jFID We5xivpAwjCnlv5xomqCSC7/eMfSdN3LieY8CJ0UGPwAfpPIf9YGF/ZpmgYbhtW7QrIy XO76Kw+2clcdws74esaGni5Uh1pzlxSRZWVusu9klcWgw5WTjswUK2scaohBiL0DQyDc qLEK8nXlcGxr+LF50wVKg4kVk6yjFf3fzdFJBmYlBAimYPpFPOTUA/tN+5P+gD/isLJr PLcA7eax7VE/GvkZfOOLZYOO3jRN3xtQVIqbXNOeXmE9STyBuywMrU9YgkYSR9xR9NsT fkdw== 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=sJr1Ezt1QTZM7xCujMwarLHpec0t/6/LWXnFkCD3rjo=; b=NZ9uaSc4zpVIqSImOWdfcsxvCZ+jsPzFKNdchURQjnrmghJDMf3AjxApPtcMhB6Ozb eK580hEQ+pGhTNkOEHU+TPCKrOcrQ9oSqR0lN6/UYo85EAyrvQj7xKe8swWU/6O13P4j Ofbhzj+HPm/2TpcCfUvANARwB415ICCX/cv0glfA96A6h3nB1j70olFAEqVGX55eSsFb eoFWPOYdHK0LIgCbL3UPJHe/IPYuplodJmR3LP7eQjN6ZOxuuJSm8c+PU9R1/b8+l+OM QeoyESO06QwS6mDdbtEi6p2nL6Ps/Clz/6s0G9vzNADDgcy5/x/4xpqMwKP8+pv8c2kE /INA== X-Gm-Message-State: AOAM533Yq2oRxbwPkIaH0zjMN5i6ZXCwUBCO6d+nkGgDBRNFtkzJqALJ lQUo/UpaUR0undrRLhHzWP2/89oQ6HZuHSuS X-Google-Smtp-Source: ABdhPJyj/wxjt8fJOh/sNJijCsRPMcQiNlo82eRx5FuCsllihp9L7x7AZbmZRFE367ZIrj/iiDtX0ik/AhqH/Lsa Sender: "andreyknvl via sendgmr" X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:f6c4:: with SMTP id d4mr1575582qvo.41.1600987930210; Thu, 24 Sep 2020 15:52:10 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:39 +0200 In-Reply-To: Message-Id: <08b7f7fe6b20f6477fa2a447a931b3bbb1ad3121.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 32/39] kasan: define KASAN_GRANULE_SIZE for HW_TAGS 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hardware tag-based KASAN has granules of MTE_GRANULE_SIZE. Define KASAN_GRANULE_SIZE to MTE_GRANULE_SIZE for CONFIG_KASAN_HW_TAGS. Signed-off-by: Andrey Konovalov Signed-off-by: Vincenzo Frascino --- Change-Id: I5d1117e6a991cbca00d2cfb4ba66e8ae2d8f513a --- mm/kasan/kasan.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 9c73f324e3ce..bd51ab72c002 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -5,7 +5,13 @@ #include #include +#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) #define KASAN_GRANULE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) +#else +#include +#define KASAN_GRANULE_SIZE (MTE_GRANULE_SIZE) +#endif + #define KASAN_GRANULE_MASK (KASAN_GRANULE_SIZE - 1) #define KASAN_GRANULE_PAGE (KASAN_GRANULE_SIZE << PAGE_SHIFT) -- 2.28.0.681.g6f77f65b4e-goog