From patchwork Tue Feb 18 08:15:23 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: 13979242 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 5F30FC021A9 for ; Tue, 18 Feb 2025 08:18:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8B752800F5; Tue, 18 Feb 2025 03:18:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E3A802800EC; Tue, 18 Feb 2025 03:18:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CB3F32800F5; Tue, 18 Feb 2025 03:18:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AE7CE2800EC for ; Tue, 18 Feb 2025 03:18:31 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 35F2BC09C8 for ; Tue, 18 Feb 2025 08:18:31 +0000 (UTC) X-FDA: 83132363622.11.1AD3A10 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by imf11.hostedemail.com (Postfix) with ESMTP id 088024000F for ; Tue, 18 Feb 2025 08:18:28 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ElNiv4SK; spf=pass (imf11.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=1739866709; 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=IkiSs8Mx0ftzr0bNH0MOKgRQ603f42VR6P8kP2Y60Y8=; b=oeCFYm2rwbAwrSX5NwNCKOiU7vRO7YxBAl/UFMqNJFtseWKmBxcPPofR4fMOnwfELO78Lv F+3bChIWJGQLBHhgozoyVXQFss/W+mP/M9Stcr/02miQqgxQ6S7S3tGJNipozOTvfbFAxr 7zbgqkNpABNzmHFm/Rg/1E61a7fsFrQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739866709; a=rsa-sha256; cv=none; b=RFoFDUDV+nEUdjs+X374VucymI4boUnPiTe99Hs3OPhmxj2aV+A5GIZvZlJb92BIjdEQwg CWKET/At4n3rRlLJHoxKVou1kwE1QHz25THiQrF8ls7CtKCTHYfjbUuoZBeg4GJ3+CzXNf ZQwAszoBjreUX7+NUR7fmf29XOuhE0A= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=ElNiv4SK; spf=pass (imf11.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=1739866709; x=1771402709; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Nv/ltyViEdDWF68nXs2iXcAPsfBSVXeu+MHh0fs1GJ4=; b=ElNiv4SKhLU7p9aOdJ5jvo6r6qIMUP8VVjytEDztWt7GXveEwTpvLGzm 6p5RdpzkRFQQQnht5GYW4FB7VTw6uII+ykEOBUjSlQom971+Ow06bJ/H7 jvbSVXh81NW7FCiKGJZ4SWGztpRXa+WX4mVxrkRMk4VLgJJ36WIyqoxJP Slus1z7xaPjqxtr3QcBLLbvOfDcXud2ppUuUChJh6B2KqeuX2EkXj6UPW 8yyt4eFeqslvdUMTG09YDb56Zm+3wQtgeLfXGMyt5kII2in214UQRAcrC 3+aOc5HcQ2cUPTTC8ePBwDsHpccrL/6KNFvLlIUsnu2PiAd2/m/o5CwTp A==; X-CSE-ConnectionGUID: 3YqMccG2SxC9qSZd0gQ5BQ== X-CSE-MsgGUID: Rm8il2txQx+2AVLI1Mg/Sg== X-IronPort-AV: E=McAfee;i="6700,10204,11348"; a="28150277" X-IronPort-AV: E=Sophos;i="6.13,295,1732608000"; d="scan'208";a="28150277" 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:27 -0800 X-CSE-ConnectionGUID: 5z9vRN7wSMWUvwtxJjGh6g== X-CSE-MsgGUID: Z/kyhOw/QdSF0c+xdlivEw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="119247683" 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:18:10 -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 07/14] x86: Reset tag for virtual to physical address conversions Date: Tue, 18 Feb 2025 09:15:23 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 088024000F X-Rspamd-Server: rspam07 X-Stat-Signature: hib8s3zoc44ommrz8ys6brcwp7g68s81 X-HE-Tag: 1739866708-297551 X-HE-Meta: U2FsdGVkX1+o20Fxa6TVOXHixKHKQf4BeblfGHbFE+G3TUCNIUnhqEyQzzEVGOyfcrKTGvJ0gCTSlW0vwa+bRXmpiKQK6bjsri8Ef8oGp4MWWDahWnFZW1AoMAPgRC113EmWI86cafuDcok/ZsFw5GsSrzgM+yTz2SOYizwJfXtwYZ9GXcJeGAMJJp23Vz4LP7p4lwMkRZ7W1/0nFhjrzRlkU+8s8c2dM5FFmCafg6f5V3tHvamULX6iLbaYoRRwgQ7CmGngIm7YMNh0k0mOJszx2LYeOF344GAZZaMpoBD38ibSVynMzTL0kr2fejf6mouCOQyRQPT6fgBH4O3vHyUF6AunfbCQ7INkvGLCm2DG+s4A1XdiboecBPh/8lGgsAapscgf0lRrI4+c8lRNIIP0eh2Xj1L6/jtR8ko1/MkX3yB8E+OoszpXXwx8f4ekL7y6RGvyEM+94AeCw4XmCAk7zpuMVKyGlknw18XKgQzEiZaHZmi7vd01hhDyFnkizzTzUu9v43a41nU5SGHX3U/dJsCdbRsL2NMg19wOp8t6AcHHTN23FWfr8NIUiBFjf6pUw9zOrM24NchfR4ULLQvj23yrmI+PZwsyqV/f6KvAgbBoZH2QYzA5vyinmUXYVZUGxqz7eMsE8FP1BlBe2qWDXVPQzkzFAUH62WsQW4pU+HNeEcWrvoNLhSUv7SA4MOk2eNdN4+6L42KMlh5uyrDy/ApkClwiq3keVX8kuvddCMpfpF+LE2loxb3mzvaeP9CXHNox0yYnmPb4qbSpb3ar5qG8ol4s7y3vPZsQrEoeo2nWK5OPKq49gMo2AxfQs/lfr7OHR9C0JzftSCjZD+XTgeb4+1VRJ5IYTlKubkte88NeFrLRChuH8Ok/Q0iQHipFMoKgOOFZT7T7uhQ6Mog1bCp4UGuaCb4l5rnrYLNsFhV5EM9j72MGuLIgk4ZKpJwGIBe8x83dydug3DH QyiPNCrb yIWKN31tq7Bwp1Y8Za5+Aw7KcGdC/mMD5jptwVP4omcQZ4WbdYQtenYYKeJfbWwhdGZKeOIjHYQ/j7ztXLkjnz2V17GVYc6Aq3rGvVNv+G2gT4Lp73i7+UsHIdBwVFjBVbNpA+2lFJzLNnEp0urCVRWT3a+G7Lx5eJCF73/+kemt/HkwT3+19uAMAket4yMnjaLce8Wvq4BPvfxVT2OIXJwcaMnckmFfPj1Pia6WmKbF/EyNypyInFw0AJZiFRMeRy0t8vLJ74jxyydg6bOjYRmTxLo5UvbgltQzlAUDEDg7t12pzUCOrntOFPI9XVg6sTLtjzW9eKEMDdxOYCN6KkD9H9FSwOf+EwLM5G17HuZPw+wt6IgF66MD5qL3nYP1d94ljDQoPlGFgy8k75ImmPx1MK4by1VHhsos+nVyLXmrmt2Nd5dKLaLkryjpMUP1gvP3yndevMLycL2QaDcT14IQLQA== 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 c9fe207916f4..fdafeb06c195 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 d63576608ce7..54990ea82f74 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 */