From patchwork Tue Feb 4 17:33:47 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: 13959489 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 5E8BCC02197 for ; Tue, 4 Feb 2025 17:35:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C8B506B0099; Tue, 4 Feb 2025 12:35:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C3B8E6B009A; Tue, 4 Feb 2025 12:35:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B2A2F6B009B; Tue, 4 Feb 2025 12:35:57 -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 949F56B0099 for ; Tue, 4 Feb 2025 12:35:57 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 4CB12120C35 for ; Tue, 4 Feb 2025 17:35:57 +0000 (UTC) X-FDA: 83082965154.15.08A54E1 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by imf06.hostedemail.com (Postfix) with ESMTP id E9ABE180011 for ; Tue, 4 Feb 2025 17:35:52 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Zl0vXEOV; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf06.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 198.175.65.20 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738690555; a=rsa-sha256; cv=none; b=WQwBbp8xbvpRAKUHBNLjIkVe1OvRSLBKw08fIrDFZLNiPmw5XdpCnCPOHK7A7Hjb6icoVF r0C9b4kE/GXAqCJLKA25R0UdcQSE+wLDlcc8tfJJjGHgiG6fAKMLDgwNhBAUjYWKw/Pppi dXPjSJY9WbpjlekzFE3eEAGhR7xqn0k= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Zl0vXEOV; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf06.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 198.175.65.20 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738690555; 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=4BMCwGV6PWVYHkQSqSGJPvpDzUETn/4+hKDV9iJhNHI=; b=Ay3vLw0oFzmqwHVBKTSBEL0gWY3yW1ON+Pt2gy6gB/f86FnVo7prkESXVpFg6q0Y9XvR1c nBSuDORZyWk6NigJBa2jXvgjVQq4Wg+3ZCN3EeuIeZUhGv1E5evRuHKXF5nSAx4H42v+/C hob5yZSesJk2OXB8xlQpaCeb9QSq9Fg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738690554; x=1770226554; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GgxfVN861pKW86Az0//GU2BTNPe6s6rSZNyJJoV8Pn4=; b=Zl0vXEOVbshg7hr4RQ1e9NES6OLhflTlJ0R09i/x1d1hKhUhgto/XAsB wexmaS4nmkWFLK6q1em8863mgALU+w2vsrRuSTKRXjdu/v1MERPwmPr0D sLibIkigUVJbUUGbLDq5i12D3dn9/FMrBWZWPRc8UqSUq8/b+u0wwhePv qir6dlBU9ns1tbnoS6XOV/0UFtb3bOblFrRHjbm/O2q78Ph9tQ2vPRYug evLIsfLPjjAoUqcj+y/XYuKFTK1dYOvU2cEqennG3iuEfFWk7eHvhm4rA KJOLlkV/58ZlTyaWti62j1zJ3yAWpyi7q9nIPeMn2QE4bQWUsMWb4EZ5b w==; X-CSE-ConnectionGUID: NL+lQQpvQ5CAUsBj19KN1w== X-CSE-MsgGUID: lUIr5eAhR5G/KUkyl8cMRg== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="38930651" X-IronPort-AV: E=Sophos;i="6.13,259,1732608000"; d="scan'208";a="38930651" 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:50 -0800 X-CSE-ConnectionGUID: EjCbNRnNQ/eG0RktDBjJIQ== X-CSE-MsgGUID: zLXQup0VQWiJeXH9lbUyzw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="147866602" 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:38 -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 06/15] x86: Reset tag for virtual to physical address conversions Date: Tue, 4 Feb 2025 18:33:47 +0100 Message-ID: <80aa9a4c633502b5330c40f8b2d4da705dca92e7.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-Queue-Id: E9ABE180011 X-Rspamd-Server: rspam10 X-Stat-Signature: epkkm4wqimup1167ea6mb4ymds96i6zm X-HE-Tag: 1738690552-397514 X-HE-Meta: U2FsdGVkX18nxMg37xBDHzpy8c5dzJ2WN9IeSoSeE9Gvidlq9J5AHOxV5sAej63CnaGnyrSPVEk4C7aeIClRTq/EN16o1+wbcUyoNu1kp6I724dA3kBMo+G4QXAPvzrAoqhlBvLHlS/Mtbyo//K7bedevw4DhhT5YGL1/WGMvJ9CrGWvm6vGBQmJWVu1x5PJ1YhfE2DUgzsVxrjUAF7ogLSEK97C4Ow4UlgRwSzEiHsBKJTakfQ+atdLtcX46RmIkWjJyx5+0r6hTPwf46pP8N8xk4jFBmI3qMqHgUp/HmSBDNKvOnKd5v8aEIDiTSKW4QxB2yhgNbP3AdX+k0M+qU9KB8g3eetggXniB/SwfIXC4GCQuHAO1/dr9ut10c9I5+a/Syg2dNEuoLievgygHAeZkj+qgVvD2FaKlz7rv1n7Xb6r5IEcKzlKq1XKy61n9Z+/T3wtdn0OkyBwOM+hBOR9bUUxtLTaUfS4eepuokg4opV4KiZnsQGa0NGSeMGdswnEf9yNpHl86Qv/aPxb0JwIilMb3gxMW6f7vdVkPflMQOebPwmhkP51P+g6yYldnCpefXbenslWviS3omNb93SJnUTSSbFHnZUR3HIH5ZTOcNVX/u31VV8n4E8J53fZdwPXRGjI5F4CXss+GAoN2M1WnpUBf3MvIxIr15VZiYy90MWjc0+xaMTVMIugZIAiUNG6NWBfgS/JwU7hf9WBKd1Oj1S728+nIUkxptBDpXHQLZGwX+Eo+ONUJIs5hH35LeEmCbo6IwAZDn/qXH6SddvfcciztyOVHcjD76dU7EznsrdPhZSssmdi0/rAVoT0NTOpv6VNhlrKPlGfjZfcMZiiZ17ItJcqhyAW2G/rIkOePj/bkeCCBeZ1n5bcBxmhiBR8LqdDB1RgYsMlq7yQJy+YYjvu2Tvo4P21NK8rPhZatGY1O9wuzgdHegG/EJ+BXzYesHeSak7JYqQsnCa kpGD/WtA 5vFgNxAI4xxy+7kbgM4SC45lW2l8kZbQyyEXC8iLr/nE22MZkVMbm8fOD+yFrHQr+ZtOCgK5FjMlO2lxFvhGz8qUe0vvWoQJDpxsneSFJkUC18uNaFH82huq1PDhjM/vKrWVa7pw2Lq3FghZwiuYKiQuvGduh5TJzaq6Rcoid9B19mYC6X6CUkIGyFHynzKWA2zhQVLA1dDEYMs32E7UDFf0PXbUIAOpiKHB1j/pLTW3dRvE7BJ4ErFpMhg== 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: Any place where pointer arithmetic is used to convert a virtual address into a physical one can raise errors if the virtual address is tagged. Reset the pointer's tag by sign extending the tag bits in macros that do pointer arithmetic in address conversions. There will be no change in compiled code with KASAN disabled since the compiler will optimize the __tag_reset() out. Signed-off-by: Maciej Wieczor-Retman --- arch/x86/include/asm/page.h | 17 +++++++++++++---- arch/x86/include/asm/page_64.h | 2 +- arch/x86/mm/physaddr.c | 1 + 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index 1b93ff80b43b..09c3914d8ce4 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h @@ -7,6 +7,7 @@ #ifdef __KERNEL__ #include +#include #ifdef CONFIG_X86_64 #include @@ -41,7 +42,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, #define __pa(x) __phys_addr((unsigned long)(x)) #endif -#define __pa_nodebug(x) __phys_addr_nodebug((unsigned long)(x)) +#define __pa_nodebug(x) __phys_addr_nodebug((unsigned long)(__tag_reset(x))) /* __pa_symbol should be used for C visible symbols. This seems to be the official gcc blessed way to do such arithmetic. */ /* @@ -65,9 +66,17 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, * virt_to_page(kaddr) returns a valid pointer if and only if * virt_addr_valid(kaddr) returns true. */ -#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) + +#ifdef CONFIG_KASAN_SW_TAGS +#define page_to_virt(x) ({ \ + __typeof__(x) __page = x; \ + void *__addr = __va(page_to_pfn((__typeof__(x))__tag_reset(__page)) << PAGE_SHIFT); \ + (void *)__tag_set((const void *)__addr, page_kasan_tag(__page)); \ +}) +#endif +#define virt_to_page(kaddr) pfn_to_page(__pa((void *)__tag_reset(kaddr)) >> PAGE_SHIFT) extern bool __virt_addr_valid(unsigned long kaddr); -#define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr)) +#define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long)(__tag_reset(kaddr))) static __always_inline void *pfn_to_kaddr(unsigned long pfn) { @@ -81,7 +90,7 @@ static __always_inline u64 __canonical_address(u64 vaddr, u8 vaddr_bits) static __always_inline u64 __is_canonical_address(u64 vaddr, u8 vaddr_bits) { - return __canonical_address(vaddr, vaddr_bits) == vaddr; + return __canonical_address(vaddr, vaddr_bits) == __tag_reset(vaddr); } #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index f3d257c45225..6e24aeff36eb 100644 --- a/arch/x86/include/asm/page_64.h +++ b/arch/x86/include/asm/page_64.h @@ -33,7 +33,7 @@ static __always_inline unsigned long __phys_addr_nodebug(unsigned long x) extern unsigned long __phys_addr(unsigned long); extern unsigned long __phys_addr_symbol(unsigned long); #else -#define __phys_addr(x) __phys_addr_nodebug(x) +#define __phys_addr(x) __phys_addr_nodebug(__tag_reset(x)) #define __phys_addr_symbol(x) \ ((unsigned long)(x) - __START_KERNEL_map + phys_base) #endif diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c index fc3f3d3e2ef2..7f2b11308245 100644 --- a/arch/x86/mm/physaddr.c +++ b/arch/x86/mm/physaddr.c @@ -14,6 +14,7 @@ #ifdef CONFIG_DEBUG_VIRTUAL unsigned long __phys_addr(unsigned long x) { + x = __tag_reset(x); unsigned long y = x - __START_KERNEL_map; /* use the carry flag to determine if x was < __START_KERNEL_map */