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=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 23D73C4346E for ; Thu, 24 Sep 2020 23:07:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6FE7123899 for ; Thu, 24 Sep 2020 23:07:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="MIwzGmOZ"; 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 6FE7123899 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tsoP11rzvxdvQBqvTtlR4+L3e7BnAAqSkH/QAtD2x4Q=; b=MIwzGmOZ+IoJZLrwIc635Nkhr 5ORJbNPQYYku/Pqytm0UlApYiGzsISIRQ2hcZt+uLLrZOwz8DX0eY6dbir3l5Z5y60jcWzzNbXG/z HzGLs0Lz+u/QKZAzgtCfsPcOiAik6+ZVRCXqRZ78PbK0And6pUzJn24fwZBgak0GVHh6RKUhtiugo E/OZdGTl5A6e8wypvyL5sBq0gorG92dBrAi3asjWSECOCSN7jbF09PMIjzww2v+Tfb+UD4PG89FwU ltQNRFa4RQrGdXBCsT2vcLLy1S1XE5d3cAahUzgZhQhgO4zonhsmjaaGjYAFOh7fhNxBlZVXhQTFC FdQMiK3og==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLaHo-0007uk-Qk; Thu, 24 Sep 2020 23:04:24 +0000 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa61-0002ZZ-Hs for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2020 22:52:14 +0000 Received: by mail-qt1-x84a.google.com with SMTP id w3so40402qtn.16 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=djd7w/n3OzyjDAOXxEi+RMfg4yPgTictAVi1S4tTZyVT6P+U+RhPszQwcZe1s6fcrC SZXoO4XYApaUpE0cckNPbG1uH7xGUP+zd+f2/kt386cPmvn+3gdV0oBdAEtZv4Ouz5JJ weUGH+kONkCPoN9oMrD34+KnTM7SCSwthJqM5LimalNe2ANXcTYYo8IiUPeKZx/m8JnG Ro32F949MwX2xnIEiSdfkSXvqmpzLPtgFDQkpdMuP+nI80eSjTpZKJEyIPUSOjwwzdSh C/Ex0kHwp7sh2dd3kGU/F22nteu48GjJjoyL3CR8eBvKKwOSCOz/uqefblKd4bqKeZom xAOg== X-Gm-Message-State: AOAM531cY6ofPESBg0FbSyivuxglOgxQ8EJYQeozGIvvZLzrdj9Hofb5 f/qIV5hbFq1CaGr3mce2iWETXOsdzyvHUWKJ 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200924_185213_680134_E47A475A X-CRM114-Status: GOOD ( 10.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel