From nobody Sun Apr 5 04:08:29 2026 Received: from mail-10631.protonmail.ch (mail-10631.protonmail.ch [79.135.106.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E0AC639DBF7 for ; Tue, 10 Mar 2026 17:54:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.31 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165257; cv=none; b=sjSbKzPNsfkP0NqmZLjOBMQ7ST6vsI9u3qdKSQTuDy6B+5Vch6Aj+hbf87MDSmGarZFMQmIbqweVq6wkfTxr4wDljCGkvbuIkFjXHh+FU9ZctMwNTY77W987L7Y2pdn8ZJ3ku1pmBqoD/7g+BhhB/yfuaYX6D1ccCod9qdfTOkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773165257; c=relaxed/simple; bh=SvJ6a6fq/dRY4+jKRj20knTvDJMidqc6MDB53Daeuhc=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Aa+6MgnmqjZ6nfmzlMWifBhCVXATJbvGRJAWCG/4LRcsVGwBq9pdK546cEfkaVE73ldS89DRwbkkqm6bmaapFvrxhCdSJzMRq4NOqM1qvRMYMMzDMXD7A+WKMnJrE0wakq9N/9lK6gjk0e9NDW+Jb4Kx9WuTPHcshas8RJFhofo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=pass smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=I3sUpFOI; arc=none smtp.client-ip=79.135.106.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pm.me Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="I3sUpFOI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1773165253; x=1773424453; bh=xYzT9pUJ33fciEEYHLErzOjZWjIu4mssUSjNvzdqw84=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=I3sUpFOIrb0QB5EzsPsVdPlNOpVbfpHLEIFJQeylmc0o9iLyg5d30OqYqf74C9PEt RxuA3WzuNAsFr9ULBmNwM/R6q310ubpG5zMPLnSj8NrahepZxdw9FFYzh8zrDewQik Q+C99HzEX98wp3AL5hhD5rDIhZk9HpP0T3YASmLQ4jR4m7lhEPy5rvBV99WZHTb6Ap LQb0JdgMolcKL7naA7a8LT3bnoSH6+T/ea4fC83VoDovOCHQmt3is2Q4jssmokQ/XV VYE1OSvIOG1j2JVFfqGlypQEZkNX39kCtNRTrCb6+LvwUXH13MrQ8zkE8ZfYM6zqvM r7E5fhO3jM/lA== Date: Tue, 10 Mar 2026 17:54:09 +0000 To: akpm@linux-foundation.org, Catalin Marinas , Will Deacon , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org Subject: [PATCH v11 06/15] kasan: arm64: x86: Make page_to_virt() KASAN aware Message-ID: In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: a95af21cc490f13be9b2b1108f966a54feb03d3d Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Maciej Wieczor-Retman Special page_to_virt() implementation is needed if an architecture wants to enable KASAN software tag-based mode. Make page_to_virt() KASAN aware in arch-independent code so architectures implementing the software tag-based mode don't have to define their own implementations anymore. When KASAN is disabled or for architectures that don't implement the software tag-based mode page_to_virt() will be optimized to it's previous form. Signed-off-by: Maciej Wieczor-Retman --- Changelog v11: - Redo the patch to work on the page_to_virt macro. Split off changes about virt to phys conversion to an earlier patch. - Remove Alexander's acked-by due to bigger changes. Changelog v7: - Add Alexander's Acked-by tag. Changelog v5: - Move __tag_reset() calls into __phys_addr_nodebug() and __virt_addr_valid() instead of calling it on the arguments of higher level functions. Changelog v4: - Simplify page_to_virt() by removing pointless casts. - Remove change in __is_canonical_address() because it's taken care of in a later patch due to a LAM compatible definition of canonical. arch/arm64/include/asm/memory.h | 5 ----- include/linux/kasan.h | 10 ++++++++++ include/linux/mm.h | 5 ++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memor= y.h index 875c0bd0d85a..39dd0071d3ec 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -411,11 +411,6 @@ static inline unsigned long virt_to_pfn(const void *ka= ddr) */ =20 #if defined(CONFIG_DEBUG_VIRTUAL) -#define page_to_virt(x) ({ \ - __typeof__(x) __page =3D x; \ - void *__addr =3D __va(page_to_phys(__page)); \ - (void *)__tag_set((const void *)__addr, page_kasan_tag(__page));\ -}) #define virt_to_page(x) pfn_to_page(virt_to_pfn(x)) #else #define page_to_virt(x) ({ \ diff --git a/include/linux/kasan.h b/include/linux/kasan.h index c6febd1362e8..58cf02af4fa5 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -527,6 +527,11 @@ static inline void *kasan_reset_tag(const void *addr) return (void *)arch_kasan_reset_tag(addr); } =20 +static inline void *kasan_set_tag(const void *addr, u8 tag) +{ + return (void *)arch_kasan_set_tag(addr, tag); +} + /** * kasan_report - print a report about a bad memory access detected by KAS= AN * @addr: address of the bad access @@ -544,6 +549,11 @@ static inline void *kasan_reset_tag(const void *addr) return (void *)addr; } =20 +static inline void *kasan_set_tag(const void *addr, u8 tag) +{ + return (void *)addr; +} + #endif /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS*/ =20 #ifdef CONFIG_KASAN_HW_TAGS diff --git a/include/linux/mm.h b/include/linux/mm.h index b2245b1a25d8..044425db766e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -117,7 +117,10 @@ extern int mmap_rnd_compat_bits __read_mostly; #endif =20 #ifndef page_to_virt -#define page_to_virt(x) __va(PFN_PHYS(page_to_pfn(x))) +#define page_to_virt(x) ({ \ + void *__addr =3D __va(PFN_PHYS(page_to_pfn((struct page *)x))); \ + kasan_set_tag(__addr, page_kasan_tag(x)); \ +}) #endif =20 #ifndef lm_alias --=20 2.53.0