From patchwork Thu Oct 29 19:25:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11867181 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 B4C34697 for ; Thu, 29 Oct 2020 19:26:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6215620796 for ; Thu, 29 Oct 2020 19:26:20 +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="FcdRk45x" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6215620796 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 90F276B0073; Thu, 29 Oct 2020 15:26:18 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 7A3446B0074; Thu, 29 Oct 2020 15:26:18 -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 646A16B0075; Thu, 29 Oct 2020 15:26:18 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0252.hostedemail.com [216.40.44.252]) by kanga.kvack.org (Postfix) with ESMTP id 326B66B0073 for ; Thu, 29 Oct 2020 15:26:18 -0400 (EDT) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CD7F8824999B for ; Thu, 29 Oct 2020 19:26:17 +0000 (UTC) X-FDA: 77425943994.30.wound35_58094592728f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin30.hostedemail.com (Postfix) with ESMTP id AD0B8180B3C94 for ; Thu, 29 Oct 2020 19:26:17 +0000 (UTC) X-Spam-Summary: 1,0,0,d026672febe920fe,d41d8cd98f00b204,3wbebxwokcpuxkaobvhksidlldib.zljifkru-jjhsxzh.lod@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:1535:1542:1593:1594:1711:1730:1747:1777:1792:2393:2559:2562:2693:3138:3139:3140:3141:3142:3152:3353:3865:3866:3867:3870:3871:4117:4250:4321:4605:5007:6261:6653:6742:7903:8603:9969:10004:10400:11026:11232:11473:11657:11658:11914:12043:12297:12438:12555:12895:12986:13149:13161:13229:13230:14096:14097:14181:14394:14659:14721:21080:21365:21433:21444:21451:21627:21990:30003:30012:30054,0,RBL:209.85.219.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04yfxdsi1583njn6xqoi511d9jnpmyceq3133omsu9gpbjrg81jfkboyqzbng6c.ebeb97qjk69q1ogsekpxap3tqiffp8st59rnm196yd4mrs3ffdmafj9ekqjtpx9.y-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, X-HE-Tag: wound35_58094592728f X-Filterd-Recvd-Size: 6198 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf04.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 19:26:17 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id l47so2416052qve.1 for ; Thu, 29 Oct 2020 12:26:17 -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=H80qO4w/VNIyZFliU/RvriPpJf0TWzdH6o9fbTX/riQ=; b=FcdRk45xjuSu511+7QZqV1YehKKYofJq5I1I+jsbFlug5tzG7RjNEqT6z0pRKuaY13 x7j2MKykt6ZjkU9SSs4GvnUFcPwfnPkT8rAyMYXGC42ravT17unGIsZMtNW22gLI9/B7 1Tip1oypOKxC+5Yulao0y81UAm+vOeT/lQq7vAwnR/ASI+dNJr8vw+Z7ScNQjcTCa/LA 1LW1peLgHchKqv16ET5WmzOaHh8a3KUTF6btDYPyJt6OtC/+444lcbXZ0JFqwPNv3zIl mZK1/Ikt5LRV2u4A76w67tDem24QUF6RjirAE5je1ELzVfEoJxJzIU2+fX1ae6TRDMwR rdoA== 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=H80qO4w/VNIyZFliU/RvriPpJf0TWzdH6o9fbTX/riQ=; b=ZpQv7xhZgVBd0cJ0NCYmRBhdn0POIGS3pXDrB8kK+KEDNh/oSy10ENx8eds/qLEc93 +891PIxm7Ww5iSY67lJ5915jZIh58AkJd+trwwm3uc7No9bxHGruDZ88BMo/9doG10v6 QQKg0rymYHndM+Myj6ymbuKNxTWz5CFd2dzITWAu9gRm9q113YsUyTYGoYxT4nGFBo5Y 54040ldRKx8fBUIooaEAmc81QS+42IQiXJAt1KFseHv0O9FKnXt+07S5jfIKScopX8gC iT/00O07umpKTdc8OjuJBm0eA6YiGHqkyROVXczJTfwbP3uKFSGiZQGZYzEnSLGioimA lSwg== X-Gm-Message-State: AOAM530loD2jKj3g/GYohLjBgnYdxSyj6BCfttBE+pnv+/FB3uF29Ctt r498BA6p6Ffmqe9yjJc7XXHo7NVUUCuhHk2f X-Google-Smtp-Source: ABdhPJwIhQZtghJh9vbvgOS2IzWhrQ1kM70OgR4BWqB7lciIN3SnFRHajKW2Oezj0cvs3asRnscK+fhOeDOr5n7E X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:59cf:: with SMTP id el15mr6145700qvb.17.1603999576430; Thu, 29 Oct 2020 12:26:16 -0700 (PDT) Date: Thu, 29 Oct 2020 20:25:25 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH v6 04/40] arm64: kasan: Add arch layer for memory tagging helpers 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 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: This patch add a set of arch_*() memory tagging helpers currently only defined for arm64 when hardware tag-based KASAN is enabled. These helpers will be used by KASAN runtime to implement the hardware tag-based mode. The arch-level indirection level is introduced to simplify adding hardware tag-based KASAN support for other architectures in the future by defining the appropriate arch_*() macros. Signed-off-by: Andrey Konovalov Co-developed-by: Vincenzo Frascino Signed-off-by: Vincenzo Frascino Reviewed-by: Catalin Marinas --- Change-Id: I42b0795a28067872f8308e00c6f0195bca435c2a --- arch/arm64/include/asm/memory.h | 8 ++++++++ mm/kasan/kasan.h | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index cd61239bae8c..580d6ef17079 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -230,6 +230,14 @@ static inline const void *__tag_set(const void *addr, u8 tag) return (const void *)(__addr | __tag_shifted(tag)); } +#ifdef CONFIG_KASAN_HW_TAGS +#define arch_init_tags(max_tag) mte_init_tags(max_tag) +#define arch_get_random_tag() mte_get_random_tag() +#define arch_get_mem_tag(addr) mte_get_mem_tag(addr) +#define arch_set_mem_tag_range(addr, size, tag) \ + mte_set_mem_tag_range((addr), (size), (tag)) +#endif /* CONFIG_KASAN_HW_TAGS */ + /* * Physical vs virtual RAM address space conversion. These are * private definitions which should NOT be used outside memory.h diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index ac499456740f..633f8902e5e2 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -224,6 +224,24 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) #define reset_tag(addr) ((void *)arch_kasan_reset_tag(addr)) #define get_tag(addr) arch_kasan_get_tag(addr) +#ifndef arch_init_tags +#define arch_init_tags(max_tag) +#endif +#ifndef arch_get_random_tag +#define arch_get_random_tag() (0xFF) +#endif +#ifndef arch_get_mem_tag +#define arch_get_mem_tag(addr) (0xFF) +#endif +#ifndef arch_set_mem_tag_range +#define arch_set_mem_tag_range(addr, size, tag) ((void *)(addr)) +#endif + +#define init_tags(max_tag) arch_init_tags(max_tag) +#define get_random_tag() arch_get_random_tag() +#define get_mem_tag(addr) arch_get_mem_tag(addr) +#define set_mem_tag_range(addr, size, tag) arch_set_mem_tag_range((addr), (size), (tag)) + /* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations.