From nobody Sun Dec 14 17:54:44 2025 Received: from mail-07.mail-europe.com (mail-0701.mail-europe.com [51.83.17.38]) (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 16799327219 for ; Wed, 10 Dec 2025 17:30:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=51.83.17.38 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765387804; cv=none; b=OZix/jNBhAq05JpaPdB1z/KmhH6QMOq8XNr8T7oPkIcHm5j6Az4sC78MZt4+LzyDihWsSNUEjm5SEoj0xATHtcpDTMyXBBO8NqsI7UN7MMYmo3qcOyQRda7dfo40aaezwBduPe17ljjDJ25JuFwGotVnZPJ51givadiIREw+Ap8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765387804; c=relaxed/simple; bh=gvUa1176eKZ4v7OZs0Fzg0JdmM+FZNuNE6etRDnNF6U=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=N+MF/wFf99p+n8j3Rjrhpr2E5nrqNEGmlvYTypt01f1wdXk3TDuZrFrd+6dng4uBSPtnythK9ztvo61bm8NDeIbRtW8dxt0sY8wpG9aQ0+qano/FsPQ5g3C5O3JN+FiUBGqoSpL08Sj7uLUXsNZunpjgMYp+rvRKLGpzI0Z5kXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me; spf=fail smtp.mailfrom=pm.me; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b=N+ufnWcO; arc=none smtp.client-ip=51.83.17.38 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=pm.me Authentication-Results: smtp.subspace.kernel.org; spf=fail 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="N+ufnWcO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1765387793; x=1765646993; bh=1QI8O92VtcxKJXXMBmUWFQrJdTexY9lSWgo4BYwXQn4=; 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=N+ufnWcOvcETtFhh/a+DqRBdi4SPGViSEjinDZ2MlR14ozy7yX9+JdYh7KUfkeBXO 2/qQiqkNJvAJj7KDzhL1prTgcNALk8Dymleiz8Iz3SiTkly0c5wpoBQ6tvCdjTDAH0 Dq23CPFLJBH8OoLQ4dBT3jtpG6JtBb1oBAgxTIEhRNy/Itw94MWX7yTtUdrHaJHJw8 XqgvRsDgKM2Hz8EciBRldsVIabsaFZTO3L7V29CJrnRjDuYUoE8QVtEz4nGikeV/Wn oBsGFL2J/2rbr/EfujaihmJtOXvkL+yHQSVysV85U1oxCW0o+FtJdbYwi23RpJCH5d TNcc1uXzSI39w== Date: Wed, 10 Dec 2025 17:29:47 +0000 To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" From: Maciej Wieczor-Retman Cc: m.wieczorretman@pm.me, Maciej Wieczor-Retman , Alexander Potapenko , linux-kernel@vger.kernel.org Subject: [PATCH v7 09/15] x86/mm: LAM compatible non-canonical definition Message-ID: In-Reply-To: References: Feedback-ID: 164464600:user:proton X-Pm-Message-ID: 5b288fd6084b701c9b92f8d0ee47cb2634bffa7a 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 For an address to be canonical it has to have its top bits equal to each other. The number of bits depends on the paging level and whether they're supposed to be ones or zeroes depends on whether the address points to kernel or user space. With Linear Address Masking (LAM) enabled, the definition of linear address canonicality is modified. Not all of the previously required bits need to be equal, only the first and last from the previously equal bitmask. So for example a 5-level paging kernel address needs to have bits [63] and [56] set. Change the canonical checking function to use bit masks instead of bit shifts. Signed-off-by: Maciej Wieczor-Retman Acked-by: Alexander Potapenko --- Changelog v7: - Add Alexander's acked-by tag. - Add parentheses around vaddr_bits as suggested by checkpatch. - Apply the bitmasks to the __canonical_address() function which is used in kvm code. Changelog v6: - Use bitmasks to check both kernel and userspace addresses in the __is_canonical_address() (Dave Hansen and Samuel Holland). Changelog v4: - Add patch to the series. arch/x86/include/asm/page.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index bcf5cad3da36..b7940fa49e64 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h @@ -82,9 +82,22 @@ static __always_inline void *pfn_to_kaddr(unsigned long = pfn) return __va(pfn << PAGE_SHIFT); } =20 +#ifdef CONFIG_KASAN_SW_TAGS +#define CANONICAL_MASK(vaddr_bits) (BIT_ULL(63) | BIT_ULL((vaddr_bits) - 1= )) +#else +#define CANONICAL_MASK(vaddr_bits) GENMASK_ULL(63, vaddr_bits) +#endif + +/* + * To make an address canonical either set or clear the bits defined by the + * CANONICAL_MASK(). Clear the bits for userspace addresses if the top add= ress + * bit is a zero. Set the bits for kernel addresses if the top address bit= is a + * one. + */ static __always_inline u64 __canonical_address(u64 vaddr, u8 vaddr_bits) { - return ((s64)vaddr << (64 - vaddr_bits)) >> (64 - vaddr_bits); + return (vaddr & BIT_ULL(63)) ? vaddr | CANONICAL_MASK(vaddr_bits) : + vaddr & ~CANONICAL_MASK(vaddr_bits); } =20 static __always_inline u64 __is_canonical_address(u64 vaddr, u8 vaddr_bits) --=20 2.52.0