* [tip: x86/mm] x86/mm: Fix CR3_ADDR_MASK
@ 2022-12-17 18:55 tip-bot2 for Kirill A. Shutemov
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Kirill A. Shutemov @ 2022-12-17 18:55 UTC (permalink / raw)
To: linux-tip-commits
Cc: Kirill A. Shutemov, Dave Hansen, Rick Edgecombe,
Alexander Potapenko, Peter Zijlstra (Intel),
x86, linux-kernel
The following commit has been merged into the x86/mm branch of tip:
Commit-ID: 80d0969aa7832bfeb287cb22563a1ad08fea937d
Gitweb: https://git.kernel.org/tip/80d0969aa7832bfeb287cb22563a1ad08fea937d
Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate: Wed, 09 Nov 2022 19:51:25 +03:00
Committer: Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Thu, 15 Dec 2022 10:37:28 -08:00
x86/mm: Fix CR3_ADDR_MASK
The mask must not include bits above physical address mask. These bits
are reserved and can be used for other things. Bits 61 and 62 are used
for Linear Address Masking.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Alexander Potapenko <glider@google.com>
Link: https://lore.kernel.org/all/20221109165140.9137-2-kirill.shutemov%40linux.intel.com
---
arch/x86/include/asm/processor-flags.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h
index 02c2cbd..a7f3d91 100644
--- a/arch/x86/include/asm/processor-flags.h
+++ b/arch/x86/include/asm/processor-flags.h
@@ -35,7 +35,7 @@
*/
#ifdef CONFIG_X86_64
/* Mask off the address space ID and SME encryption bits. */
-#define CR3_ADDR_MASK __sme_clr(0x7FFFFFFFFFFFF000ull)
+#define CR3_ADDR_MASK __sme_clr(PHYSICAL_PAGE_MASK)
#define CR3_PCID_MASK 0xFFFull
#define CR3_NOFLUSH BIT_ULL(63)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/mm] x86/mm: Fix CR3_ADDR_MASK
@ 2022-11-11 21:58 tip-bot2 for Kirill A. Shutemov
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Kirill A. Shutemov @ 2022-11-11 21:58 UTC (permalink / raw)
To: linux-tip-commits
Cc: Kirill A. Shutemov, Dave Hansen, Rick Edgecombe,
Alexander Potapenko, Peter Zijlstra (Intel),
x86, linux-kernel
The following commit has been merged into the x86/mm branch of tip:
Commit-ID: 4cb94f188d3a0bc0c6e72c07ce2fe304611ebcf4
Gitweb: https://git.kernel.org/tip/4cb94f188d3a0bc0c6e72c07ce2fe304611ebcf4
Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
AuthorDate: Wed, 09 Nov 2022 19:51:25 +03:00
Committer: Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Fri, 11 Nov 2022 13:28:06 -08:00
x86/mm: Fix CR3_ADDR_MASK
The mask must not include bits above physical address mask. These bits
are reserved and can be used for other things. Bits 61 and 62 are used
for Linear Address Masking.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Alexander Potapenko <glider@google.com>
Link: https://lore.kernel.org/all/20221109165140.9137-2-kirill.shutemov%40linux.intel.com
---
arch/x86/include/asm/processor-flags.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h
index 02c2cbd..a7f3d91 100644
--- a/arch/x86/include/asm/processor-flags.h
+++ b/arch/x86/include/asm/processor-flags.h
@@ -35,7 +35,7 @@
*/
#ifdef CONFIG_X86_64
/* Mask off the address space ID and SME encryption bits. */
-#define CR3_ADDR_MASK __sme_clr(0x7FFFFFFFFFFFF000ull)
+#define CR3_ADDR_MASK __sme_clr(PHYSICAL_PAGE_MASK)
#define CR3_PCID_MASK 0xFFFull
#define CR3_NOFLUSH BIT_ULL(63)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-12-17 18:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-17 18:55 [tip: x86/mm] x86/mm: Fix CR3_ADDR_MASK tip-bot2 for Kirill A. Shutemov
-- strict thread matches above, loose matches on Subject: below --
2022-11-11 21:58 tip-bot2 for Kirill A. Shutemov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).