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 B21E3C4727E for ; Thu, 1 Oct 2020 23:12:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7592720739 for ; Thu, 1 Oct 2020 23:12:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Z/TzKhjp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387729AbgJAXM6 (ORCPT ); Thu, 1 Oct 2020 19:12:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387624AbgJAXMH (ORCPT ); Thu, 1 Oct 2020 19:12:07 -0400 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9421FC0613E7 for ; Thu, 1 Oct 2020 16:12:02 -0700 (PDT) Received: by mail-wm1-x34a.google.com with SMTP id b14so42658wmj.3 for ; Thu, 01 Oct 2020 16:12:02 -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=hpJpWYgCbJqCacKELcaZY87V3j8i77+2ePhmmcYZBwE=; b=Z/TzKhjpg91DfKCc/CiqW/F4XrM8/U6zmv+9HIDxEvnoi1ckNUpyOG4cj68JJ6spg+ aA9EFmQM81hY10kgafDc8KyTDl+2q41H6ENogJ2RtbBGAiUfJEx+eP7tAbUo/mAbsiSi jd6cZ+jdd1pfv5n7yYC7rhk8KsHKLG1/XUiVvxLVhWrSSQYdJE1OaJqpM4XLRZAorfiy bjH/N2+Ql9DPeM7RD2tlnzJ6mNi8yFpYOsFfTg/pg04yvlTT6VMnfE0DvjF5F+YM0Mod nla9jlN6fHFSKjkU8Pf7uqZNUyixW/3+UYlU2wIk5flUxhn42CjfCWGpcoxtc1RRM9u3 9VyA== 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=hpJpWYgCbJqCacKELcaZY87V3j8i77+2ePhmmcYZBwE=; b=O7pqm3EiMXXy8R3rKwpBFi3Ph87gCX05FXZKw5F4CQls9G5i6YHgMjSj9TtnSMSKnR J9ojCckWzZJ28efElBeCr+RNhIGlbrTctcwk+GXRpemiLazLlcAcJbTpTf0FMNXMNUVv aFdb9Ob+Le5a3FjxqI3GwXEvOCDvBaRtUpaVbYiCDcle2331Eg4SLnvUwu6Q7AfbnHP9 yft767+tF5IVVWW8XjhfvB0Iwhc3eFK7D6UvKm+ILNUz+csshCPZ9vfnXOhW8wlD2qNK 0c6jNF3hwzc7zAYsHw4K2fX422GWE3+TYtvRdjA1W2XTC0rJUGapLtcHY/fTQMENqYK0 VCHw== X-Gm-Message-State: AOAM532NC3OYLrwI4lKvcLt9N0cekdbGIIEgA6OYTK1T8ktQDO7AQQ/0 WUTfc5wnKiE03NLQD0eZunnWvjsWYlCUJnp7 X-Google-Smtp-Source: ABdhPJx0Pq6gAwprm7ylOWsjE098TiN8AOf8BUCNUupdLVMrlls34MPn6CFBY8IIC1tomeVuQwSv3CMV98Hex5dB 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:a05:600c:22c5:: with SMTP id 5mr2354008wmg.34.1601593921173; Thu, 01 Oct 2020 16:12:01 -0700 (PDT) Date: Fri, 2 Oct 2020 01:10:33 +0200 In-Reply-To: Message-Id: <2f2c30b9793bd5da7601043c9027d1b87ccb2e8e.1601593784.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.709.gb0816b6eb0-goog Subject: [PATCH v4 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 Reviewed-by: Marco Elver --- 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..cf03640c8874 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.709.gb0816b6eb0-goog