From patchwork Tue Feb 4 17:33:55 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: 13959497 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 45DFAC02193 for ; Tue, 4 Feb 2025 17:37:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C66B228000B; Tue, 4 Feb 2025 12:37:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BEE79280008; Tue, 4 Feb 2025 12:37:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1A2928000B; Tue, 4 Feb 2025 12:37:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7ABB4280008 for ; Tue, 4 Feb 2025 12:37:35 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0EF634A58B for ; Tue, 4 Feb 2025 17:37:32 +0000 (UTC) X-FDA: 83082969144.11.A503322 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by imf14.hostedemail.com (Postfix) with ESMTP id 7B923100015 for ; Tue, 4 Feb 2025 17:37:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=AT+emMBs; spf=pass (imf14.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=1738690650; 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=PCQPfnDRBxmJXeqGE9pZTyAVVotiYe5di+G+aFzDagA=; b=LCPDdqyjBwPUKVNB4zWCFM9dM9pwuKN2jV0zjmp8bkFNPnMhTs9njnecDvp95iMtGCJdbe Px7biLUrOrDlK2V7BZ6zYaSn/G/bOuywFoxY30R3FT0w0GL+7/NN3QQgzWG4NOAyIEhQ45 /6BAsRjEe8TWjIn0elUisgqGGqtYJM4= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=AT+emMBs; spf=pass (imf14.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=1738690650; a=rsa-sha256; cv=none; b=F/Cje172/WBgL/XHJJvzurHxrQ+gCazJHzB0M5ofW7AadSwOQfnVpNxKs3E0qvtjoEMOAa qSeUVuMfyumLN4v9AKQsW8xYhRa5hasDfTSs1nMc1tuq7wQKEDWNyaHCyeoawEkvEpNYuc sd+eZbf6msfcp4WwUGYFfFWWdOw4YNg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738690649; x=1770226649; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oiRBgvokfmZMzIN+jtwGJEePgjLFxs7ade5tHmSo4go=; b=AT+emMBscQCyn5fPQ0oRIf8s1+/d9RwkDxYMHXX17mDxoicd+LJWOuql geskYX11c+AAzWrHvldMohSNmfnEGiQdy+kv/pJnxUrlpFswzzsAzI0Cq jy13QgoMsIBxhruW2ZqAMoFWabJM8BDv5EC5BuIGZzwJZ4HBMe6fP2g62 R+eV2bJlg52AwWy1Ou8c5BEZMWqD6jJkWdrgGEeZjoibPrWWGT3fPxdS0 R0QO1iDNLI7pnezuNXF7v3EB5fBt3Q7HFszVJd2HgnP+JGLDm6cStpnN8 S94DXFk0kg2w/nXh7IFPyousj4GdP0EiGRz8RkhxDl8vSLWJIIjrjjjW3 A==; X-CSE-ConnectionGUID: 9vb9AemGSM2fr1SMsOY0SA== X-CSE-MsgGUID: exZOcm2gR+i/fvLhJukydQ== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="38931168" X-IronPort-AV: E=Sophos;i="6.13,259,1732608000"; d="scan'208";a="38931168" 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:37:29 -0800 X-CSE-ConnectionGUID: VKIBhH62QgyxuyV1BEgDvg== X-CSE-MsgGUID: /T7gEKWsTDWNscbEm9C8IA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="147867163" 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:37:17 -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 14/15] x86: Make software tag-based kasan available Date: Tue, 4 Feb 2025 18:33:55 +0100 Message-ID: <794a931acfb8e73e28c02932ef08bed9254f164e.1738686764.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-Server: rspam09 X-Rspamd-Queue-Id: 7B923100015 X-Stat-Signature: wdmk4ja4jgapwfd5a6whgqnu4pkb6pwy X-HE-Tag: 1738690649-215513 X-HE-Meta: U2FsdGVkX1/x8Hi+6pvSnvIgH0T+XPkeLOFmIHlxli8cysqV6efBfB8d7C734xfVmmrRmEZUzWHIQVXcFUWajre8kpADBwqKEHgzhoVJHHNMv9bGzMZHMlaG5bDaJA8KHmrMFMW3CElmBSSOBCCKUFyVtvDj6Qn0M4w9goKwvL70OuWcF2PCEmf2WUR89BmnrJvMgwFAU6kCSM7dQVGVLR51Wwy2aRqnqyeBDP1VgYG1TBJgskgiNdIIkixiy/eAPrZCulwstiLPdGOD0I5YNCksY5aqDGrqN0tb252rgbY+0Z+g4mrWyESTSVarRn4qeff4ypC9ctiAkEqo4leaSmBC04O4w6rPkEzQczRMIwKUSJxLRivHFQVAK7xd38m/ws7LJBUXw7yxlGFtyjg5Zvx1KWiKfTohpLDjhkcn8hwzhVaD9jS+q5gPpPwMI1zOBYqC1L6vS8IhHDhtNyhWj5EG75tafDR/BlbZ1pahYhXe7Pdujk7G4HikYv4jA8wggVjDE+3ePj0sINNfLHafmdRzrmpwNxca9jID+xzUfm5423uekSsNxT/wJdrSHw2gsM0evjDcu0hFwL6ek4vxftO37MBXzKrBjQJY9h9HkvQgmnFuKLMrfOFZH6UoSVnkU4IkvEMg2s2BV0Z1oszmACrY6X7ZnBJiOpyUQKmxc+gg5G8rBarob3ue3SQZB9HVH3OMfNr2k5tLNttIt5BcLRKJP8f9SGlNEXNl6+Lp5H17rrm6a6e4T5NKm/Z9nueERo+2pE4KXMEp9yUxfoyKm8ieKNNq5pM2o9YVFhdz4rvjXt9gvocKHCqBQJTyFoIcLdg52arFnQ8lcYFzFBfqf/pLPLcdrrZj+wx8nwQbfFxQUkD+gd7PJRcL5UKKw9lbXhqjDo+7cyw57V2yVyUBZlu+dXMtgM8uFH9HBZedrYkISmA+6xU9bwBfeMQGHzeBwoCylTU0+b0Sd7z/2ff RFa/ndy+ zjsMBKkIRHnCOuNKqzd3DZEwp0tC7AR5UOYuiTd7GQdpzQwjllEJ4gxN4JlUYJuKLdCmXTCRgmg9c+Gri4zAm/ksI8bQRMgJREYlwaNggTlrc2re9K8sf1lwjXlNBSAMF9C9Du47w6CmApfU5phXr1Mzk5h7E5SUEo9Ch3E0ESjwSRZwl2oUzyXMEDa1/rTHXKalgmrJMlY3NNUmzUVJl1dIhbqt0sBDye+ON5L60JIfNRjcY0JolWppTyA== 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: Make CONFIG_KASAN_SW_TAGS available for x86 machines if they have ADDRESS_MASKING enabled (LAM) as that works similarly to Top-Byte Ignore (TBI) that allows the software tag-based mode on arm64 platform. Set scale macro based on KASAN mode: in software tag-based mode 32 bytes of memory map to one shadow byte and 16 in generic mode. Signed-off-by: Maciej Wieczor-Retman --- arch/x86/Kconfig | 8 ++++++++ arch/x86/boot/compressed/misc.h | 2 ++ arch/x86/include/asm/kasan.h | 2 +- arch/x86/kernel/setup.c | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index dfec7bc692d4..afbcf27ad278 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -36,6 +36,7 @@ config X86_64 select ARCH_HAS_ELFCORE_COMPAT select ZONE_DMA32 select EXECMEM if DYNAMIC_FTRACE + select ARCH_HAS_KASAN_SW_TAGS_DENSE config FORCE_DYNAMIC_FTRACE def_bool y @@ -190,6 +191,7 @@ config X86 select HAVE_ARCH_JUMP_LABEL_RELATIVE select HAVE_ARCH_KASAN if X86_64 select HAVE_ARCH_KASAN_VMALLOC if X86_64 + select HAVE_ARCH_KASAN_SW_TAGS if ADDRESS_MASKING select HAVE_ARCH_KFENCE select HAVE_ARCH_KMSAN if X86_64 select HAVE_ARCH_KGDB @@ -394,6 +396,12 @@ config KASAN_SHADOW_OFFSET hex default 0xdffffc0000000000 if KASAN_GENERIC +config KASAN_SHADOW_SCALE_SHIFT + int + default 5 if KASAN_SW_TAGS_DENSE + default 4 if KASAN_SW_TAGS + default 3 + config HAVE_INTEL_TXT def_bool y depends on INTEL_IOMMU && ACPI diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index dd8d1a85f671..397a70558ffa 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -13,6 +13,8 @@ #undef CONFIG_PARAVIRT_SPINLOCKS #undef CONFIG_KASAN #undef CONFIG_KASAN_GENERIC +#undef CONFIG_KASAN_SW_TAGS +#undef CONFIG_KASAN_SW_TAGS_DENSE #define __NO_FORTIFY diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h index 79151356d5f2..99ff4ae83bf7 100644 --- a/arch/x86/include/asm/kasan.h +++ b/arch/x86/include/asm/kasan.h @@ -6,7 +6,7 @@ #include #include -#define KASAN_SHADOW_SCALE_SHIFT 3 +#define KASAN_SHADOW_SCALE_SHIFT CONFIG_KASAN_SHADOW_SCALE_SHIFT /* * Compiler uses shadow offset assuming that addresses start diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index f1fea506e20f..c300274e205a 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1121,6 +1121,8 @@ void __init setup_arch(char **cmdline_p) kasan_init(); + kasan_init_sw_tags(); + /* * Sync back kernel address range. *