Skip to contentSkip to conversation

x86/cpu: Avoid endless loop to get the number of cache leaves

PATCH In review Pu Wen 2 participants 4 messages Nov 5, 2018 – Dec 8, 2018 x86

lore
Share & tools
lore

Pu Wen

author
#0 lore raw

PATCH 1/1 x86/cpu: Avoid endless loop to get the number of cache leaves

To get the number of cache leaves on AMD or Hygon platform, it should get the value of cpuid leaf 0x8000001d. But on certain broken platform such as a not fullly implemented virtual platform(Xen, for example), the value of the cpuid leaf will nerver be CTYPE_NULL, so the kernel will run into an endless loop.

To fix this problem, add a new enum type CTYPE_MAX to limit the maximum cpuid accessing.

---
 arch/x86/kernel/cpu/cacheinfo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/cacheinfo.c +3 -2
index dc1b934..7bd167f 100644
@@ -121,7 +121,8 @@ enum _cache_type {
 	CTYPE_NULL = 0,
 	CTYPE_DATA = 1,
 	CTYPE_INST = 2,
-	CTYPE_UNIFIED = 3
+	CTYPE_UNIFIED = 3,
+	CTYPE_MAX = 4
 };
 
 union _cpuid4_leaf_eax {
@@ -640,7 +641,7 @@ static int find_num_cache_leaves(struct cpuinfo_x86 *c)
 		/* Do cpuid(op) loop to find out num_cache_leaves */
 		cpuid_count(op, i, &eax, &ebx, &ecx, &edx);
 		cache_eax.full = eax;
-	} while (cache_eax.split.type != CTYPE_NULL);
+	} while (cache_eax.split.type != CTYPE_NULL && i != CTYPE_MAX);
 	return i;
 }
 
Signature · 1 line
2.7.4
maintainer
#1 lore raw
Quoted 29 lines · Pu Wen

To get the number of cache leaves on AMD or Hygon platform, it should get the value of cpuid leaf 0x8000001d. But on certain broken platform such as a not fullly implemented virtual platform(Xen, for example), the value of the cpuid leaf will nerver be CTYPE_NULL, so the kernel will run into an endless loop.

To fix this problem, add a new enum type CTYPE_MAX to limit the maximum cpuid accessing.

---
 arch/x86/kernel/cpu/cacheinfo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/cacheinfo.c +2 -1
index dc1b934..7bd167f 100644
@@ -121,7 +121,8 @@ enum _cache_type {
 	CTYPE_NULL = 0,
 	CTYPE_DATA = 1,
 	CTYPE_INST = 2,
-	CTYPE_UNIFIED = 3
+	CTYPE_UNIFIED = 3,
+	CTYPE_MAX = 4
 };
 
 union _cpuid4_leaf_eax {

arch/x86/kernel/cpu/cacheinfo.c static int find_num_cache_leaves(struct cpuinfo_x86 *c) · line 644

Quoted 5 lines
arch/x86/kernel/cpu/cacheinfo.c +1 -1
@@ -640,7 +641,7 @@ static int find_num_cache_leaves(struct cpuinfo_x86 *c)
 		/* Do cpuid(op) loop to find out num_cache_leaves */
 		cpuid_count(op, i, &eax, &ebx, &ecx, &edx);
 		cache_eax.full = eax;
-	} while (cache_eax.split.type != CTYPE_NULL);
+	} while (cache_eax.split.type != CTYPE_NULL && i != CTYPE_MAX);

i is an int and CTYPE_MAX is enum _cache_type. Huh?

This works by chance because CTYPE_MAX is 4 and the termination CPUID leaf is the 4th too.

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.
author
#2 lore raw

Sorry for the late reply :)

Quoted 7 lines · Borislav Petkov

arch/x86/kernel/cpu/cacheinfo.c static int find_num_cache_leaves(struct cpuinfo_x86 *c) · line 644

Quoted 6 lines
arch/x86/kernel/cpu/cacheinfo.c +1 -1
@@ -640,7 +641,7 @@ static int find_num_cache_leaves(struct cpuinfo_x86 *c)
  		/* Do cpuid(op) loop to find out num_cache_leaves */
  		cpuid_count(op, i, &eax, &ebx, &ecx, &edx);
  		cache_eax.full = eax;
-	} while (cache_eax.split.type != CTYPE_NULL);
+	} while (cache_eax.split.type != CTYPE_NULL && i != CTYPE_MAX);

i is an int and CTYPE_MAX is enum _cache_type. Huh?

How about define CTYPE_MAX like this:
#define CTYPE_MAX 4

Quoted 2 lines

This works by chance because CTYPE_MAX is 4 and the termination CPUID leaf is the 4th too.

It will return CTYPE_NULL when accessing the 4th CPUID leaf in most of the cases, but in certain case it will not. So I think it's better to restrict the maximum CPUID access times to 4 for kernel robustness.

Signature · 2 lines
Regards,
Pu Wen
maintainer
#3 lore raw
Quoted 2 lines · Pu Wen

How about define CTYPE_MAX like this:
#define CTYPE_MAX 4

How about you look at the definition of CPUID leaf 4 and think about it a bit and realize that this is the wrong thing to do?

Quoted 2 lines

It will return CTYPE_NULL when accessing the 4th CPUID leaf in most of the cases, but in certain case it will not.

Well, that's certain cases' problem, isn't it? How about fixing xen instead?

Signature · 4 lines
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.