[RFC,72/73] x86/pvm: Use RDTSCP as default in vdso_read_cpunode()

Commit Message

Lai Jiangshan Feb. 26, 2024, 2:36 p.m. UTC

From: Hou Wenlong <[e-mail]>

The CPUNODE description of the guest cannot be installed into the host's
GDT, as this index is also used for the host to retrieve the current CPU
in paranoid entry. As a result, LSL in vdso_read_cpunode() does not work
correctly for the PVM guest. To address this issue, use RDTSCP as the
default in vdso_read_cpunode(), as it is supported by the hypervisor.

Suggested-by: Lai Jiangshan <[e-mail]>
Signed-off-by: Hou Wenlong <[e-mail]>
Signed-off-by: Lai Jiangshan <[e-mail]>
---
 arch/x86/include/asm/alternative.h | 14 ++++++++++++++
 arch/x86/include/asm/segment.h     | 14 ++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

Patch

diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index cf4b236b47a3..caebb49c5d61 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -299,6 +299,20 @@  static inline int alternatives_text_reserved(void *start, void *end)
 	asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags)	\
 		: output : "i" (0), ## input)
 
+/*
+ * This is similar to alternative_io. But it has two features and
+ * respective instructions.
+ *
+ * If CPU has feature2, newinstr2 is used.
+ * Otherwise, if CPU has feature1, newinstr1 is used.
+ * Otherwise, oldinstr is used.
+ */
+#define alternative_io_2(oldinstr, newinstr1, ft_flags1, newinstr2,	     \
+			 ft_flags2, output, input...)			     \
+	asm_inline volatile (ALTERNATIVE_2(oldinstr, newinstr1, ft_flags1,   \
+		newinstr2, ft_flags2)					     \
+		: output : "i" (0), ## input)
+
 /* Like alternative_io, but for replacing a direct call with another one. */
 #define alternative_call(oldfunc, newfunc, ft_flags, output, input...)	\
 	asm_inline volatile (ALTERNATIVE("call %P[old]", "call %P[new]", ft_flags) \
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
index 9d6411c65920..555966922e8f 100644
--- a/arch/x86/include/asm/segment.h
+++ b/arch/x86/include/asm/segment.h
@@ -253,11 +253,17 @@  static inline void vdso_read_cpunode(unsigned *cpu, unsigned *node)
 	 * hoisting it out of the calling function.
 	 *
 	 * If RDPID is available, use it.
+	 *
+	 * If it is PVM guest and RDPID is not available, use RDTSCP.
 	 */
-	alternative_io ("lsl %[seg],%[p]",
-			".byte 0xf3,0x0f,0xc7,0xf8", /* RDPID %eax/rax */
-			X86_FEATURE_RDPID,
-			[p] "=a" (p), [seg] "r" (__CPUNODE_SEG));
+	alternative_io_2("lsl %[seg],%[p]",
+			 ".byte 0x0f,0x01,0xf9\n\t" /* RDTSCP %eax:%edx, %ecx */
+			 "mov %%ecx,%%eax\n\t",
+			 X86_FEATURE_KVM_PVM_GUEST,
+			 ".byte 0xf3,0x0f,0xc7,0xf8", /* RDPID %eax/rax */
+			 X86_FEATURE_RDPID,
+			 [p] "=a" (p), [seg] "r" (__CPUNODE_SEG)
+			 : "cx", "dx");
 
 	if (cpu)
 		*cpu = (p & VDSO_CPUNODE_MASK);