Add /proc/litmus/cluster_cache

- read L2, L3 clustering from proc file (default L2)
- check for "feasible cluster size"

2 files changed, 11 insertions, 3 deletions

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 4e60b624d121..e75daac64962 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -172,7 +172,7 @@ extern void print_cpu_info(struct cpuinfo_x86 *);
 extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);
 extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
 extern unsigned short num_cache_leaves;
-extern void get_shared_cpu_map(cpumask_var_t mask,
+extern int get_shared_cpu_map(cpumask_var_t mask,
                                unsigned int cpu, int index);
 
 extern void detect_extended_topology(struct cpuinfo_x86 *c);
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index ffdc69c05e4c..ea348f24c23b 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -516,13 +516,21 @@ static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);
 #define CPUID4_INFO_IDX(x, y)   (&((per_cpu(cpuid4_info, x))[y]))
 
 /* returns CPUs that share the index cache with cpu */
-void get_shared_cpu_map(cpumask_var_t mask, unsigned int cpu, int index)
+int get_shared_cpu_map(cpumask_var_t mask, unsigned int cpu, int index)
 {
+        int ret = 0;
         struct _cpuid4_info *this_leaf;
 
+        printk(KERN_INFO "idx = %d, max = %d\n", index, num_cache_leaves);
+        if (index >= num_cache_leaves) {
+                index = num_cache_leaves - 1;
+                ret = index;
+        }
+
         this_leaf = CPUID4_INFO_IDX(cpu,index);
         cpumask_copy(mask, to_cpumask(this_leaf->shared_cpu_map));
-        return;
+
+        return ret;
 }
 
 #ifdef CONFIG_SMP