From patchwork Fri Apr 4 13:14:09 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: 14038450 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 F27BFC36010 for ; Fri, 4 Apr 2025 13:16:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F063428000B; Fri, 4 Apr 2025 09:16:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EB68D280004; Fri, 4 Apr 2025 09:16:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2F4728000B; Fri, 4 Apr 2025 09:16:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B4ABD280004 for ; Fri, 4 Apr 2025 09:16:04 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id EEF55A84D9 for ; Fri, 4 Apr 2025 13:16:05 +0000 (UTC) X-FDA: 83296409490.01.0C3DAFA Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by imf21.hostedemail.com (Postfix) with ESMTP id C241E1C0019 for ; Fri, 4 Apr 2025 13:16:03 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=DKVGvWxT; spf=pass (imf21.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 198.175.65.11 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=1743772564; 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=BzPu5bL1P82hpoNCxPuVzaAFLr4FB1kFlHIDeW2Ujs8=; b=Rgb0dHFCylrMZJTjATOnVf/xrijMeR7xiTssUbfRE3Z8nPQk4/NxYEdKKDySN64D5AU7wf cDi6Fwf241UrMQ38D3R6BvPtAbzPcy2cgHZEW+EZnqm3aZ3JbvgX0cbmTmw/ly7WUz0jzU UyNlxYkAZbsK2yx3ZIzn2DzqLMxaenw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=DKVGvWxT; spf=pass (imf21.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 198.175.65.11 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=1743772564; a=rsa-sha256; cv=none; b=l/aV7TCVfQZOkzwGF2vEr3BF/3v/0eCoZ9PIWB1JXnIXazZ7t2Rex3xdifj8jsZwURxSuk PvPAzP5kOPhKtZGjRKuonH2lCPY1sF6rY+bwSzvPaAvvRXBbmus+gTki8uW4QEfALIAsNY F4wchXfC8CmgRdpPGM8Chay3qcHQn+I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743772564; x=1775308564; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ikWUalPb1GKrXc7zL0s3gnRneZOpXlSFYbJqx1DBgFU=; b=DKVGvWxTLrNus89J3kKj2YWU8qc/hWr2mw6yADf8EbBbdd/zrM0LJHt+ bY9L2f9MvuiXh3iLlAxSOY14LYIzW5lniuGj6kiUoG86KO5tFxLTnL5cN qoutTJP7mpJCJz7aE19esgEmXRnN9M39MknZO1Y2pJ6W5d0ZUxVXRB4KC PpBeRW1ytsm+15VNn8cb3MHCG7Nixb+3kXOUNalSjiqy1WrKqc4VpBkmK s1Kz2naRjwJwcbdazflddIqVnxeda3imthTXlBGbCAvAYnmn4M8E5UygY 9f4MuTIKri9VUdJPg2sflDdsXLxRd6R8p8fxtKMuDHhQ7kkSqmaK1eyl0 Q==; X-CSE-ConnectionGUID: WmLqjwiKTd6YrK8ntyvMbQ== X-CSE-MsgGUID: b9qJm0erT2uH9dpvdwYc3g== X-IronPort-AV: E=McAfee;i="6700,10204,11394"; a="55401741" X-IronPort-AV: E=Sophos;i="6.15,188,1739865600"; d="scan'208";a="55401741" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2025 06:16:03 -0700 X-CSE-ConnectionGUID: /v4yemxXRNCf9yxykbmk+A== X-CSE-MsgGUID: DvwOzQD2QMSbRSno4tJp0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,188,1739865600"; d="scan'208";a="128157141" Received: from opintica-mobl1 (HELO wieczorr-mobl1.intel.com) ([10.245.245.50]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2025 06:15:47 -0700 From: Maciej Wieczor-Retman To: hpa@zytor.com, hch@infradead.org, nick.desaulniers+lkml@gmail.com, kuan-ying.lee@canonical.com, masahiroy@kernel.org, samuel.holland@sifive.com, mingo@redhat.com, corbet@lwn.net, ryabinin.a.a@gmail.com, guoweikang.kernel@gmail.com, jpoimboe@kernel.org, ardb@kernel.org, vincenzo.frascino@arm.com, glider@google.com, kirill.shutemov@linux.intel.com, apopple@nvidia.com, samitolvanen@google.com, maciej.wieczor-retman@intel.com, kaleshsingh@google.com, jgross@suse.com, andreyknvl@gmail.com, scott@os.amperecomputing.com, tony.luck@intel.com, dvyukov@google.com, pasha.tatashin@soleen.com, ziy@nvidia.com, broonie@kernel.org, gatlin.newhouse@gmail.com, jackmanb@google.com, wangkefeng.wang@huawei.com, thiago.bauermann@linaro.org, tglx@linutronix.de, kees@kernel.org, akpm@linux-foundation.org, jason.andryuk@amd.com, snovitoll@gmail.com, xin@zytor.com, jan.kiszka@siemens.com, bp@alien8.de, rppt@kernel.org, peterz@infradead.org, pankaj.gupta@amd.com, thuth@redhat.com, andriy.shevchenko@linux.intel.com, joel.granados@kernel.org, kbingham@kernel.org, nicolas@fjasle.eu, mark.rutland@arm.com, surenb@google.com, catalin.marinas@arm.com, morbo@google.com, justinstitt@google.com, ubizjak@gmail.com, jhubbard@nvidia.com, urezki@gmail.com, dave.hansen@linux.intel.com, bhe@redhat.com, luto@kernel.org, baohua@kernel.org, nathan@kernel.org, will@kernel.org, brgerst@gmail.com Cc: llvm@lists.linux.dev, linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, x86@kernel.org Subject: [PATCH v3 05/14] x86: Reset tag for virtual to physical address conversions Date: Fri, 4 Apr 2025 15:14:09 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: C241E1C0019 X-Stat-Signature: s5bpqt8bog3myh4mrgop97jjw8eyom1a X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1743772563-527260 X-HE-Meta: U2FsdGVkX1/Mm8j+Bf7+Ro3TCESYAkzqE5HXhlVjcPjHe92r4aDeL1wvZIFO6IMK1s5aolKBytcs7BYdzfd/8riwIzo3GxDdU8KLnBQkoB3UGYhjcx3kETt9QYuD6xat903GspZptEExoWbmSJEgzVb3TejxSGll4VgvQKudwGASoRmDmGKECX5cbHL8K5d2Eyqe/pD7fUu3ynA45O9sysSDWUKOTC8vcvd67WPZvbz2wCMhx2oP9pnZsgae98h3RCY0NDjQyN5LE/lyUl9BciVtSmqIyhdBGaRgSpfUxL1UQd6F9kULPmWtp45sH2fY2qoXS82AF4J+IOwdvVxF9WcCXS4TgteG8jNFQEdyymncwQmvRTfFMAt4VUPgQ1XYNb0CgzoWu0Om0uAZr/xdEeF2DNDpqMVn2Zdbp8w1utB4yjRrNnTltwLb7H2hZYf9BAIBPwciGArN0byucQY6rWH+FsdmwZWnFoMt6/sPZpyvpY8xIJEx3yS1cIxMv3J+2KdBv1KVV6yZFLBCFijuBvfdm6lyvrem2f6Z/6G0TOMdCsLo/C4S5FvCaF2y51z1YovI7KZ09MX7Q60sB/z1u7om5UbsNCiQCYvfKEBN88G79vYgmVOaFXeeWq+363ukTEElYJxpW3SBcfqyZwpVp5t0URordTjbarCCXH9DLL32+oCxilUuMfyJbrDlmFUMqa/ndoQn6zwl+RG0BSmrbMzywzzpuJWFSNjoKor68fsGZShL2RiMRcrjqyyrVx62HH6MHKJY0A5sZXWTNuCaaRZ021q/jUqHEdWBHpRG4UeX67AJ13jRdFEVgwWw4sAmxtNnBEeIUKRbwENiq6V47pKjvfNhe1x6CK2qDh9L5xLuSnEtbhfOS9F1gwA30vfqzGehUVJ+00kRMRLTj2h9RUyr6n6wkm3ZVZTvLQlu4etJS3MIPZkVSd5KB2cxB1RFf4x63moCI/d9zeZLx2V tD/Wm+If TI93EtliT3nNG7IsZPNyqlQdUqyRf+6v7O6BOsWDf0QSpBU8eaFzB7e04CHIFvSLbtZoYQkOY2wWkBOdB8pPM5SKNuUZiVHIF3ps9pMY7JxYP9vsi8n5CDVnIBPg1AMYkJKywD0vy3g9zsNQUCR4NV7UNncQP0WzL1sWzCWyqDgVaTz2dUH9Vuq4uUoF3C3/s8th3oQ521XxZ8zvz+OTqPwdgGkAubkq4Ti9HuAwRJJ4aaYGJXtZzKSv3pZcxsTbuhcwj 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 9265f2fca99a..e37f63b50728 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 /* __ASSEMBLER__ */ diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index d3aab6f4e59a..44975a8ae665 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 */