From patchwork Fri Aug 14 17:27:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11715109 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 D9C1A739 for ; Fri, 14 Aug 2020 17:34: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 B2CBE20768 for ; Fri, 14 Aug 2020 17:34:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xK0302Ur"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="LuGw15Zk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2CBE20768 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+patchwork-linux-arm=patchwork.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=s02itM1Y9FSN1mQP3rgJeSIubDknR0Wdzw1+XUVKJDY=; b=xK0302UrL6oDrdpPJcDME5byQ uLhAZOj5WC02W0oMwiwUBhr43AqTlDzpA8dMXH+ERoOb0/Uql3bCCHojAbkRUfNOthq7d3zpAQOcL JD2lhwxFj/wCoQjlnbdsy4m6VYyeqyAlBm/QNWYPVPWmS3i30YlXTNtp/mm4Mnkh012WHIf5gPl2E fXMCApqRp021wpRpCfuv/BG+ahHt/pFy+kcnhXIbBZ7Cd/l+QJVhHV+FY21uCfB3P+gXsO51SZEES qOohxVWS2mQa8T+ctjFRRkI7cupat7L8mm78Fy9eZIUS5BOcYtrD6NOe9Z0bVZPRvOIjz+xW15aBW ognFZ2B2Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6db7-0007Al-8k; Fri, 14 Aug 2020 17:34:33 +0000 Received: from mail-qv1-xf49.google.com ([2607:f8b0:4864:20::f49]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6dVJ-0003hQ-TR for linux-arm-kernel@lists.infradead.org; Fri, 14 Aug 2020 17:28:48 +0000 Received: by mail-qv1-xf49.google.com with SMTP id q12so6494163qvm.19 for ; Fri, 14 Aug 2020 10:28:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Aq2upZC9S5Ys9XP2AH7I4ISIryYXBDc2x7o0GoeV4Tk=; b=LuGw15Zke5Ae/pDbTgYTpYfh2zw7zg1gh8rl6NeN4AGUiGtOgQrWlvhHdiP01WtjeF gPbZdiTHKtVlNBMURMqJKH70HLuFDCcyY7K63iFcHcfiTqAy72YPVXO2s7tj6WUdasie LSNN56Qt2JsZQI6RoEJ6bqi8ZSk+tbIUZAyB0NyWM5Q+cWE4kks5klNCVCuWUA2AwdED Iiogfds/x//LanybCwaVx43Gg8FX0gPl+FenU8VBpe3VwGcqyx6IKKwcLN4CjN2/b8lW ezTn1x2aDEYLo2sh3zAh2430UJfQVAECwvvHTa7cQAdEt7xYMD1jNBIJBb2Z5DxWQroL oNww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Aq2upZC9S5Ys9XP2AH7I4ISIryYXBDc2x7o0GoeV4Tk=; b=TcY3uG9DxMJTfViJmh7PVMY3QNXf8kT+45SU90BJAQUXQSqLajp6y9ZAoSVq9clj4K XrqsC3cb4LIjvpRfQ/l59eA0nXz7QQsrBmviEggVjlmlCzBtIXbjwtj8dikyV6nlr2ja zlQrig4MD1pboG23Br8l716p68rjYFGu5llNEFTE54Bfn132e5AhnOK/168861xShy2c Ivv55VwbCyDkDq0+w57UmDRF18z9YNPqmhip/vacOTTqeh0n2XhJUoA5A8R0xRzcsqwb 4Wgs8vKLVPgbGRFYSe3Hh7dUX+vP7qgrebVQqrj5AyhbVG2YD4mMqd7JpJF1IReqck/q npSA== X-Gm-Message-State: AOAM533O1uIjUi1HWeprxNA9jCnqqWDENMQZey/dt3cW4yKZdUuY/dXl iJK18CRGwyHvho0HZXFRidtbaLPSbCJJUXE+ X-Google-Smtp-Source: ABdhPJztNAgwVlYKdx1N8aglSzF1FROrdQbV1VPur/Gdjkp6gFX4cRqk46lqcix5COecb/sqk/aIJq04YlccAYyo X-Received: by 2002:a0c:e883:: with SMTP id b3mr3537357qvo.133.1597426109995; Fri, 14 Aug 2020 10:28:29 -0700 (PDT) Date: Fri, 14 Aug 2020 19:27:10 +0200 In-Reply-To: Message-Id: <07455abaab13824579c1b8e50cc038cf8a0f3369.1597425745.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH 28/35] kasan: define KASAN_GRANULE_SIZE for HW_TAGS From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200814_132834_105682_1FEC97EB X-CRM114-Status: GOOD ( 10.00 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:f49 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender 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: Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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 --- mm/kasan/kasan.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 1d3c7c6ce771..4d8e229f8e01 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_TAG_KERNEL 0xFF /* native kernel pointers tag */