From patchwork Thu Oct 29 19:25:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11867237 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18AEE697 for ; Thu, 29 Oct 2020 19:27:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BCAC3206DC for ; Thu, 29 Oct 2020 19:27:29 +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="qQoHRGYT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCAC3206DC 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 41FFF6B00B1; Thu, 29 Oct 2020 15:27:28 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3A83B6B00B2; Thu, 29 Oct 2020 15:27:28 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 227596B00B3; Thu, 29 Oct 2020 15:27:28 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0152.hostedemail.com [216.40.44.152]) by kanga.kvack.org (Postfix) with ESMTP id DA2FA6B00B1 for ; Thu, 29 Oct 2020 15:27:27 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 81E331EE6 for ; Thu, 29 Oct 2020 19:27:27 +0000 (UTC) X-FDA: 77425946934.15.wall27_5b0475c2728f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 578D61814B0C7 for ; Thu, 29 Oct 2020 19:27:27 +0000 (UTC) X-Spam-Summary: 1,0,0,db7309d3ae8c4488,d41d8cd98f00b204,3nrebxwokcdwylbpcwiltjemmejc.amkjglsv-kkityai.mpe@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1541:1568:1593:1594:1711:1714:1730:1747:1777:1792:1981:2194:2199:2393:2559:2562:3138:3139:3140:3141:3142:3152:3866:3867:4250:4321:5007:6261:6642:6653:6742:9969:10004:10400:11026:11232:11473:11658:11914:12043:12297:12438:12555:12895:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:30054,0,RBL:209.85.221.74:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yggrjrz9e8xty4xey9uz8e6knk8yp89ypgjjxsogye4jzjy5r75pxxp9hfww9.cowcyh6rn7sq735o1yuqz68igcirjpuxzj3gcfpj3bmhc7xngns554nwwy9unfd.c-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:69,LUA_SUMMARY:none X-HE-Tag: wall27_5b0475c2728f X-Filterd-Recvd-Size: 4405 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:27:26 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id 11so571912wrc.3 for ; Thu, 29 Oct 2020 12:27:26 -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=mhlSkARMRob3d2hNT3T2VG0Irjtu7J9HetujXqVGCGY=; b=qQoHRGYTvDDhx8CPzlR8rl/Fv7YnCG4mvzMtHkFnrvAxXnlEQM68LuBN8/KN3GT9ZY 85dUBgtCXyTrJNZMKONrEcUBpxkT5NPzQesOolp4nrj75QSWF+KDGRW7U7Aw0eaPU/9L 8rvPAEgR9vr/gR6UUhmLgfiz2xvGijofjHGRD29jhBzdHHufpCWuWtCoJ7En+gMq8X/A WK1deW9td6bZYICS4q22i6zyq+JU+jAgBy1nvcrnAWrW70zOBSj2nfQS9q2OMg3vS9O1 1J8pzvefuWluYyMSpG6i7Ec0R9ElzYDCTAAwWYZ82E0lA6SZuY8qzl6If+OUJRo5x4+r 6fuw== 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=mhlSkARMRob3d2hNT3T2VG0Irjtu7J9HetujXqVGCGY=; b=WVQKXPdy+zkG5BHdClbHUnuoAG6KZYRKvYVWjmzhqAo4fdDzTkgEgz3mhy8pkQupkb 42wI894GhtTgOkyYb//HtIBYeIQyK5OF2feRieyRRQ3Jj04y8O/R8Ko8l9Oj4/d8zVth 4zKjd/BF4RdSko69jl0lYCOOPOQgkFKyc44NSU4FjjYB8WzaiZrUGphkIdBZJqSHFvuC 989awkI5adZvGwBPIgLv4jMeBG9DQs/KsRc/xarPR+HT0n2PXs8Y389eqzsiINg0AtI3 2GulqcS24DPs1UaXTp9mHKuuiMuwUlSC9fwnUwmtXJW17lA9eAQT7GldaXfKdzmfY0ym VRcw== X-Gm-Message-State: AOAM5309OYgRnl3uErncSIATpXCR3JVahsqHIlZqcymhh9yLWrat3q15 HDmG5KGNd7dQlAGNrgZALQ3qreWEdKCJpt7F X-Google-Smtp-Source: ABdhPJwsRXaK5gp9sAQ7lSICeJgN1XM0oCRK3u1jy2e5C96/zpeF9KkhGSZNT2VhLKqEN6alV4B22KG5v9NOz3AD X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:5a06:: with SMTP id o6mr749019wmb.181.1603999645776; Thu, 29 Oct 2020 12:27:25 -0700 (PDT) Date: Thu, 29 Oct 2020 20:25:53 +0100 In-Reply-To: Message-Id: <1baff3a8f85c510057fb58e9628d670c224df8ff.1603999489.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v6 32/40] kasan: define KASAN_GRANULE_SIZE for HW_TAGS From: Andrey Konovalov To: Catalin Marinas , Will Deacon Cc: Vincenzo Frascino , kasan-dev@googlegroups.com, Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, 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 0c1cb0737418..a4554b19022d 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)