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=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 383BFC43461 for ; Tue, 15 Sep 2020 21:26:08 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D436F20795 for ; Tue, 15 Sep 2020 21:26:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YraMPJOW"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="BMgCiDxI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D436F20795 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=13kuPLwy6m5Xzv8U+5c+zw1F1Vtyk44MNFmf30dna4s=; b=YraMPJOWswaus7pkwR4YYaXuk XDLI1rlXjD7lQNVrjTDn5eJ1GCH6rM+N17foBEUeiIciSpUv0gGZI2QGAKxeJSkR73b+zaj2honj1 jpqDxV6n3Q6TVw1ke7xUwF4mtS5Nb/t//w1hmXxm6c9nPoaZappmfu1yi31zhHzSLEA6NXDHCG1wG Ted/NBsXIxdHQE4cGOTNUsaGk3woYScbSW3pnQcZ79csxvTBHgLLLNkfDJU6wkg7GvgfV5THKPYjD KrRNWs4Vwy64I5uBdnXkgEKz8LWO/8SSDW8272nG8a5+HDD+T62MDe9Kco5PiaMkNnrc1zeUEEg2r sado50oSQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIIQO-0001ot-PG; Tue, 15 Sep 2020 21:23:40 +0000 Received: from mail-ej1-x64a.google.com ([2a00:1450:4864:20::64a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIIKI-00079L-1m for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 21:17:27 +0000 Received: by mail-ej1-x64a.google.com with SMTP id m24so1840377ejr.9 for ; Tue, 15 Sep 2020 14:17:19 -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=uQBUcw70N5/pZNHz2QWMX765YU53M7496uPmAAbH/iU=; b=BMgCiDxI+ewSN9duc+vPhe1zL2wKt3c6rQlKYz9QH0ToEvMf9sfoL11ylpKV3yAh4t oALaiLPmKJtO5+cn5UwTLE5xrflMtIwwKQQj+kzXXG8bipIoxcKPpay1Pm37fb4lRf0+ W6NOp5qYE/ik0nutl3QC6yPy5/M4NVt8dzp09IBcnMvPV3OrigakDyyt1sI8LJi+kdKu vrK/smCBgTxnx2bBlpJKODNo5p5lX2c20XklJ5LKqv+YYdcyFPtVo+PBEuEQBdesT8l1 u+qj0kr40IC0Ark3xu2y4Ic/2Y+pTpby0p0pJqKia3b7oH5zmigy+cSlmRQ8HvgTACO5 ZBfw== 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=uQBUcw70N5/pZNHz2QWMX765YU53M7496uPmAAbH/iU=; b=fItTaC2s2dUrqQu1lXtfa5mpCXpfYcqbM+vug4Kk8r25p/61vrXPDFEQ8q3z03O7Me lcfD135ciPB5itDSJvRLiNoaLTsclNfoY39UNj9iqPTLbchgIqIG5aAn+vKeO2QNabxX UgiElkM6/vD1EMm01a/D8zXTwS83KStEXwxi/VA7SG8I8AOLPijExDw3tynslSSgD0zw D6Yr2ZSINy4/JJDzkw/KmmWQjcHcN7QbfiSS/Hb9aWirndbLMz1UB9FW1INrmgDOzfQL h7lNHOVJ/4fgWwTSlmHVOFGZAHRJ3D4Jembm6K6OCAocl7A7ArhQOnKbB/xhIB0e4/Ik PG9w== X-Gm-Message-State: AOAM531mgkERP0CfMl1NeVUvDmU6pe4KJBgtF2vTjVxK+nTyByk8evGy K6VniIBp/nPLcrceXv0pefuHwT0lMhHP5hpe X-Google-Smtp-Source: ABdhPJwWctjYlK1i0RQ9U5rwbx1MXyXTqF8P/2W35vyRuLyCkaQtqJgTmv97oJ7dLulE5XOcJgCU96m1Yrxfbnde X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6402:18d:: with SMTP id r13mr23596971edv.267.1600204638418; Tue, 15 Sep 2020 14:17:18 -0700 (PDT) Date: Tue, 15 Sep 2020 23:16:05 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.618.gf4bc123cb7-goog Subject: [PATCH v2 23/37] arm64: kasan: Add arch layer for memory tagging helpers From: Andrey Konovalov To: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200915_171722_141003_35A18F89 X-CRM114-Status: GOOD ( 16.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marco Elver , Elena Petrova , Andrey Konovalov , Kevin Brodsky , Will Deacon , Branislav Rankov , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko , linux-arm-kernel@lists.infradead.org, Andrey Ryabinin , Andrew Morton , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- Change-Id: I42b0795a28067872f8308e00c6f0195bca435c2a --- arch/arm64/include/asm/memory.h | 8 ++++++++ mm/kasan/kasan.h | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index e424fc3a68cb..268a3b6cebd2 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -231,6 +231,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 1d3c7c6ce771..8b43fc163ed1 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -240,6 +240,25 @@ 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. -- 2.28.0.618.gf4bc123cb7-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel