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.5 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 A1475C4727E for ; Thu, 1 Oct 2020 23:12:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4023B206C1 for ; Thu, 1 Oct 2020 23:12:04 +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="Z/TzKhjp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4023B206C1 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 CBE546B00CB; Thu, 1 Oct 2020 19:12:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C6BF06B00CC; Thu, 1 Oct 2020 19:12:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B82546B00CD; Thu, 1 Oct 2020 19:12:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0253.hostedemail.com [216.40.44.253]) by kanga.kvack.org (Postfix) with ESMTP id 898BA6B00CB for ; Thu, 1 Oct 2020 19:12:03 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 347A01EFD for ; Thu, 1 Oct 2020 23:12:03 +0000 (UTC) X-FDA: 77324906526.30.duck55_3c155122719f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 0F160180B3C85 for ; Thu, 1 Oct 2020 23:12:03 +0000 (UTC) X-HE-Tag: duck55_3c155122719f X-Filterd-Recvd-Size: 4407 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 23:12:02 +0000 (UTC) Received: by mail-wm1-f74.google.com with SMTP id s24so44981wmh.1 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=AUrfbqkNPiHaFLcu47aa4uPQjQRflRC/a4kcuVdv/Jjf5s+7Z+Oy87SgoIe83mrw7a T8Ta/6G6P8skPnm2QGqm1W+pt2tvRm7Cdrrv6mPW+lMj5Lj/kzKxpfxcSLklWzihd9EF IfxjpixCxSfbqMzmUoQ4mbpM1hfZbErvyxYYAZRutd5RJCeAAbSfbAqoYEQeCcBaUCkW nygqkku/jAj60f9wJGQnBOLv60euFRs9uSZKlilnqhMXunSSRthPqIKehz/j7GtmBGMK lY6kYk1KN9l+ebI0t8mrgClSLPPl2uoT2jn+7vRRBgZbfSRgoIJDrj5d0pPr4rJ1ygoK OCpQ== X-Gm-Message-State: AOAM531+ACJrKz/vZFzkMmNrBhrvx/FmiP3cZN8A0qZxaYfq6t8fTs2E +Bcwb3mCXMEekvg0QneoO8WTrGixpTaTb+pW X-Google-Smtp-Source: ABdhPJx0Pq6gAwprm7ylOWsjE098TiN8AOf8BUCNUupdLVMrlls34MPn6CFBY8IIC1tomeVuQwSv3CMV98Hex5dB 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" 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 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