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=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 DF105C4346E for ; Thu, 24 Sep 2020 22:52:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8ABB82344C for ; Thu, 24 Sep 2020 22:52:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TATkXEfB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727041AbgIXWwK (ORCPT ); Thu, 24 Sep 2020 18:52:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726962AbgIXWvx (ORCPT ); Thu, 24 Sep 2020 18:51:53 -0400 Received: from mail-qv1-xf49.google.com (mail-qv1-xf49.google.com [IPv6:2607:f8b0:4864:20::f49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5392FC0613D3 for ; Thu, 24 Sep 2020 15:51:53 -0700 (PDT) Received: by mail-qv1-xf49.google.com with SMTP id k14so464185qvw.20 for ; Thu, 24 Sep 2020 15:51:53 -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=0jztYvLtNDJTI+Li9nzFVZCFMRi2vX4Swz42H1b3+CE=; b=TATkXEfBuXx8POxghcsvnhPg/Ppe5qlIFWUMsPy/7MJdyT6Zg3mWK9cJR5BDXuKKWU lVdlTmQkU3DtKV64iPmplPxNViyG/jfBWAmRD1h96NInmRQynNRWNhwuQpQwSwkcDlMa l3sexWbnfWBKB3WrJ4YLK6W+xLA1Ht+FigjwaQvYt9Jub7aTkDFTT5Y9U6F4bj1tRwNq BOLMQ8ahFv+kOVr7L6nTg+jtlI8ouOa45HFaoYqrUSX5mqRQzVx3V1LYerYOL5OMIVam MSydCeaJiUYnF/qraHQRQVj/PpP226+GN6/BWOre1/+4NOVqQbC5h/JXBzJJVwV2aydb vN6w== 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=0jztYvLtNDJTI+Li9nzFVZCFMRi2vX4Swz42H1b3+CE=; b=AEEt2uQVlU5ouDLICnmy7fsJKvGFFOsz4l59rKCTj2tqTNEHqNX5aADS5bofWdpIP5 VeR8Q8v8tH/pUkESBsoyPaYxcmkMsW5EyVwm5XKDROxJNbXniBaESOmOM/FjHqoikoPQ SjsiL/MICEqMuEjYutg42ayxQwy9U1sv0jkTinA8U9+pHeq67ZtLodAsjvpf/cWEeGCv GjpvYEMguvI22FJhqJKGGU+Q+AcI5lU1fjnd4XGtNv/1UxZgJGWcnXrYJPeAZKnFSD8B MJbuwYXD/MoABpZzaHH4LdPGpyX9jitEJ36dcwLN6E1P2ZxGfzzYkzAE98jpcFeds1DA QF3Q== X-Gm-Message-State: AOAM533HvMjuyW74AX7+TTyoGdLTfH4QnoN7RVe4RtYImBYQphzthpsN zwJ2t43bksgJXemDQCqyfivmPmZCC/RMXsKG X-Google-Smtp-Source: ABdhPJwoMR0xEqUVOBwjA4EzvV3B9Mt/BV5b/SvOxhCiK3Y6w/N1LrceyVpM0jW4TsqTz3/hGCQu7Bq4A+EsI69c 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:a0c:e5cf:: with SMTP id u15mr1552253qvm.14.1600987912449; Thu, 24 Sep 2020 15:51:52 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:32 +0200 In-Reply-To: Message-Id: <176c7b60cb2711559450839242a0f6fade769c3f.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 25/39] arm64: kasan: Add arch layer for memory tagging helpers 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" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 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 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 50b59c8f8be2..9c73f324e3ce 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -241,6 +241,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. -- 2.28.0.681.g6f77f65b4e-goog 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.6 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 20FC8C4741F for ; Thu, 24 Sep 2020 22:51:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B1ACB23600 for ; Thu, 24 Sep 2020 22:51:54 +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="TATkXEfB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1ACB23600 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 47254900002; Thu, 24 Sep 2020 18:51:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 44D548E0001; Thu, 24 Sep 2020 18:51:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EA00900002; Thu, 24 Sep 2020 18:51:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0215.hostedemail.com [216.40.44.215]) by kanga.kvack.org (Postfix) with ESMTP id 17C438E0001 for ; Thu, 24 Sep 2020 18:51:54 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D4FDF8249980 for ; Thu, 24 Sep 2020 22:51:53 +0000 (UTC) X-FDA: 77299454106.10.day03_040d18727162 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id B277C16A0D1 for ; Thu, 24 Sep 2020 22:51:53 +0000 (UTC) X-HE-Tag: day03_040d18727162 X-Filterd-Recvd-Size: 6195 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, 24 Sep 2020 22:51:53 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id a20so468323qvk.17 for ; Thu, 24 Sep 2020 15:51:53 -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=0jztYvLtNDJTI+Li9nzFVZCFMRi2vX4Swz42H1b3+CE=; b=TATkXEfBuXx8POxghcsvnhPg/Ppe5qlIFWUMsPy/7MJdyT6Zg3mWK9cJR5BDXuKKWU lVdlTmQkU3DtKV64iPmplPxNViyG/jfBWAmRD1h96NInmRQynNRWNhwuQpQwSwkcDlMa l3sexWbnfWBKB3WrJ4YLK6W+xLA1Ht+FigjwaQvYt9Jub7aTkDFTT5Y9U6F4bj1tRwNq BOLMQ8ahFv+kOVr7L6nTg+jtlI8ouOa45HFaoYqrUSX5mqRQzVx3V1LYerYOL5OMIVam MSydCeaJiUYnF/qraHQRQVj/PpP226+GN6/BWOre1/+4NOVqQbC5h/JXBzJJVwV2aydb vN6w== 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=0jztYvLtNDJTI+Li9nzFVZCFMRi2vX4Swz42H1b3+CE=; b=JIrcK7QMIhXUxY86OzBTgkw9S3ZdR25oHKE8J29kjareAa1wsB5KO33K0Uy+eEfTi3 gKRR7OXTLQr+leDdp78cEMUhYfIZOyde06DXU93/stRKvN7Sxja6tSRknz/Tj88CmT4N hdzXe7CvfPbp7LdzwpXU4hCgHG1bCXmDrzmxZ5CdII6up9O8PgS03Gks3whXsUqTRtWp gOSijo9/DXIpFrpIYAW7su43LfsvTueXAaouxMH/BtkemBln0XzT9soirKtSBnIXLNHG DZsiBRbb71YcgQdF9En+QU/26L1akEBkrlpTsLsqMJmErYOC7NVIgdnqHOjwCpqI6/2e 8nRg== X-Gm-Message-State: AOAM530BSdSTUCxHgQQsC8AKCwWJa0cRyCGWcLAab2WnYE2wwx3qX7/m bwsS0Ej02mDsegBb9O/HK3MJdqGZ7CxqI0PB X-Google-Smtp-Source: ABdhPJwoMR0xEqUVOBwjA4EzvV3B9Mt/BV5b/SvOxhCiK3Y6w/N1LrceyVpM0jW4TsqTz3/hGCQu7Bq4A+EsI69c X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:e5cf:: with SMTP id u15mr1552253qvm.14.1600987912449; Thu, 24 Sep 2020 15:51:52 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:32 +0200 In-Reply-To: Message-Id: <176c7b60cb2711559450839242a0f6fade769c3f.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 25/39] arm64: kasan: Add arch layer for memory tagging helpers 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: 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 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 50b59c8f8be2..9c73f324e3ce 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -241,6 +241,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. -- 2.28.0.681.g6f77f65b4e-goog 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=-13.9 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 743AAC4346E for ; Thu, 24 Sep 2020 23:03:42 +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 1D0FC23899 for ; Thu, 24 Sep 2020 23:03:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kwHF4TSj"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="TATkXEfB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D0FC23899 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=py5qdbm34c2eQUsqT1WunYPblTEr+6a0344coNIi+0Q=; b=kwHF4TSj31YxAxFrzfiewCrSA WtF0P55Zf0UQDb2DprBRACyPTpzPm6fWBZlr1L2bblnYpoFooTrfYoPW+E1V8XvrUhT8eduARBwMG gETH4+E4aTqioC2jZrr3t2CRxFJYxm0I6Rub3tYn3gBlQFEIMLxTe05i0hr1rXfKR2cHoNnCFuqRy 9pF5MJbA9i8eREJqJpIsKXOfcE3pobNCvQVg/PF4jHG4lMaFcs3T1F+AUirYz0lkPB/NUzelqWfXk iF4BemBxK1Q9Qo9BmbJ8+cjGqh5Nn5ubDtRvKslWLEWCE3S/rqRFYsuYoXeP5EHQPDUdD5UDuQcK9 bHJrEbomA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLaEV-0006HM-CM; Thu, 24 Sep 2020 23:00:59 +0000 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kLa5k-0002Qd-14 for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2020 22:51:57 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id w8so465023qvt.18 for ; Thu, 24 Sep 2020 15:51:53 -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=0jztYvLtNDJTI+Li9nzFVZCFMRi2vX4Swz42H1b3+CE=; b=TATkXEfBuXx8POxghcsvnhPg/Ppe5qlIFWUMsPy/7MJdyT6Zg3mWK9cJR5BDXuKKWU lVdlTmQkU3DtKV64iPmplPxNViyG/jfBWAmRD1h96NInmRQynNRWNhwuQpQwSwkcDlMa l3sexWbnfWBKB3WrJ4YLK6W+xLA1Ht+FigjwaQvYt9Jub7aTkDFTT5Y9U6F4bj1tRwNq BOLMQ8ahFv+kOVr7L6nTg+jtlI8ouOa45HFaoYqrUSX5mqRQzVx3V1LYerYOL5OMIVam MSydCeaJiUYnF/qraHQRQVj/PpP226+GN6/BWOre1/+4NOVqQbC5h/JXBzJJVwV2aydb vN6w== 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=0jztYvLtNDJTI+Li9nzFVZCFMRi2vX4Swz42H1b3+CE=; b=nH/HtOaX1LNKMMdPo5tK009JR0SKcrAmVV3hm7wokfKaWnK12BspWVGqGaRq8FeY+Q sxEeCtcTsMbRqBLWCvA7jEm+Z6B0+8WgwU+kEPHnLmgG9CaYyeS1rW5oaK9Wc3tRHLHO CUCUqQlEjbwo4jNUR1Y1muM/KxXMWM0SKoN7mjER5tWJr7/AbzDW+aZ7kbJBCJgE6Yp9 tBx5wre+8wSqNqIB8QSzHaEJxKkEkb0ZY68oYGHY9wLDR/tv6MJuVrlJCndHG/Cb1IEr yViroDBmNWLjH/GbA6S3iCtB0TySE3jU8uPUP87KjH4ZdQrEW0uAZW3X+y8WgXfvaR+1 Bk2w== X-Gm-Message-State: AOAM532CqJA0YG4GvEZYP2k2k/6M4/1+9IpXg1e8cuUkwuXnsovrUyIB om1NCNnA4R+Szi1n5SUNRSyx5p9cC6Ad11Zu X-Google-Smtp-Source: ABdhPJwoMR0xEqUVOBwjA4EzvV3B9Mt/BV5b/SvOxhCiK3Y6w/N1LrceyVpM0jW4TsqTz3/hGCQu7Bq4A+EsI69c X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:e5cf:: with SMTP id u15mr1552253qvm.14.1600987912449; Thu, 24 Sep 2020 15:51:52 -0700 (PDT) Date: Fri, 25 Sep 2020 00:50:32 +0200 In-Reply-To: Message-Id: <176c7b60cb2711559450839242a0f6fade769c3f.1600987622.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.681.g6f77f65b4e-goog Subject: [PATCH v3 25/39] 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-20200924_185156_132959_E7BD4A00 X-CRM114-Status: GOOD ( 16.24 ) 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 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 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 50b59c8f8be2..9c73f324e3ce 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -241,6 +241,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. -- 2.28.0.681.g6f77f65b4e-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel