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 288BCC00A89 for ; Mon, 2 Nov 2020 16:04:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BE6C322258 for ; Mon, 2 Nov 2020 16:04:52 +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="pVFQxBGu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE6C322258 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 483C96B0089; Mon, 2 Nov 2020 11:04:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 470226B008A; Mon, 2 Nov 2020 11:04:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34B656B008C; Mon, 2 Nov 2020 11:04:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0136.hostedemail.com [216.40.44.136]) by kanga.kvack.org (Postfix) with ESMTP id DCCA96B0089 for ; Mon, 2 Nov 2020 11:04:51 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 7BB40181AEF09 for ; Mon, 2 Nov 2020 16:04:51 +0000 (UTC) X-FDA: 77439951582.30.way56_4e0435d272b1 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id 2C0E6180B3C96 for ; Mon, 2 Nov 2020 16:04:51 +0000 (UTC) X-HE-Tag: way56_4e0435d272b1 X-Filterd-Recvd-Size: 4559 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Nov 2020 16:04:50 +0000 (UTC) Received: by mail-ed1-f73.google.com with SMTP id dk5so6343025edb.20 for ; Mon, 02 Nov 2020 08:04:50 -0800 (PST) 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=G92npUQrDAzWi0FLCRrGsDUgO/xYzB+b9yo7BatUrLQ=; b=pVFQxBGu09AktYQjGsUevuiZuIp8P2uc/Rpm7nB+HDrnBUFO+j4DH5TvoZ9zgREXH3 y4SZyXQWlBxpzqIkIMZoU+stzzpZV8IniPwc4BuB9vJo809BfgfqIfYwLWvaNaiRSAwK L9pEUEjzBBF+FE/v7xF0yuigdwpt2rhEXTYSXc1gmQjPCLXc3VxImurzeWNyfG8yJTpJ m56oceueeUP5vJzJpij023CAKuDum+01Ze+MgnmqsHg0ah5XqFxEJAn1ifFvOw6ahk+d 48gnuFiIQy9hBTQT9wuBaaXCsmXLTn1HNEcshgV8RzIjdRVLYeap5lGJt3HGn2ZUd0yh 6FBA== 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=G92npUQrDAzWi0FLCRrGsDUgO/xYzB+b9yo7BatUrLQ=; b=mabiyt08fNrl65Onhuef2pvN+HP3sRQE0gaQjRLMaU8r6tLHzr+9yedyS+OgvvatXQ ApT7IoTPyyb7BoFRCFgnLHMnO3zbZbtOIP+/JzijNxNBlvgPan4txMoC4GueW5kXsXZn jZtfTRQnGgitaO8ztqm+8fk9CAl+6SHQqNxrjBrFPupHBXIcTmTcMbXlOiC5II7R4gq0 rqIUJ4stNTLdaERihHJ4etLKxPYW/GONNBzY77gsQagYk1XCYzc0hHoDKouj2qCjKSq2 qFyjwbv8CPKvfYlKY2IUXxywNzXQ7hUQL4kkjqjqcaAStUKYoLMBL0hNlEP/0xJk4TOy 0Dvg== X-Gm-Message-State: AOAM533HDz0uIN/ls8YG3aVQeDJH99zavaqHVz09s/Expeon/zttgZyr 4sC90Wx4DaieVVrBBPwM7wpElfLgMsysH500 X-Google-Smtp-Source: ABdhPJynNapDQa+98oKFs1UEEnhM037/oSJpIpMZ7UZ8DRdegNxgG10b/E2rJbftBz4QFi6fw28i4NYRT+57N4AT X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a50:ff02:: with SMTP id a2mr16764112edu.364.1604333088410; Mon, 02 Nov 2020 08:04:48 -0800 (PST) Date: Mon, 2 Nov 2020 17:03:49 +0100 In-Reply-To: Message-Id: <5d790812e7b0e8fd6747b0f2cb38de52c686de32.1604333009.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v7 09/41] arm64: kasan: Align allocations 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 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 Signed-off-by: Vincenzo Frascino Reviewed-by: Catalin Marinas --- Change-Id: I51ebd3f9645e6330e5a92973bf7c86b62d632c2b --- 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 63d43b5f82f6..77cbbe3625f2 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 @@ -51,6 +52,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.29.1.341.ge80a0c044ae-goog