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=-12.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 E9D33C4363D for ; Thu, 24 Sep 2020 22:52:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7FD672344C for ; Thu, 24 Sep 2020 22:52:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="jivKxzVo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FD672344C 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 C12AA900008; Thu, 24 Sep 2020 18:52:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BC38D8E0001; Thu, 24 Sep 2020 18:52:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB210900008; Thu, 24 Sep 2020 18:52:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0069.hostedemail.com [216.40.44.69]) by kanga.kvack.org (Postfix) with ESMTP id 93F0B8E0001 for ; Thu, 24 Sep 2020 18:52:11 -0400 (EDT) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 5C2EF1DEC for ; Thu, 24 Sep 2020 22:52:11 +0000 (UTC) X-FDA: 77299454862.23.pies78_3301f5327162 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id 3C49037606 for ; Thu, 24 Sep 2020 22:52:11 +0000 (UTC) X-HE-Tag: pies78_3301f5327162 X-Filterd-Recvd-Size: 4365 Received: from mail-qt1-f202.google.com (mail-qt1-f202.google.com [209.85.160.202]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Thu, 24 Sep 2020 22:52:10 +0000 (UTC) Received: by mail-qt1-f202.google.com with SMTP id g1so480742qtc.22 for ; Thu, 24 Sep 2020 15:52:10 -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=EzOSatxt77kQTpMDzUH4DeIdKeSKa7cxcPUIrRuVpxDUBgMKPxMeFND7wL0faMBoKY k5C3VoOgqPoeCMaO4K71GmCZrilOFg8r4ri01PV2W7riSUIzd2B1mMLxB4WIlpcYnLdc 1zPbkZCRG4uiT4Q3qdjfynFurD0pslYlrFjc+31Mv6CPpVc0mgf9aMhW+RIB2D3hIu8T xnJddJKvHeDiGaJRAAPRLEkKpoTCwkzQlRNf7L1ag56WqIOUkkgOaSnlGuP3uldR58PN KvSe6PxIQQ/fG6+FYpJBEHjQSrMo34NAvIet+c5vQRCfh14DYO3gv8Wjvk5kMFvrIyDf i8Tg== X-Gm-Message-State: AOAM533U0ZP5ev1gd8SgfSL9H0sThvH84gihGHLzAFZeoLptKm25UyJc p+h0QhHlLL6JnY/AJrHXdYRdFPH5Y5cguzQ6 X-Google-Smtp-Source: ABdhPJyj/wxjt8fJOh/sNJijCsRPMcQiNlo82eRx5FuCsllihp9L7x7AZbmZRFE367ZIrj/iiDtX0ik/AhqH/Lsa 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" 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: 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