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.4 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, URIBL_BLOCKED,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 636DDC433E7 for ; Mon, 12 Oct 2020 20:45:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A8912074F for ; Mon, 12 Oct 2020 20:45:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uvBp3SV/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388543AbgJLUpf (ORCPT ); Mon, 12 Oct 2020 16:45:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730818AbgJLUpP (ORCPT ); Mon, 12 Oct 2020 16:45:15 -0400 Received: from mail-qv1-xf4a.google.com (mail-qv1-xf4a.google.com [IPv6:2607:f8b0:4864:20::f4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5490CC0613D2 for ; Mon, 12 Oct 2020 13:45:15 -0700 (PDT) Received: by mail-qv1-xf4a.google.com with SMTP id ec4so11432410qvb.21 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=PN2EHB5cZneFMzX4Rw/5NmLBVeYpg48PIEXKazR+DNzRrFIUfYm+Ri4uaDNrNNVivc mMKPHTzXgnzxFzaQiC2bNQdFf0q+1KsoSXYn9l6QS6tj8d3F9+I6H7Aut5wxbBz0KduP GJPcKwbeScZBIh0qCMYMlO2cmVFZMJtPWfNOeWIWcFtzJRBNQoRlDgRJBZRkm/9kobu7 xMuaZ4hFiOoI++DbuXfWywOzIx5HM7jj2ZP5fZ9O96ZrLnzYL6A7613dvtj3jA1sjoNE xtNOrk8SFzPeSS/23TcYupCQ5MVVuhqrRWPmzhdY9y3omXIMvrdHmc8c3fS2g3fmeu0E wkTQ== X-Gm-Message-State: AOAM531/EWjY8iQkIIxhT5MLC4ebVWsGr3ZbuPxIOeo/nLZuPy1CNk/T P33IWMxER3GGdq24atwMAIqLG4naj1kOpiMx X-Google-Smtp-Source: ABdhPJytdyhvhpYG0DjsuY7msRRlmnxGW1P5unA8SWK1MlyUcgA96ySfWuO4LcU4zEZrKHe+tU2F0mkirmhey9kp Sender: "andreyknvl via sendgmr" 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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