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 B346CC4727F for ; Thu, 1 Oct 2020 23:12:01 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5600020739 for ; Thu, 1 Oct 2020 23:12:01 +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="aGW3Cnkb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5600020739 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 DCE2A6B0073; Thu, 1 Oct 2020 19:12:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DA8196B0074; Thu, 1 Oct 2020 19:12:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C21A06B00CA; Thu, 1 Oct 2020 19:12:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0127.hostedemail.com [216.40.44.127]) by kanga.kvack.org (Postfix) with ESMTP id 9415A6B0073 for ; Thu, 1 Oct 2020 19:12:00 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 34992180AD801 for ; Thu, 1 Oct 2020 23:12:00 +0000 (UTC) X-FDA: 77324906400.24.lamp44_2c040352719f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id 1AE6D1A4A0 for ; Thu, 1 Oct 2020 23:12:00 +0000 (UTC) X-HE-Tag: lamp44_2c040352719f X-Filterd-Recvd-Size: 4557 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf48.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 23:11:59 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id x6so29967wmi.1 for ; Thu, 01 Oct 2020 16:11:59 -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=NeJpwcUoiisJbm1IU+MKWZ9xhPH4pDihjUaOi0iEgto=; b=aGW3CnkbCkBd4mrgfpp33M7Dfq5DJBZR8bDKf9WHW80LAmKH1wU0HKSs9OTGBzqfXY 4jzvOdsPuHNLxeWpYb30RrLjn3/m9h1J0mHQGPzcjTGQHFf/2jSCH9ORpxQLvKqeoa1c Zkk9DVDs0Vms53txO50aSgZdG8Ikt0Y7BixytGr/JkgpkAqMtS1zFA9ih9VZ2Xtgh3Jf zITus9QBwsUrnJ+Ff8GR8yjIeM4pEw5EgstCGrBe8HYUKYfie4jf/ill3fHRvJWDif68 UzP4sBQnDKZkNfxkqLKlmOuIDlBPaMY0TpyvadR8/f9PGNoFapOHwXAI2kxboW8glQcA WZ3A== 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=NeJpwcUoiisJbm1IU+MKWZ9xhPH4pDihjUaOi0iEgto=; b=D/7OUlUMEAOJR1T5q+Lfe6dVU46cXYpZrPPjxMlx1E7dur6lcjWBbslXe9L4nEDrKM NkVMkhBv+hEqkOlWAUv7TvYnuOkk1NpnvKHHWVS75VDSV+m196GJsAXlHGMat+mujJ4n XxgnQ2n32gZj2ldLBofqUeSVJbRhpHKmHHpmDwuy+/PeWYu7daaqolO5Ej8kGuMr1tSZ M2kuCTpPUrAAiW6Z1V8zISAjdMvdzJ4SM8HwyZfmUR8uiHUzvgjBp+tCYtGdtTQSSQNT PMl78GGhpK7gUyNuap/ABp8z7ZVfalcBdHkgiA8SUr5b8pLvJirPqBX3WfJpZcn8GYoY lNPw== X-Gm-Message-State: AOAM530XBb3lx9IjneuqG/pXLv7e9RQJkU67Nj6LkjGrp6GRBfZ+7Q7O d05yLmDHBZrwCOVfJ/yYSrHb3VVfNZ1iN3M+ X-Google-Smtp-Source: ABdhPJyn80+O1CQMSOze+9Xqz9K+dDTmBuD7Qqm/K4dshb7TGH8p3xJ/3xcsBvuhwsf4kj43OFEyO1m5MtH2nBkD X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:600c:22d2:: with SMTP id 18mr2181468wmg.145.1601593918669; Thu, 01 Oct 2020 16:11:58 -0700 (PDT) Date: Fri, 2 Oct 2020 01:10:32 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.709.gb0816b6eb0-goog Subject: [PATCH v4 31/39] arm64: kasan: 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-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.709.gb0816b6eb0-goog