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.6 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, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 C6EABC433E1 for ; Fri, 14 Aug 2020 17:28:38 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7F8FF20774 for ; Fri, 14 Aug 2020 17:28:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="K0McFcU/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F8FF20774 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 E2D156B0002; Fri, 14 Aug 2020 13:28:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D6B976B007E; Fri, 14 Aug 2020 13:28:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA8386B0081; Fri, 14 Aug 2020 13:28:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 810756B0002 for ; Fri, 14 Aug 2020 13:28:29 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4316F8120 for ; Fri, 14 Aug 2020 17:28:29 +0000 (UTC) X-FDA: 77149858338.24.crack23_5906aac26ffe Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 1D8CF1A4A5 for ; Fri, 14 Aug 2020 17:28:29 +0000 (UTC) X-HE-Tag: crack23_5906aac26ffe X-Filterd-Recvd-Size: 4171 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Fri, 14 Aug 2020 17:28:28 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id h6so3420024wml.8 for ; Fri, 14 Aug 2020 10:28:28 -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=iIfWl4J1G8iITi93NOgHDi/s/4XpKw61QWFW+N1x36I=; b=K0McFcU/NW1+4TvtV86hOikuP0uc1Kbkt2X8tcu4BRVbwNsVpniTx+A+AKeGlPqG83 mDjfa19TeWpTVuAyrf2m4ekXSu4Ecbf1od7anACVOSDVBEjaPHpORnhAcHk92lv7DGK3 1KsptAncsZTva96Ki3faKev2CnXqKgjzWMgc6yLoY2DRSl7Z8Cv4ahqL0N37YEsUa/LR nNj/HdX4ESnken+QG+7W+11MnJKKKb0UQ0oF5FhAbPlgMkNcuivbJXZT0/a3EYzegMap ZsB1bcAemES+BlSUgzQbTWZqOcU08p0fReSogKNCW7czoDgg8kwWLFZCZ5NsU5OFQTF3 pLjA== 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=iIfWl4J1G8iITi93NOgHDi/s/4XpKw61QWFW+N1x36I=; b=STnzjUUAxvT+betzygmwbKgf9G9Elc6ic/VX8G30HRPcX+gT07cGCUU3M5/3QRAOIS 7yDliKyODBcRdxjIikQZRpVXDfva9nQSY1A/5l+1RFgdQS8Tstq9d7kBaaGQXgjV5hCy d/zckM8Y/tiQiSyhpUBTxX5E5gGbEmAtGPXTwEQnUi54l6KV3LTWN+L8y1wE4TABkvaC 5LYgSH6iigyZ3i480VYWuBKAP55s/OHz9T00RiVw/84RqXhpfFFGDqmIsI3zrLBf0pDF FrI06IacltcB9FXfTdLEsXOD1aKL24XXTN7JSNNYHC/NYkiLu1z56F2AyUWtdtPmNNxw GcsA== X-Gm-Message-State: AOAM532fBsSg85Gbi3SV/gZFzQ3sHsKazcRrGoVdWHJ1n4Qqzjjd+NkS neARVFnZxPkptpMxyf14oTWkOaU636w5CGlt X-Google-Smtp-Source: ABdhPJy/WRGBFbHW6yzu3fXjbbh6ZfhsR5aLr+bVb6qX539D5XqF883Lkwh9f6pP5sIhJRXvKfWE1HxGbtWAPR5g X-Received: by 2002:a1c:8094:: with SMTP id b142mr3616367wmd.59.1597426107618; Fri, 14 Aug 2020 10:28:27 -0700 (PDT) Date: Fri, 14 Aug 2020 19:27:09 +0200 In-Reply-To: Message-Id: <4e2dea1d2163dc6f5a3ceb943f485b09cbd252e0.1597425745.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.220.ged08abb693-goog Subject: [PATCH 27/35] kasan, arm64: align allocations for HW_TAGS From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com Cc: Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , 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-Rspamd-Queue-Id: 1D8CF1A4A5 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 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 uses the memory tagging approach, which requires all allocations to be aligned to the memory granule size. Align the allocations to MTE_GRANULE_SIZE via ARCH_SLAB_MINALIGN when CONFIG_KASAN_HW_TAGS is enabled. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/cache.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h index a4d1b5f771f6..b8a0cae38470 100644 --- a/arch/arm64/include/asm/cache.h +++ b/arch/arm64/include/asm/cache.h @@ -6,6 +6,7 @@ #define __ASM_CACHE_H #include +#include #define CTR_L1IP_SHIFT 14 #define CTR_L1IP_MASK 3 @@ -50,6 +51,8 @@ #ifdef CONFIG_KASAN_SW_TAGS #define ARCH_SLAB_MINALIGN (1ULL << KASAN_SHADOW_SCALE_SHIFT) +#elif defined(CONFIG_KASAN_HW_TAGS) +#define ARCH_SLAB_MINALIGN MTE_GRANULE_SIZE #endif #ifndef __ASSEMBLY__ -- 2.28.0.220.ged08abb693-goog