From nobody Thu Apr 2 01:51:07 2026 Received: from mail-106118.protonmail.ch (mail-106118.protonmail.ch [79.135.106.118]) (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 7DACA1A8F97 for ; Mon, 30 Mar 2026 14:33:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=79.135.106.118 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774881238; cv=none; b=t6wL7GNJmYTvdVQ/ihsysjmEK9W9yDWRQl9TQrbFXcX9ENUblbI+P/g3n5EqBW6A7WFJcCeeXQFrLi4yQsc6NkYT7lLS7FxEJ4GfRNtkaAVFQYF9LlUK99OJ1jUKjDPyCzAzSkjHEYqfAnapHqHbd37KuUD4D5LwVsQs1qs2LaM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774881238; c=relaxed/simple; bh=cNMMLMCSwknhzs1FrpAU10vAGQQE2QvtRAyRJd5vpdQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DtGljHzfhkfiyYSM57GJ7ke0nbdrlL6be848Q57XUvqTShSFfgXIDmJaJ+CvTIRfvTdV8HGCrnF4K7nAHlsQPQtvMOsGdfGieJVf+ou3Bdd1XCZ2TUQ/AuOGeWKb0L0Ug2nDGmzYck3PEdUiSX6mNLfDzVnTE0o77bddCeC3h08= 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=YCCLybHY; arc=none smtp.client-ip=79.135.106.118 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="YCCLybHY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1774881229; x=1775140429; bh=qKJp2zmpSOHrWvXWXvVfm1wRsYfpExx2ugXRE4WLUFU=; 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=YCCLybHYi2wR2wkPVJqxMiQnlVDCKaRSAc2GM2k4yVvHs2+q/xLGEQmy1ci96SVPe ksL1M18aqk3T+U81SeRfTAWcLdzwSjTjKzqLtI5QiW11A2y/FbKAgTDTFezGKbYoAs lAy3jSe2vY/cAgrClSZfcuKZoRSF7SKoG67G4XwdHpD0urxhJXKPrz3bPaiOnXM/Ui px6s72vg+QThjq6CrchL4qKa25I74kOJnsRR3TnWFM0ryokXew0zZb8q7bsoodgWSt di67Knp/aRc8Pf3yWTXpGD6Nd1f62Xm3hy/yNYNx8I4T65ECLLumqOMlhrURNFi03W R0Nvo9JsEbLdA== Date: Mon, 30 Mar 2026 14:33:43 +0000 To: Catalin Marinas , Will Deacon , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Andrew Morton , 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 v12 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: b6d1646a2fe7b6e96ef4cb8b05ca936c4900195d 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 e18908f3ad6e..271c59e9f422 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 09044934dda8..f234650a4edf 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