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: 11867417 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.8 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 2D699C2D0A3 for ; Thu, 29 Oct 2020 19:39:54 +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 8750F206DD for ; Thu, 29 Oct 2020 19:39:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VjxB2Pk4"; 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 8750F206DD 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=3BmografMU0ZNu1wIMJITxYB313okBvH85wLOJhvIUg=; b=VjxB2Pk4iE0oU4fqFyWPxIVUm Bpv1nE/cJW+ACgc2CUlSwOwrH5mdP6PZgu2dTw1mzyWJSmTeHPZc/8x50erN8+dtG5bXrZZ+l5qun 0B3BIg1fDu4mQHyAoYLMblKXEay056LDSXnJkaMzOTgXmaJ93lKraXrsB0UpCUUBvJjYNzLNY8UgM 9Z088wqo1qG5FdtN2M3vdEw5d2e7tue2xSu9k8IR2Aw1LXnYA8cuygvebCxevevRtUzL8uufNwzDQ jP2m5R2l2IARP7M9MhFRMXQk0YHzTjzwekJtVAvtMiAGRTTJ9/DFH9eBWh5yILtGJiEjbqGC1n42Q owFz/aJzA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDjg-0002cs-4m; Thu, 29 Oct 2020 19:37:24 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kYDa4-00072F-NT for linux-arm-kernel@lists.infradead.org; Thu, 29 Oct 2020 19:27:47 +0000 Received: by mail-wr1-x44a.google.com with SMTP id j13so1699514wrn.4 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=JShTAPRiBL5VqQbQR0Q/bn5yoF0bNH1qQNvXuXgjfCpy15QruxOEnHI7qqnzPyIbwW EvsC9mDl84UbEDM8L+ldvCf1MpFvaLuTajNthEe3fqSX5udYKzI+3vKBRJOZJjpqNvXe hwS5lR6+9OMTBYpKZ+2BBMHNeKpEnwr5BJPE2HrT7yaZ5mH+JGCuX/Xzmhl+Mh4Nt5SG ZPNVhqmJA7LuFqyl2I4XUn2nXQ6HNZe7i3g0/gmcdbCuxdEDMsBOBMYDq0hu2jHbNgTX zs9j08QOWUSKGbxcR8J1YC1IHfEc6sN0LsnNoZeyOLk4hZ1Ddgxbnfrb3UjG4RWwf/mJ ZowQ== X-Gm-Message-State: AOAM5324ZZGqOq+zxYVyMQoff512Qif2D1RqcdC/YntxW3fYrMYGBAx8 Zw/bSGW3m33RFYOORslArADg6PZLVp/BltfP 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201029_152728_869861_060F8A2B X-CRM114-Status: GOOD ( 10.32 ) 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: linux-arm-kernel@lists.infradead.org, Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Branislav Rankov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov 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 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)