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 C3F40C388F7 for ; Wed, 4 Nov 2020 23:20:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F54E20786 for ; Wed, 4 Nov 2020 23:20:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vNs/tV40" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732894AbgKDXUg (ORCPT ); Wed, 4 Nov 2020 18:20:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732873AbgKDXUc (ORCPT ); Wed, 4 Nov 2020 18:20:32 -0500 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 2C3D1C0613D2 for ; Wed, 4 Nov 2020 15:20:32 -0800 (PST) Received: by mail-qt1-x849.google.com with SMTP id 2so72951qtb.5 for ; Wed, 04 Nov 2020 15:20:32 -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=E7M1YMbMIR4yMAYd8ymzpiiG9f9KaGeAaRDscMDAbI8=; b=vNs/tV40nkRYLh+bd2pRN8tnAzZTvTLYqRkQOCW6i0NqSU2MOjkywCmEziyzjFDNbr 1rXXXbldJOqtLhDCWvgATfC+KSCn3Aw1SgcbKhGaY2x/0ad9/WzaRZcunh9SZ9VhdWE+ 93GL/HUwq1B+KUAPEFz5rUbLRIrVBCkQXeDb31FsmrSWnLJ4R1ycm2wOLG0aAjeFzPNd jLN+AusTKOptQ9gIduhkrhSG92OcBcAhl87OkgzMmsZeCPCIffeaaQOvpyCBT3IoQjWh u6V6jH9lhOM7AGfqm48kv9PP2ZoAcIs2IFa3F6C/Ts6nXU4mcYfW9PncMAclN7WOtnNw P00Q== 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=E7M1YMbMIR4yMAYd8ymzpiiG9f9KaGeAaRDscMDAbI8=; b=X2WR46wvtV4C4baoI3ZyYlkSDgC5A85k5GPgu9aqso5HFDcZlq9xJRq/fGe/OIQQUt OPOIa57FDezFJTQbmzi9Tk1JHCOU6egNRfMORSai/9NffW6QBn7D2nLzzf/1PGsX1ZOE vPgUC0H3EBaeh8fk2fBmOrJA2azHCmbLQ8JIf9/n8V34exxODX6LUSEijcgpPjfxE2p+ 5FgtiFg7+99icjMZ7fR/80H0jsgiOqiqJWFKpKinzcbg41udAV6HxQV/VBZI6zwmqG7B yi8Cv8d1FXsXaUl7osEIQ6+MAdaCp5XiUwIMX86mFDvGauepKH6ZexcZShai9IxnBxCC z+WA== X-Gm-Message-State: AOAM533ZRv8FRPSGspV1Lnj1BXd0JzpYiPKEDWUa4MRRDLpQlnR79izz KdyhSjVVHX/jnjCR/bbpm+3E6SiGzOEJYUtu X-Google-Smtp-Source: ABdhPJzqgs/A05RlcSOyed/F/WMpRLrfZfCyn2cPNSS5rL4ubrhak1Ah1gehiCULAgkww5qluz2BjCh1uVyX/JcV 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:ad4:4b32:: with SMTP id s18mr435733qvw.16.1604532031338; Wed, 04 Nov 2020 15:20:31 -0800 (PST) Date: Thu, 5 Nov 2020 00:18:50 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v8 35/43] kasan: define KASAN_GRANULE_SIZE for HW_TAGS From: Andrey Konovalov To: Catalin Marinas Cc: Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , Andrew Morton , 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" 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 e3cd6a3d2b23..618e69d12f61 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.29.1.341.ge80a0c044ae-goog