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 5415AC43467 for ; Mon, 12 Oct 2020 20:46:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id EFA832074F for ; Mon, 12 Oct 2020 20:46:11 +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="sZhcn8kF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EFA832074F 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 7C25D94000C; Mon, 12 Oct 2020 16:46:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74782900002; Mon, 12 Oct 2020 16:46:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E9EF94000C; Mon, 12 Oct 2020 16:46:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0226.hostedemail.com [216.40.44.226]) by kanga.kvack.org (Postfix) with ESMTP id 2522A900002 for ; Mon, 12 Oct 2020 16:46:11 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id B003B181AE865 for ; Mon, 12 Oct 2020 20:46:10 +0000 (UTC) X-FDA: 77364455700.11.sugar64_070e872271fd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id 7DE60180F8B86 for ; Mon, 12 Oct 2020 20:46:10 +0000 (UTC) X-HE-Tag: sugar64_070e872271fd X-Filterd-Recvd-Size: 4412 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 20:46:10 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id j185so2127531qkf.7 for ; Mon, 12 Oct 2020 13:46: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=yun2eenyP8tmp8dDLy7lH/4hFLH7rzsqZ0SoQ3Etw3s=; b=sZhcn8kF8DYVAhrqt1Ns7gnxUS61NytSR1Qk7PgqMkL9aNaMxgQX69tEO0l1guxBSs bZgU6A4nbr73Ut469qWALvD2+w6hN6cclcXKk9r1sA05Dbv7xyF/ckxyKyxfiT844mWy ItHaG78IlWYuBJudH9uIxuU1IKvC8RYYtOMlsQpKPsEdRX77D/r90H/hr8gP9ASNMTnu QvbREZM2hstwDMQ9NzBH8xrP2oB+E4NHJnLJroqdOmFUM7d88ki3jWdWKzcUfxLAiIba 4zArHEaWWqQVEsVE8PTTTBA886452t4zQlM16LlFIR7WZhYSCrV97xeYhct9hfMfwvRW pmBg== 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=yun2eenyP8tmp8dDLy7lH/4hFLH7rzsqZ0SoQ3Etw3s=; b=c5C9+RN4k9uinsZ4WJA7mGfngMlN/vW460AZCFFoi/eZNCO3F70oIWeDJ0aLJTXOFR BloVYEKj5xIZH1I3nDlKWY49sXaZpNNCh34+Qnv3rMFDoAOuSmmzqXYtBu3HaTGA1pRW XKFzbMTEtVivKgiyOpS/7zAnjCN/5o9/uAS/QTBSkaQLCrmKmn2VcHO6iZx/9fWsr2Ly e8C5rfd5U89ZNCZ9Ud7zAzv3uaquej9kUItd08nHTP3f2RuW8YxmCXJRfumq7+5AH1WF DgvF1WOPfc6awTuiolpYgzW9yY5mWsIeth8rGr46O7Huw5nzkzEO2P+5Atbeek6IA64E zgDg== X-Gm-Message-State: AOAM532gPPyRCHsJKhj2MFv4RP2+ztvbEUdAxhFhGH6/liY1UUYr3f2n iFVxeG8lKp6vdbge8dXmVJJ/00VXXH7RZuXJ X-Google-Smtp-Source: ABdhPJxvJYqpGTrX7MXBIX+oGzP6+JrRIjDYnYPIdl63cInxop4XWZB5BKL1uA19ulvb+2PgLgkwGr8+w0DH88Ec X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:48c6:: with SMTP id v6mr3525139qvx.11.1602535569462; Mon, 12 Oct 2020 13:46:09 -0700 (PDT) Date: Mon, 12 Oct 2020 22:44:38 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH v5 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 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.1011.ga647a8990f-goog