From patchwork Tue Feb 4 17:33:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Wieczor-Retman X-Patchwork-Id: 13959487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 253C6C02193 for ; Tue, 4 Feb 2025 17:35:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B2B426B0092; Tue, 4 Feb 2025 12:35:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B0D726B0095; Tue, 4 Feb 2025 12:35:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A4006B0096; Tue, 4 Feb 2025 12:35:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7CFEF6B0092 for ; Tue, 4 Feb 2025 12:35:31 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 40F6848CB6 for ; Tue, 4 Feb 2025 17:35:31 +0000 (UTC) X-FDA: 83082964062.19.685213A Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by imf20.hostedemail.com (Postfix) with ESMTP id 279281C0003 for ; Tue, 4 Feb 2025 17:35:27 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JlXjeOEb; spf=pass (imf20.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 198.175.65.20 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738690529; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NvaRO4UHPd/bOrfuOO4NoEzfTdAiR2iNdaeHPrh09jo=; b=vRpspjB/oR6Z9+w2r7T3hVQF0Wf8UGtdmgnemB7mBB+yrGvR+J9okIXRRmoaNG9ZM/WK0s /sJrqlfGGD5GnqXo+uurL/4AZ7riGPMaX7aihtTPBCvEL3VxcXk7SPglMyZbw81gTzoo+N 5poEscMUhN5rrjtdHYnVWabwLKx5i2g= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JlXjeOEb; spf=pass (imf20.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 198.175.65.20 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738690529; a=rsa-sha256; cv=none; b=4TQxbXs4Lyv46lmPn4AoMCAj4ICpI0oIC4yhyvt3mSG1eVPZA2TdKxLLlxM28Wksue4ass CMmpX6OqOWH6P3CUtnWPfmHBIj6hqtmCsvqFZoZycq88Pi0BhaTiphKdtZ8voxaLtHgg07 sxiB1kGVg2ws9aPol484L2Mx5Le3KRs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738690528; x=1770226528; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7SPlp9QEiWP+nB12GdV91yF1dqiTepZdICL7iZuq4h4=; b=JlXjeOEbVvPMC3hhHt5yK9rjz5KPSuv2F9HBzIZvCkiL8dghqrlkSoLU emlfyS3R8R8ER41sQd+Y1uduO8pIyB2CgNSpkFWEHeOUtg9spfx1dVdZF pABfWJ97iIdw5um+JyjM3sbqg60hYeYU+fA+JCQ+xCily1xYkxReS8v7S 7Rw5GQRgSC2yj9foJjxBqcH4hcFng4cpx2Jq1y8qQxajNpq4xo1hraYJw Togy6PmSLPEqC01TWQTRL4MawcXP+4GabFXJFR2K0IX8xN9Xt2Z4WPtwC 7VM3qwWoxjhI5hiV0lhXofeMc3EkdVUqxKgzWKmccJR/DmZ/19FmNSH19 w==; X-CSE-ConnectionGUID: GQH758VjQ+6eRaJA74dRtg== X-CSE-MsgGUID: XavGOm2cQqC6AQLmTwJEcA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="38930518" X-IronPort-AV: E=Sophos;i="6.13,259,1732608000"; d="scan'208";a="38930518" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2025 09:35:25 -0800 X-CSE-ConnectionGUID: /sEOqI4kSuqYrX4FgQuozA== X-CSE-MsgGUID: zBO7dwN1RyyrRSQp4bH21Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="147866447" Received: from mjarzebo-mobl1.ger.corp.intel.com (HELO wieczorr-mobl1.intel.com) ([10.245.244.61]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2025 09:35:14 -0800 From: Maciej Wieczor-Retman To: luto@kernel.org, xin@zytor.com, kirill.shutemov@linux.intel.com, palmer@dabbelt.com, tj@kernel.org, andreyknvl@gmail.com, brgerst@gmail.com, ardb@kernel.org, dave.hansen@linux.intel.com, jgross@suse.com, will@kernel.org, akpm@linux-foundation.org, arnd@arndb.de, corbet@lwn.net, maciej.wieczor-retman@intel.com, dvyukov@google.com, richard.weiyang@gmail.com, ytcoode@gmail.com, tglx@linutronix.de, hpa@zytor.com, seanjc@google.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu, justinstitt@google.com, jason.andryuk@amd.com, glider@google.com, ubizjak@gmail.com, jannh@google.com, bhe@redhat.com, vincenzo.frascino@arm.com, rafael.j.wysocki@intel.com, ndesaulniers@google.com, mingo@redhat.com, catalin.marinas@arm.com, junichi.nomura@nec.com, nathan@kernel.org, ryabinin.a.a@gmail.com, dennis@kernel.org, bp@alien8.de, kevinloughlin@google.com, morbo@google.com, dan.j.williams@intel.com, julian.stecklina@cyberus-technology.de, peterz@infradead.org, cl@linux.com, kees@kernel.org Cc: kasan-dev@googlegroups.com, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev, linux-doc@vger.kernel.org Subject: [PATCH 04/15] kasan: arm64: x86: risc-v: Make special tags arch specific Date: Tue, 4 Feb 2025 18:33:45 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 279281C0003 X-Stat-Signature: negifzhqoozzmm6zxmw1an9up3tipmn8 X-Rspam-User: X-HE-Tag: 1738690527-738467 X-HE-Meta: U2FsdGVkX1/Y4NJPizrDGzbwkZTIYk0/TyGFNUP/mvnKVPFkvd/XxLkTpFciO2Shp5HH6QxYk/FhOyeAgAH1D2xewR6F4qNBWC4S0eCIS3uAYbq4QrYLPgAL74dZN/+WqmfWuS0hn15V+caktfTV3UvPuXpS2hBEVVZ2v1aRU1d5GVeDsfEAOhGp52CMmB5Zt5ylJXFjbbIXS10thUDQiTpVICa7Lb0kA5CCpXgxDDi3+yLzxU7XZENhuvJGosqORmrzyWQfdd7M4aBo/5xYIfhHQRGZF4E+RUdOs0tmRU3OmhzWhSyr3SDaTvvDhaSDhZNdhSBfF/gRfRYVSbz7kbd7RV2DC2hpOGcOAJJXWmprs51bW0Xl51QiwOcpXEJa744feNUb+vDhs599Pkc7WNgcOVJe2RRgwLO5sZ4swokKp6IzRQQhH3EvJk7YAEJRboB6W+l4qxMe4+r6sYa0VY3hNa6Z9LZSjYRk7mmS75ubmI0MG3SZny5lWFfhc8VHDO2K3xoNFqxSkYinzd9LmgdQfrTPddA31vnjzi9LblEBK3Qw5pDSnxcGZYiyrIlPmTikOrSqA1qGrTGN9UDdzn7rS7lxvGU6Fxg5cI8fry4eHoe9s0tnRYQpdhKMrIhuJMX7XWpL8l4ldBuw97zmv/A1F60GdknOa68MZzwwpGza0oj7FxncCUmbTzQxJJohb4IthCZx83qAv+lSYZTcPHiKOa3+H00jNjjxzHxIrsIqqdPbX2pnTUkabcPa+wLkIRTzC5RnwfeMPZ2x7uN30h00yL1278qkye8kL0RlrJUguB+E3kJg/XlwnUfFb/c3FbibHHpXVRgANSubxXIPImS1oQufGbdVf+WKiN36bvQOg6ckO0eFCTyMXS/qp8s7GSgL3cjRQLrdboRp1l3yQWuCjWA3QKeRL3PNVOjxQeQz59badQE8JPKVZtIF8zQWinA3E6cS3Ct8toE+uwG 91yWyIRc 1IG4+0uiTd6cgJaE4hcl4uxHAN3NlpKiHf4p7wNyJM3bQkM+82JzQeLYiOiX6GVVkwm08MVYqNOOr5lneYDKBqAjxFGK4oUgz5VYKbzZ1o9xwMmEc/JAT7I4gV+NASqr8enS6rtYt29pPvn2j0j0b7l+/ZjEG5lAeJ7G5dy7x0CGqGuNh0iahIt/zKpgL9MD3Rm7WvvPwCidwhgOdxOiGni/38kXmK1r/9KeW7XpJzPDJL3TDtp4+NT4RuS0EcI4VKBgEF6ftbWg7dbpemc52B7zPM0rPXq9QrTU9IlGJ2ZAKCguOBXIdJ1+DVkYTrRHzZZw2xtSFe6pYKkw= 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: List-Subscribe: List-Unsubscribe: KASAN's tag-based mode defines multiple special tag values. They're reserved for: - Native kernel value. On arm64 it's 0xFF and it causes an early return in the tag checking function. - Invalid value. 0xFE marks an area as freed / unallocated. It's also the value that is used to initialize regions of shadow memory. - Max value. 0xFD is the highest value that can be randomly generated for a new tag. Metadata macro is also defined: - Tag width equal to 8. Tag-based mode on x86 is going to use 4 bit wide tags so all the above values need to be changed accordingly. Make tags arch specific for x86, risc-v and arm64. On x86 the values just lose the top 4 bits. Replace hardcoded kernel tag value and tag width with macros in KASAN's non-arch specific code. Signed-off-by: Maciej Wieczor-Retman --- MAINTAINERS | 2 +- arch/arm64/include/asm/kasan-tags.h | 9 +++++++++ arch/riscv/include/asm/kasan-tags.h | 12 ++++++++++++ arch/riscv/include/asm/kasan.h | 4 ---- arch/x86/include/asm/kasan-tags.h | 9 +++++++++ include/linux/kasan-tags.h | 12 +++++++++++- include/linux/kasan.h | 4 +++- include/linux/mm.h | 6 +++--- include/linux/page-flags-layout.h | 7 +------ 9 files changed, 49 insertions(+), 16 deletions(-) create mode 100644 arch/arm64/include/asm/kasan-tags.h create mode 100644 arch/riscv/include/asm/kasan-tags.h create mode 100644 arch/x86/include/asm/kasan-tags.h diff --git a/MAINTAINERS b/MAINTAINERS index b878ddc99f94..45671faa3b6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12227,7 +12227,7 @@ L: kasan-dev@googlegroups.com S: Maintained B: https://bugzilla.kernel.org/buglist.cgi?component=Sanitizers&product=Memory%20Management F: Documentation/dev-tools/kasan.rst -F: arch/*/include/asm/*kasan.h +F: arch/*/include/asm/*kasan*.h F: arch/*/mm/kasan_init* F: include/linux/kasan*.h F: lib/Kconfig.kasan diff --git a/arch/arm64/include/asm/kasan-tags.h b/arch/arm64/include/asm/kasan-tags.h new file mode 100644 index 000000000000..9e835da95f6b --- /dev/null +++ b/arch/arm64/include/asm/kasan-tags.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_KASAN_TAGS_H +#define __ASM_KASAN_TAGS_H + +#define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ + +#define KASAN_TAG_WIDTH 8 + +#endif /* ASM_KASAN_TAGS_H */ diff --git a/arch/riscv/include/asm/kasan-tags.h b/arch/riscv/include/asm/kasan-tags.h new file mode 100644 index 000000000000..83d7dcc8af74 --- /dev/null +++ b/arch/riscv/include/asm/kasan-tags.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_KASAN_TAGS_H +#define __ASM_KASAN_TAGS_H + +#ifdef CONFIG_KASAN_SW_TAGS +#define KASAN_TAG_KERNEL 0x7f /* native kernel pointers tag */ +#endif + +#define KASAN_TAG_WIDTH 8 + +#endif /* ASM_KASAN_TAGS_H */ + diff --git a/arch/riscv/include/asm/kasan.h b/arch/riscv/include/asm/kasan.h index f6b378ba936d..27938e0d5233 100644 --- a/arch/riscv/include/asm/kasan.h +++ b/arch/riscv/include/asm/kasan.h @@ -41,10 +41,6 @@ #define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL) -#ifdef CONFIG_KASAN_SW_TAGS -#define KASAN_TAG_KERNEL 0x7f /* native kernel pointers tag */ -#endif - #define arch_kasan_set_tag(addr, tag) __tag_set(addr, tag) #define arch_kasan_reset_tag(addr) __tag_reset(addr) #define arch_kasan_get_tag(addr) __tag_get(addr) diff --git a/arch/x86/include/asm/kasan-tags.h b/arch/x86/include/asm/kasan-tags.h new file mode 100644 index 000000000000..68ba385bc75c --- /dev/null +++ b/arch/x86/include/asm/kasan-tags.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_KASAN_TAGS_H +#define __ASM_KASAN_TAGS_H + +#define KASAN_TAG_KERNEL 0xF /* native kernel pointers tag */ + +#define KASAN_TAG_WIDTH 4 + +#endif /* ASM_KASAN_TAGS_H */ diff --git a/include/linux/kasan-tags.h b/include/linux/kasan-tags.h index e07c896f95d3..b4aacfa8709b 100644 --- a/include/linux/kasan-tags.h +++ b/include/linux/kasan-tags.h @@ -2,7 +2,17 @@ #ifndef _LINUX_KASAN_TAGS_H #define _LINUX_KASAN_TAGS_H -#include +#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) +#include +#endif + +#ifdef CONFIG_KASAN_SW_TAGS_DENSE +#define KASAN_TAG_WIDTH 4 +#endif + +#ifndef KASAN_TAG_WIDTH +#define KASAN_TAG_WIDTH 0 +#endif #ifndef KASAN_TAG_KERNEL #define KASAN_TAG_KERNEL 0xFF /* native kernel pointers tag */ diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 5a3e9bec21c2..83146367170a 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -88,7 +88,9 @@ static inline u8 kasan_get_shadow_tag(const void *addr) #ifdef CONFIG_KASAN_SW_TAGS /* This matches KASAN_TAG_INVALID. */ -#define KASAN_SHADOW_INIT 0xFE +#ifndef KASAN_SHADOW_INIT +#define KASAN_SHADOW_INIT KASAN_TAG_INVALID +#endif #else #define KASAN_SHADOW_INIT 0 #endif diff --git a/include/linux/mm.h b/include/linux/mm.h index 61fff5d34ed5..ddca2f63a5f6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1813,7 +1813,7 @@ static inline u8 page_kasan_tag(const struct page *page) if (kasan_enabled()) { tag = (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK; - tag ^= 0xff; + tag ^= KASAN_TAG_KERNEL; } return tag; @@ -1826,7 +1826,7 @@ static inline void page_kasan_tag_set(struct page *page, u8 tag) if (!kasan_enabled()) return; - tag ^= 0xff; + tag ^= KASAN_TAG_KERNEL; old_flags = READ_ONCE(page->flags); do { flags = old_flags; @@ -1845,7 +1845,7 @@ static inline void page_kasan_tag_reset(struct page *page) static inline u8 page_kasan_tag(const struct page *page) { - return 0xff; + return KASAN_TAG_KERNEL; } static inline void page_kasan_tag_set(struct page *page, u8 tag) { } diff --git a/include/linux/page-flags-layout.h b/include/linux/page-flags-layout.h index 7d79818dc065..ac3576f409ad 100644 --- a/include/linux/page-flags-layout.h +++ b/include/linux/page-flags-layout.h @@ -3,6 +3,7 @@ #define PAGE_FLAGS_LAYOUT_H #include +#include #include /* @@ -72,12 +73,6 @@ #define NODE_NOT_IN_PAGE_FLAGS 1 #endif -#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) -#define KASAN_TAG_WIDTH 8 -#else -#define KASAN_TAG_WIDTH 0 -#endif - #ifdef CONFIG_NUMA_BALANCING #define LAST__PID_SHIFT 8 #define LAST__PID_MASK ((1 << LAST__PID_SHIFT)-1)