From patchwork Tue Sep 15 21:16:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11777773 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E64726CA for ; Tue, 15 Sep 2020 21:17:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A2D6A20809 for ; Tue, 15 Sep 2020 21:17:36 +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="ejaRrNgw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2D6A20809 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 740B6900091; Tue, 15 Sep 2020 17:17:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6F78B90008A; Tue, 15 Sep 2020 17:17:35 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56C36900091; Tue, 15 Sep 2020 17:17:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0092.hostedemail.com [216.40.44.92]) by kanga.kvack.org (Postfix) with ESMTP id 3B9BE90008A for ; Tue, 15 Sep 2020 17:17:35 -0400 (EDT) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 0DEBA181AEF09 for ; Tue, 15 Sep 2020 21:17:35 +0000 (UTC) X-FDA: 77266557270.19.show71_13177f327114 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id CDA8C1AD1B1 for ; Tue, 15 Sep 2020 21:17:34 +0000 (UTC) X-Spam-Summary: 1,0,0,f019d9c17f8b16e1,d41d8cd98f00b204,3bs9hxwokcfiu7xbyi47f508805y.w86527eh-664fuw4.8b0@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1534:1541:1593:1594:1711:1714:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3152:3351:3865:3867:3871:4250:5007:6261:6653:6742:8603:9969:10004:10400:11026:11232:11473:11657:11658:11914:12043:12048:12297:12438:12555:12895:13069:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:30054,0,RBL:209.85.218.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04ygb4b7uqmn47qxzy66bx1ehsb9eypxcqpdpxwuwoosru1jy7xn7gtjyos6ft5.5rdfyq161pg3hafppzfrrxne8oa1n1org6x7jbpqhx5jd1ysr3gm4631yrg9a9k.q-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: show71_13177f327114 X-Filterd-Recvd-Size: 4508 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 21:17:34 +0000 (UTC) Received: by mail-ej1-f73.google.com with SMTP id dc22so1822390ejb.21 for ; Tue, 15 Sep 2020 14:17:34 -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=TX70ilGdAcdyg1YBqmaSz5QEacCDiTB+zVlfonsPQRU=; b=ejaRrNgwlp8ys+4BQrnEIRa6JCD1DMaKcBwnb6OubgjCfWn7NE3QbT78QsJNlgYl8X uM2iLdYkRCRZVwVQWIM0JNTTlqRSByOm+y9tVhjfylzf2VSM6Txz24Jfwoj9xuRUu5eq XSk5LuejKSujNUpLhSZYHYDVvGikaSYVQ8zW8/c8swLI3F17HrPWXWe1JnzbayOYXV6i +h8vg0HiS72Ql8kaieke3o6g5BZgc9WxK8gmLJsv1NXIvY/KTPaiJiBAX2UrbUTN4O2f VmRLgpabm/mNCrvMiI/7bDXbGRB3zjFVqbCyJv7JAbUl4unwvVSbE53x8P7LPnXJYDCT /dfw== 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=TX70ilGdAcdyg1YBqmaSz5QEacCDiTB+zVlfonsPQRU=; b=NkSZ6G5/V60MrxnQREUTvld0F8i/umlmZytO0MC7Bo3GNh8GPPxYyTglMzV4Rth9wt nxJ8pAyirwBpaKDqdD8OoFRdG2lTJNHa6UrKYPuPQdYjXqs9t1/lN0e5/i3P3hTBCFsJ FuUyUXxG0xODVIYMZLfqaC6klU68TlOlJiatKE7/mx3D9z+/50AtNMB2+JEc0M9B3C2o ZeDh3bXE4nV1GdGikIOL+9p9uyL2/4ZraJ1XJyZy88sqG7IpL1ThWo35tDyBH7Iaa/23 NH59jBtEYDTxzndjk7wK3+hKdp6uECGc7wtsbHgRbysSh2hVD9bZpZnkvopADuk0yFBu UlFg== X-Gm-Message-State: AOAM533iDabDxuwI9P+oGJ2iVsJ/kUA96QVvu89dcogP5aYCJCidPLSv cWPq1TkAFsVh+Ks4a3JHknPTshymE12+Eg6O X-Google-Smtp-Source: ABdhPJzXD5k/cAT+QhVmJFoutrziWlgaMN8QxqxV/HqrCs5L8f197jAYO7cCyYNJOGv6gz2W5knXALPYvJNw370q X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a17:906:4902:: with SMTP id b2mr21685991ejq.208.1600204653213; Tue, 15 Sep 2020 14:17:33 -0700 (PDT) Date: Tue, 15 Sep 2020 23:16:11 +0200 In-Reply-To: Message-Id: <0845668a82ddd3eeb3f652712597ffd056f97504.1600204505.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 29/37] 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 X-Rspamd-Queue-Id: CDA8C1AD1B1 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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..acf6a5097cce 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__