From: Babu Moger <Babu.Moger@xxxxxxx>
SVM reserved bits tests hangs in a infinite loop. The test uses the
instruction 'rdtsc' to generate the random reserved bits. It hangs
while generating the valid reserved bits.
The AMD64 Architecture Programmers Manual Volume 2: System
Programming manual says, When using the TSC to measure elapsed time,
programmers must be aware that for some implementations, the rate at
which the TSC is incremented varies based on the processor power
management state (Pstate). For other implementations, the TSC
increment rate is fixed and is not subject to power-management
related changes in processor frequency.
In AMD gen3 machine, the rdtsc value is a P state multiplier.
Here are the rdtsc value in 10 sucessive reads.
0 rdtsc = 0x1ec92919b9710
1 rdtsc = 0x1ec92919c01f0
2 rdtsc = 0x1ec92919c0f70
3 rdtsc = 0x1ec92919c18d0
4 rdtsc = 0x1ec92919c2060
5 rdtsc = 0x1ec92919c28d0
6 rdtsc = 0x1ec92919c30b0
7 rdtsc = 0x1ec92919c5660
8 rdtsc = 0x1ec92919c6150
9 rdtsc = 0x1ec92919c7c80
This test uses the lower nibble and right shifts to generate the
valid reserved bit. It loops forever because the lower nibble is always
zero.
Fixing the issue with replacing rdrand instruction if available or
skipping the test if we cannot generate the valid reserved bits.
Signed-off-by: Babu Moger <Babu.Moger@xxxxxxx>
---
lib/x86/processor.h | 10 ++++++++++
x86/svm_tests.c | 25 +++++++++++++++++++------
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/lib/x86/processor.h b/lib/x86/processor.h
index a08ea1f..974077a 100644
--- a/lib/x86/processor.h
+++ b/lib/x86/processor.h
@@ -531,6 +531,16 @@ static inline void sti(void)
asm volatile ("sti");
}
+static inline unsigned long long rdrand(void)
+{
+ long long r;
+
+ asm volatile("1:;\n\
+ rdrand %0;\n\
+ jnc 1b;\n":"=r"(r));
+ return r;
+}
+
static inline unsigned long long rdtsc(void)
{
long long r;
diff --git a/x86/svm_tests.c b/x86/svm_tests.c
index 79ed48e..a2963c0 100644
--- a/x86/svm_tests.c
+++ b/x86/svm_tests.c
@@ -2704,11 +2704,23 @@ static void _svm_npt_rsvd_bits_test(u64 *pxe, u64 pxe_rsvd_bits, u64 efer,
static u64 get_random_bits(u64 hi, u64 low)
{
- u64 rsvd_bits;
+ unsigned retry = 5;
+ u64 rsvd_bits = 0;
+
+ if (this_cpu_has(X86_FEATURE_RDRAND)) {
+ do {
+ rsvd_bits = (rdrand() << low) & GENMASK_ULL(hi, low);
+ retry--;
+ } while (!rsvd_bits && retry);
+ }
- do {
- rsvd_bits = (rdtsc() << low) & GENMASK_ULL(hi, low);
- } while (!rsvd_bits);
+ if (!rsvd_bits) {
+ retry = 5;
+ do {
+ rsvd_bits = (rdtsc() << low) & GENMASK_ULL(hi, low);
+ retry--;
+ } while (!rsvd_bits && retry);
+ }
return rsvd_bits;
}
@@ -2733,10 +2745,11 @@ static void svm_npt_rsvd_bits_test(void)
/*
* 4k PTEs don't have reserved bits if MAXPHYADDR >= 52, just skip the
- * sub-test. The NX test is still valid, but the extra bit of coverage
+ * sub-test. Also skip if cannot generate the valid random reserved bits.
+ * The NX test is still valid, but the extra bit of coverage
* isn't worth the extra complexity.
*/
- if (cpuid_maxphyaddr() >= 52)
+ if ((cpuid_maxphyaddr() >= 52) || !get_random_bits(51, cpuid_maxphyaddr()))
goto skip_pte_test;
_svm_npt_rsvd_bits_test(npt_get_pte((u64)basic_guest_main),
