From patchwork Tue Feb 18 08:15:22 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: 13979241 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 93330C021A9 for ; Tue, 18 Feb 2025 08:18:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 27BD62800F4; Tue, 18 Feb 2025 03:18:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 22C1B2800EC; Tue, 18 Feb 2025 03:18:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A68F2800F4; Tue, 18 Feb 2025 03:18:13 -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 DFE172800EC for ; Tue, 18 Feb 2025 03:18:12 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9312FA0DC5 for ; Tue, 18 Feb 2025 08:18:12 +0000 (UTC) X-FDA: 83132362824.10.059F841 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by imf04.hostedemail.com (Postfix) with ESMTP id 7BC2940004 for ; Tue, 18 Feb 2025 08:18:10 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=QaUy80Uj; spf=pass (imf04.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 192.198.163.16 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=1739866690; 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=hd/rmwwNUxEWJaueMUiOYmy433JWOqfiDFpi9akupUI=; b=n0YsKj2MJsqTzeJyegaTqrCT7ZRQTu/yadDp5Vw82taTnxASHERYu+Gw6lzqVVSteaPerW e7YvBU8ehkHVC6R4x7HEDfZ1goNpRenmgf3oEPXK8Py4nGytNx253xMyOHzOZr3qEmVygb CPr0AWrrMgJoImT6vCEroKy8Da0qhso= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739866690; a=rsa-sha256; cv=none; b=mmehnxSU86ZgtMDMmfbn7zowAPBJNKwlpTCDFnfzeZq58ktzrIAFS4lmMdwIMNOvJGryhT b4wROiIOn0JQD3NOdcGRCwWf9fk1+Zz7a/Vd1fWT6XrTrmS8HhDBXAWy02UAr5BsnV39qZ +/C1CuWmvRQ5k5PIAVEh9TeZ+sEQRKk= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=QaUy80Uj; spf=pass (imf04.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 192.198.163.16 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739866691; x=1771402691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1nix+N5DUro8RwKo5+pglZtqohhVbR1ohGEV2E0y1dM=; b=QaUy80Uj2oZhJbylIBQrqHlBGOMeTnWbpDPWy22LyOlzg0XCEKyfglnC pfSoL3+3ib8mwGK6YhwQ/Q/R00urHYk7k4DT3XdnviMGfZnMuGebn9HD3 9eFV9WaZWuJlAUwoCRoZGqyy8xd5AM89OHPjF7npLgn7wwpKV/Drvewtf NI7JXcM7jcndxSF20SSvzf53CmgyD4ESNBrk0ROfACDNDkB+FzINEkKsb XUbUII6os2EUMl+1bHz/TdhmTI4jjn7knDGPSGL6jU9W8PxC17z5cOHI3 BPpcerzT1fCauloqeSBqffLOxMs/5vXEbjsp59qYOl/IVUJ2a2qv+u4iQ Q==; X-CSE-ConnectionGUID: 9ot+h3uhQcGRPMYNP99ovA== X-CSE-MsgGUID: Umy0GbPNSuu7cKCj46HJdg== X-IronPort-AV: E=McAfee;i="6700,10204,11348"; a="28150221" X-IronPort-AV: E=Sophos;i="6.13,295,1732608000"; d="scan'208";a="28150221" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2025 00:18:09 -0800 X-CSE-ConnectionGUID: CUmazHzUQ3u+x4JDYFIJPA== X-CSE-MsgGUID: v51nsDBYQWmIf8M/s1m01w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="119247639" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO wieczorr-mobl1.intel.com) ([10.245.245.49]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2025 00:17:49 -0800 From: Maciej Wieczor-Retman To: kees@kernel.org, julian.stecklina@cyberus-technology.de, kevinloughlin@google.com, peterz@infradead.org, tglx@linutronix.de, justinstitt@google.com, catalin.marinas@arm.com, wangkefeng.wang@huawei.com, bhe@redhat.com, ryabinin.a.a@gmail.com, kirill.shutemov@linux.intel.com, will@kernel.org, ardb@kernel.org, jason.andryuk@amd.com, dave.hansen@linux.intel.com, pasha.tatashin@soleen.com, ndesaulniers@google.com, guoweikang.kernel@gmail.com, dwmw@amazon.co.uk, mark.rutland@arm.com, broonie@kernel.org, apopple@nvidia.com, bp@alien8.de, rppt@kernel.org, kaleshsingh@google.com, richard.weiyang@gmail.com, luto@kernel.org, glider@google.com, pankaj.gupta@amd.com, andreyknvl@gmail.com, pawan.kumar.gupta@linux.intel.com, kuan-ying.lee@canonical.com, tony.luck@intel.com, tj@kernel.org, jgross@suse.com, dvyukov@google.com, baohua@kernel.org, samuel.holland@sifive.com, dennis@kernel.org, akpm@linux-foundation.org, thomas.weissschuh@linutronix.de, surenb@google.com, kbingham@kernel.org, ankita@nvidia.com, nathan@kernel.org, maciej.wieczor-retman@intel.com, ziy@nvidia.com, xin@zytor.com, rafael.j.wysocki@intel.com, andriy.shevchenko@linux.intel.com, cl@linux.com, jhubbard@nvidia.com, hpa@zytor.com, scott@os.amperecomputing.com, david@redhat.com, jan.kiszka@siemens.com, vincenzo.frascino@arm.com, corbet@lwn.net, maz@kernel.org, mingo@redhat.com, arnd@arndb.de, ytcoode@gmail.com, xur@google.com, morbo@google.com, thiago.bauermann@linaro.org Cc: linux-doc@vger.kernel.org, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org Subject: [PATCH v2 06/14] x86: Add arch specific kasan functions Date: Tue, 18 Feb 2025 09:15:22 +0100 Message-ID: <7099fb189737db12ab5ace5794080458d7a14638.1739866028.git.maciej.wieczor-retman@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 7BC2940004 X-Rspamd-Server: rspam07 X-Stat-Signature: iams16bzftbazwuryw7h6x1wt45o66d5 X-HE-Tag: 1739866690-569374 X-HE-Meta: U2FsdGVkX19xdK/Xsp2Oa1cvRnvhBZRUgp/7Nr4FSa8dwMSvzAcsv6AKkonVmA6VyBg8QYAGdMFZYBndZd57Q3C6ykO3qP+WgBTnqoBPU8FsV05BZwFIOND5yYVyToPmx3PUhe8/dkM9FVnLqwRjOZbT+CtT4ntbckG7YTkfIBxOR+jRSLxh6qlXdqVEfyiGrIxwxeH/UhEiV4BlwuNO23oXqyudfFEHbNI5tdDBxlRvlu6GrP+Tj1lAJl4nH9Hov1VPEbhGKVhspZ/5D68gpjlFBbjTmadRxc6KiXiPRIVzd8j/+CA6HPQeZdQpc7cuPKtLA47fJ986SvCXI/Bl5SW6kJGOSQYVPJgdfAozsMcmSorkxhtzT5OYl0nGOk8WLeE9Wl5HHiZ2RJw9I4Sati+q13juIKkiJIezpaZ6kBCG1ZfvvPryigABuM7elD0rbx23NGs3ClMKuIqxuFxtqEx7DOVm2B+LdGBO1o+8MhY92KZSQyUWrMcKbkhYexKr+mpApUkcVDytme8LTBnPaPHthxY7U4gftyPwZCtWpVxX2FPsHh3Ae34+IwfsmiGw6tLYCph2RKiE+oVHHlSnCwJaLDsNHKKvFIdSsf6e3rEmR4vTAwuVrG9GR+M2pQkw9MThzcUDUkFsj1YjW//bAqtF8qN9ZHLnICaaVyU1fHu7y5LfKONiL5I4NvCHneU1Hb2GJhLR3qJ8apJCs21p1nqalQaiNbC3WjXcPrwKCreyxx7JzHCX/BMiBcuEjn+uigwRkULYsbPg/u5PZ4HXIX1T56MiQjnhI8KrqfPqQ/b/kapyDnnvBk13Ofuc13AtP6XWUbY61Aoh096KWNd/Kw6/a0TdmVohC9IBPytlx+JDpfpPhZG1Md9iyD259NP3fmGi6DMde0kbDSoY+YXCOkHtWoFI7WR8ZkKr+LxnZJcdWfP+cmvbaPtv74f9u+ITeb5XNY2H45HEsFitcfK 7S/O1K8g 6XpPquiC7OJ3RvQIfQeDWD6NM5aLyJQTJOux1UsBsjh4q0KGWlV5ynzDlBAskOARFGxRDc1XY8I1YTD1lSGxbeJZUyxPFDFKhbgHrtuKDxvTy3GMxDmaMBkTHWuIH8coW4CAucFxeum2P4Ba8y2JOTCbXxkL1Ptj5zddRJJr4m3z7dqQllufeMwbATrGMmMWBlNQ6XJ0OP69KMlnMQxdsl3fUtWfnOpaZsj3YFLx0Z3iF2Z0PoALz8gytJwNlZzp1kzvOWBDSdcxbfzr6h8kKeYLUKkHvxy9FSMM8 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 software tag-based mode needs multiple macros/functions to handle tag and pointer interactions - mainly to set and retrieve tags from the top bits of a pointer. Mimic functions currently used by arm64 but change the tag's position to bits [60:57] in the pointer. Signed-off-by: Maciej Wieczor-Retman --- arch/x86/include/asm/kasan.h | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h index de75306b932e..8829337a75fa 100644 --- a/arch/x86/include/asm/kasan.h +++ b/arch/x86/include/asm/kasan.h @@ -3,6 +3,8 @@ #define _ASM_X86_KASAN_H #include +#include +#include #define KASAN_SHADOW_OFFSET _AC(CONFIG_KASAN_SHADOW_OFFSET, UL) #define KASAN_SHADOW_SCALE_SHIFT 3 @@ -24,8 +26,33 @@ KASAN_SHADOW_SCALE_SHIFT))) #ifndef __ASSEMBLY__ +#include +#include +#include + +#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) + +#ifdef CONFIG_KASAN_SW_TAGS + +#define __tag_shifted(tag) FIELD_PREP(GENMASK_ULL(60, 57), tag) +#define __tag_reset(addr) (sign_extend64((u64)(addr), 56)) +#define __tag_get(addr) ((u8)FIELD_GET(GENMASK_ULL(60, 57), (u64)addr)) +#else +#define __tag_shifted(tag) 0UL +#define __tag_reset(addr) (addr) +#define __tag_get(addr) 0 +#endif /* CONFIG_KASAN_SW_TAGS */ #ifdef CONFIG_KASAN + +static inline const void *__tag_set(const void *addr, u8 tag) +{ + u64 __addr = (u64)addr & ~__tag_shifted(KASAN_TAG_KERNEL); + return (const void *)(__addr | __tag_shifted(tag)); +} + void __init kasan_early_init(void); void __init kasan_init(void); void __init kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid); @@ -34,8 +61,9 @@ static inline void kasan_early_init(void) { } static inline void kasan_init(void) { } static inline void kasan_populate_shadow_for_vaddr(void *va, size_t size, int nid) { } -#endif -#endif +#endif /* CONFIG_KASAN */ + +#endif /* __ASSEMBLY__ */ #endif