From patchwork Tue Feb 4 17:33:46 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: 13959488 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 2759FC02194 for ; Tue, 4 Feb 2025 17:35:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B7A086B0096; Tue, 4 Feb 2025 12:35:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B2A776B0098; Tue, 4 Feb 2025 12:35:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9CA536B0099; Tue, 4 Feb 2025 12:35:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 7D2266B0096 for ; Tue, 4 Feb 2025 12:35:43 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0C7DA80BDE for ; Tue, 4 Feb 2025 17:35:43 +0000 (UTC) X-FDA: 83082964566.16.5956B7B Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by imf18.hostedemail.com (Postfix) with ESMTP id 24E501C0011 for ; Tue, 4 Feb 2025 17:35:39 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=KsgZ3uc6; spf=pass (imf18.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=1738690540; 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=Yfqt8qBHuI0y0y/l6hble+vL7VNYdTUJWFrmDxoZbF2uYAtZWAfOlZaOLMkA/SuJSdx+aZ QZmTbFuesnMOaz593tmF3xNjvT/c8xmHmV3OyVVpm7o+ESb795frP0Wign5bK39IR4KWDD C/lVCcVp2elN7gm0k3pkUSHb7XiUaFs= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=KsgZ3uc6; spf=pass (imf18.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=1738690540; a=rsa-sha256; cv=none; b=rUGCT0Z7/vqzNBqwI5aAiCg03Gbaa/FIZUP7Ghm+rqqBuznjmsVfd33kvIhM8Bw22cTFaO MDfs3XnykdV0tu8PS+KZ+rHn5E/aS9cMIaAarhTlXz/sb7ZvsMHLTEdfKifdLf3+9YA8G6 f/Ri1AuFzYqQnwpYdiPplk0I2H4V7yE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738690540; x=1770226540; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1nix+N5DUro8RwKo5+pglZtqohhVbR1ohGEV2E0y1dM=; b=KsgZ3uc64dLCDQwUfoj4msNCM1jw+SUtj/QrWhpnaODvC+nvmyznnj95 /ptkPZIHk8RCycaJ7RUSDW8s6w0jBpt5ycAkREdTC1dSxNJxqQitVXnaL g3KHCiiMVHCaKtAS/O8qO3ahb2CsSqjLvkzl8QZVURVXylk24rZvrccot mGMiNemu9iqhluhAEeecHzVbs1Udp4sneS+h8+58Ef/qR+BBsn/+8gLdD 2CjV52urcUCjNJodrJncmbwMFFdAc6B1VCJlx0P/pVnGsQ+Ed418agXdU 0Pkf5hLiaiM/fgXB0/fCG4mFvAjXc7tl7KkbXukct2XRD+nO9jBrs/Mbe Q==; X-CSE-ConnectionGUID: 2Ffk+VUsQ2CGQc65GXLpyQ== X-CSE-MsgGUID: dTrUJBK0T6ecvrTDsZjUIA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="38930598" X-IronPort-AV: E=Sophos;i="6.13,259,1732608000"; d="scan'208";a="38930598" 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:38 -0800 X-CSE-ConnectionGUID: BjNSJDU0RVuIyvdxJ63vGQ== X-CSE-MsgGUID: INVQujqZTM+d6XKry25vsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="147866530" 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:26 -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 05/15] x86: Add arch specific kasan functions Date: Tue, 4 Feb 2025 18:33:46 +0100 Message-ID: <911ad4b9f001bca4c274b60144b1db80eab2015f.1738686764.git.maciej.wieczor-retman@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 24E501C0011 X-Stat-Signature: ezo7jn9y7578ttgnbyjgxsijh1mpny87 X-Rspam-User: X-HE-Tag: 1738690539-572665 X-HE-Meta: U2FsdGVkX1+v7jmSXDv/jpR7QXIFs4cMImQHGE/ZXP5f7TIb+qCRxZp0ZKsHYIst8E1DfJDhQPONoenvsLetP5cCIYYOhr/JB4o5Lu7mRw+cL9r092hxCGODoW48KZoPjPMbEZ1NKAsGYJXY5c4a3A6/T+T7Vk/rq4bT9tsIb2RuQ/G0gvYqKblD3sJJz7iaD5yonYaUufwCQaikpQhx8KPPyxyIocLUz3yBhfmatgug7deBs3AbrEMOuP4NdBz6iSNeomUV+SEunywtAL2/Alw0nlgrLyWMY+ylkOjymxIB1l0RR1uMJGPeQNa3xVOqKFY8iw1hyFH3vIRYGMIuZG7rsxuiASqjqA5jdLLw5Y9sd0FrQogMMY7OFe08GEROklSdF9RAGChB5+8IC69u/535Qo0yVNt4LljyygijxoBewnweQtGSrlo+ALsHRhUB4HA/o8jTGma1hRErDF/LAe7aqMXPAf2ODhvfoqFvLlnd3jUaQ/NST2UTxrN126v7cWCKm/aVSdlZQMzYjj1oZT6v3Tlxaa6SfX+rzdXhfzIJrQ/4YHJ1FJdmOfeS+hW4U+xYOCwao6L6eWGaehBK0oqs3/0KLnSqSfSpeUiv43VFRtPQRugGnxe8uaOielhQPu9LMzi8V4XN0UB816Gs0GicJBXKZRDZlb5DDHU2gu662Ph0GZx3FCKvWjPjyKK+h6mx4o8ylxQdFfrscRVnt2Kueb/BiRmzvoqnhD/2Zls61IuLR68Y0d1dOTmz7i1Lrc7Ue/i6ujVCFN79qpB1ss4um44Ag/y/h/njvXR1sGXY5o+FZ6dcIifAMNGsERUhY/NPwP/xfbITBUHlJqGk0P90d2vL0Xmdx+5ZPzcxdQ/o5WtM9sUHzPwdn+vydrp4rUQyXE09o9HVQThVbJg4xw+isYlVbckGrVpxoLYhwhTSyQNFldCQsWb/5XL59JdVUKEBrro5h/tEeRwMSkz vy0IKdMW S4HBT0TkKUxumQ/k/v8qaLblqgEIgxkoyHgaYJgxyOtDYrj9GyGLLnBSmg99pd3nZ/ZlfVOE2ZhJ+NgP1WuPe3SUCGkv/cI6gzkZ9b1RunRKcF/PliFCblDzHpv838bzTKXPWIarcfYdAq5iwYxt6i0n+twmbdhpXplj1HdQxp/TGmx+MBiOiWQiqtm/zlOhu5kZOuUPQRiCpFTQ7vPjuxDvJwhsSEKH6uLyvUGPcTmjszvw7m/GHaSwQnFfP+mhYlkUVF+5j15SBWQaBT6wumxVZOBzfRqNXvLgH 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