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 7D66FC43467 for ; Mon, 12 Oct 2020 20:45:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 13FBE2074F for ; Mon, 12 Oct 2020 20:45:16 +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="uvBp3SV/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 13FBE2074F 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 7BF4F940011; Mon, 12 Oct 2020 16:45:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7960C940009; Mon, 12 Oct 2020 16:45:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6AD58940011; Mon, 12 Oct 2020 16:45:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0098.hostedemail.com [216.40.44.98]) by kanga.kvack.org (Postfix) with ESMTP id 3934C940009 for ; Mon, 12 Oct 2020 16:45:16 -0400 (EDT) Received: from smtpin03.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id C093A8249980 for ; Mon, 12 Oct 2020 20:45:15 +0000 (UTC) X-FDA: 77364453390.03.quiet23_16073f8271fd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin03.hostedemail.com (Postfix) with ESMTP id 9732428A4EE for ; Mon, 12 Oct 2020 20:45:15 +0000 (UTC) X-HE-Tag: quiet23_16073f8271fd X-Filterd-Recvd-Size: 4570 Received: from mail-qk1-f201.google.com (mail-qk1-f201.google.com [209.85.222.201]) by imf13.hostedemail.com (Postfix) with ESMTP for ; Mon, 12 Oct 2020 20:45:15 +0000 (UTC) Received: by mail-qk1-f201.google.com with SMTP id q15so13474970qkq.23 for ; Mon, 12 Oct 2020 13:45:15 -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=FuufsF1x9ec4dgxq8sKlKc4MR/gScIEfRdtwwlGog8A=; b=uvBp3SV/jryGDaqxOATb9bs/Xd1P/njw3Cq6lyzdIppKujjGEYNyzMLs9fjDtpuqF8 DaDg1zJrPSxvQqBPgsIpWRV00Vm09Gkbm2VIduBwy/kHF21yKg9YwiKDPCeIL549VzIq Cu24/gXJidqfD4Njn5nN6VSe6ahqHF0x6G3pzXRcMh3+Rk9cA2Ue735XrFt652RMIbge uKYBbehhuONRR24pex6s81V+SUtBqeUcDyjNX4fFxEVfGPnRdXIlKNjisXtt5HJhO6uC DdFONL79A3OLve+FXk3nLl7CX//cRNDgnUV9H23cZSjUvsPH+ePs5HskHPzzk81HXrRy apsw== 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=FuufsF1x9ec4dgxq8sKlKc4MR/gScIEfRdtwwlGog8A=; b=faEeKN4y396VyKvOH8EoGJdzkJ5Fh+JDvio2Q1rbxWHfe0lLYiPIbjX1rHPyDeaiRT OWvSgjzNM3ck8Vb5bn4h1jvZxC0warN8S5TlSIkjpUc3FFOZp2/3Eo6SjhBLgMis1M+7 pu/zrOIaB2jtzEwl5/IYrAelyS8ZxeZlOmQzon0wDWeic/aoiL5tBkujjxa2ShGeoFi7 enzsYSJ4P+1oTuZvw2VtAfNmTQmUXb5WDvy61d25L9FV8/NNctnGL4N9VPSOZKTShVpe Bd+9O4F4RsDnW6eo1jXYxu2DeUaghcYOwqqkyM5v9QEy1d59UIM1ayquU3wYgA+DO3lT XvVQ== X-Gm-Message-State: AOAM531HfEiyhnHlP6GvUaNLssdWbKvylMPgMrDsLA4UIr0i/udKVpqd 3QGY9eHLy8e/yN+PVYRqagjVlbR0kO7r6omp X-Google-Smtp-Source: ABdhPJytdyhvhpYG0DjsuY7msRRlmnxGW1P5unA8SWK1MlyUcgA96ySfWuO4LcU4zEZrKHe+tU2F0mkirmhey9kp X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:192d:: with SMTP id es13mr18205918qvb.27.1602535514492; Mon, 12 Oct 2020 13:45:14 -0700 (PDT) Date: Mon, 12 Oct 2020 22:44:15 +0200 In-Reply-To: Message-Id: <67dc921f4720fdc5a33d747c9419a1fefb33e201.1602535397.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH v5 09/40] 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 a4d1b5f771f6..151808f1f443 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.1011.ga647a8990f-goog