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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 B4354C433E7 for ; Mon, 12 Oct 2020 20:47:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7307E20790 for ; Mon, 12 Oct 2020 20:47:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="sZhcn8kF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731518AbgJLUrN (ORCPT ); Mon, 12 Oct 2020 16:47:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731440AbgJLUqq (ORCPT ); Mon, 12 Oct 2020 16:46:46 -0400 Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B94BC0613DA for ; Mon, 12 Oct 2020 13:46:10 -0700 (PDT) Received: by mail-qv1-xf4a.google.com with SMTP id c3so11547307qvj.4 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=MkqOpdGx7zJt9Numjkl55eXPnKswED8isl73Z57WU18+zqmdq1dRdW4PvnSqdQvFZn Jyqzkn3kUokAvXuq+aYvtbT/0p2WRI+vM1v3wvlRPlWQY8IBGV+eXGXKOSllFBzUWwHq yxdgoo5DcO7hhovPwunw5I960ezUuLaB9i6JcjLLOwDsYnovfyRjusOE9QkIyjBYJUZ2 dKN5JFDOUvPaPHC/IrGiPBKb2bDoVrGSPKsr7Xt/gfMlB9t2vy5uocWh51qyToC4Evii TyPUs3PnWqIf3nca0iFXZGoFFpN9FG6W4fP70hfmPq45TsI37E4qef1HBeamfJUAQdN5 351w== X-Gm-Message-State: AOAM531qOsR7UP6grXFWrvPZ6LbO9iR4EcKMNyoJD7T6sFS/gDLtxrWL PdFNJfO55oyFrbhbO9iwWWyBZpMW7uiVadq4 X-Google-Smtp-Source: ABdhPJxvJYqpGTrX7MXBIX+oGzP6+JrRIjDYnYPIdl63cInxop4XWZB5BKL1uA19ulvb+2PgLgkwGr8+w0DH88Ec Sender: "andreyknvl via sendgmr" 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 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