s390/cache: add cpu cache information to /proc/cpuinfo
Add a line for each cpu cache to /proc/cpuinfo. Since we only have information of private cpu caches in sysfs we add a line for each cpu cache in /proc/cpuinfo which will also contain information about shared caches. For a z196 machine /proc/cpuinfo now looks like: vendor_id : IBM/S390 bogomips per cpu: 14367.00 features : esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs cache0 : level=1 type=Data scope=Private size=64K line_size=256 associativity=4 cache1 : level=1 type=Instruction scope=Private size=128K line_size=256 associativity=8 cache2 : level=2 type=Unified scope=Private size=1536K line_size=256 associativity=12 cache3 : level=3 type=Unified scope=Shared size=24576K line_size=256 associativity=12 cache4 : level=4 type=Unified scope=Shared size=196608K line_size=256 associativity=24 processor 0: version = FF, identification = 000123, machine = 2817 processor 1: version = FF, identification = 100123, machine = 2817 processor 2: version = FF, identification = 200123, machine = 2817 processor 3: version = FF, identification = 200123, machine = 2817 Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
parent
d35339a42d
commit
6668022c7b
|
@ -140,6 +140,12 @@ struct task_struct;
|
||||||
struct mm_struct;
|
struct mm_struct;
|
||||||
struct seq_file;
|
struct seq_file;
|
||||||
|
|
||||||
|
#ifdef CONFIG_64BIT
|
||||||
|
extern void show_cacheinfo(struct seq_file *m);
|
||||||
|
#else
|
||||||
|
static inline void show_cacheinfo(struct seq_file *m) { }
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Free all resources held by a thread. */
|
/* Free all resources held by a thread. */
|
||||||
extern void release_thread(struct task_struct *);
|
extern void release_thread(struct task_struct *);
|
||||||
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
|
extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/notifier.h>
|
#include <linux/notifier.h>
|
||||||
|
#include <linux/seq_file.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
@ -17,8 +18,9 @@ struct cache {
|
||||||
unsigned int line_size;
|
unsigned int line_size;
|
||||||
unsigned int associativity;
|
unsigned int associativity;
|
||||||
unsigned int nr_sets;
|
unsigned int nr_sets;
|
||||||
int level;
|
unsigned int level : 3;
|
||||||
int type;
|
unsigned int type : 2;
|
||||||
|
unsigned int private : 1;
|
||||||
struct list_head list;
|
struct list_head list;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -83,6 +85,24 @@ static const char * const cache_type_string[] = {
|
||||||
static struct cache_dir *cache_dir_cpu[NR_CPUS];
|
static struct cache_dir *cache_dir_cpu[NR_CPUS];
|
||||||
static LIST_HEAD(cache_list);
|
static LIST_HEAD(cache_list);
|
||||||
|
|
||||||
|
void show_cacheinfo(struct seq_file *m)
|
||||||
|
{
|
||||||
|
struct cache *cache;
|
||||||
|
int index = 0;
|
||||||
|
|
||||||
|
list_for_each_entry(cache, &cache_list, list) {
|
||||||
|
seq_printf(m, "cache%-11d: ", index);
|
||||||
|
seq_printf(m, "level=%d ", cache->level);
|
||||||
|
seq_printf(m, "type=%s ", cache_type_string[cache->type]);
|
||||||
|
seq_printf(m, "scope=%s ", cache->private ? "Private" : "Shared");
|
||||||
|
seq_printf(m, "size=%luK ", cache->size >> 10);
|
||||||
|
seq_printf(m, "line_size=%u ", cache->line_size);
|
||||||
|
seq_printf(m, "associativity=%d", cache->associativity);
|
||||||
|
seq_puts(m, "\n");
|
||||||
|
index++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static inline unsigned long ecag(int ai, int li, int ti)
|
static inline unsigned long ecag(int ai, int li, int ti)
|
||||||
{
|
{
|
||||||
unsigned long cmd, val;
|
unsigned long cmd, val;
|
||||||
|
@ -93,7 +113,7 @@ static inline unsigned long ecag(int ai, int li, int ti)
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init cache_add(int level, int type)
|
static int __init cache_add(int level, int private, int type)
|
||||||
{
|
{
|
||||||
struct cache *cache;
|
struct cache *cache;
|
||||||
int ti;
|
int ti;
|
||||||
|
@ -107,8 +127,9 @@ static int __init cache_add(int level, int type)
|
||||||
cache->associativity = ecag(EXTRACT_ASSOCIATIVITY, level, ti);
|
cache->associativity = ecag(EXTRACT_ASSOCIATIVITY, level, ti);
|
||||||
cache->nr_sets = cache->size / cache->associativity;
|
cache->nr_sets = cache->size / cache->associativity;
|
||||||
cache->nr_sets /= cache->line_size;
|
cache->nr_sets /= cache->line_size;
|
||||||
|
cache->private = private;
|
||||||
cache->level = level + 1;
|
cache->level = level + 1;
|
||||||
cache->type = type;
|
cache->type = type - 1;
|
||||||
list_add_tail(&cache->list, &cache_list);
|
list_add_tail(&cache->list, &cache_list);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -117,23 +138,26 @@ static void __init cache_build_info(void)
|
||||||
{
|
{
|
||||||
struct cache *cache, *next;
|
struct cache *cache, *next;
|
||||||
union cache_topology ct;
|
union cache_topology ct;
|
||||||
int level, rc;
|
int level, private, rc;
|
||||||
|
|
||||||
ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0);
|
ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0);
|
||||||
for (level = 0; level < CACHE_MAX_LEVEL; level++) {
|
for (level = 0; level < CACHE_MAX_LEVEL; level++) {
|
||||||
switch (ct.ci[level].scope) {
|
switch (ct.ci[level].scope) {
|
||||||
case CACHE_SCOPE_NOTEXISTS:
|
case CACHE_SCOPE_NOTEXISTS:
|
||||||
case CACHE_SCOPE_RESERVED:
|
case CACHE_SCOPE_RESERVED:
|
||||||
case CACHE_SCOPE_SHARED:
|
|
||||||
return;
|
return;
|
||||||
|
case CACHE_SCOPE_SHARED:
|
||||||
|
private = 0;
|
||||||
|
break;
|
||||||
case CACHE_SCOPE_PRIVATE:
|
case CACHE_SCOPE_PRIVATE:
|
||||||
|
private = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (ct.ci[level].type == CACHE_TYPE_SEPARATE) {
|
if (ct.ci[level].type == CACHE_TYPE_SEPARATE) {
|
||||||
rc = cache_add(level, CACHE_TYPE_DATA);
|
rc = cache_add(level, private, CACHE_TYPE_DATA);
|
||||||
rc |= cache_add(level, CACHE_TYPE_INSTRUCTION);
|
rc |= cache_add(level, private, CACHE_TYPE_INSTRUCTION);
|
||||||
} else {
|
} else {
|
||||||
rc = cache_add(level, ct.ci[level].type);
|
rc = cache_add(level, private, ct.ci[level].type);
|
||||||
}
|
}
|
||||||
if (rc)
|
if (rc)
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -208,7 +232,7 @@ DEFINE_CACHE_ATTR(size, "%luK\n", index->cache->size >> 10);
|
||||||
DEFINE_CACHE_ATTR(coherency_line_size, "%u\n", index->cache->line_size);
|
DEFINE_CACHE_ATTR(coherency_line_size, "%u\n", index->cache->line_size);
|
||||||
DEFINE_CACHE_ATTR(number_of_sets, "%u\n", index->cache->nr_sets);
|
DEFINE_CACHE_ATTR(number_of_sets, "%u\n", index->cache->nr_sets);
|
||||||
DEFINE_CACHE_ATTR(ways_of_associativity, "%u\n", index->cache->associativity);
|
DEFINE_CACHE_ATTR(ways_of_associativity, "%u\n", index->cache->associativity);
|
||||||
DEFINE_CACHE_ATTR(type, "%s\n", cache_type_string[index->cache->type - 1]);
|
DEFINE_CACHE_ATTR(type, "%s\n", cache_type_string[index->cache->type]);
|
||||||
DEFINE_CACHE_ATTR(level, "%d\n", index->cache->level);
|
DEFINE_CACHE_ATTR(level, "%d\n", index->cache->level);
|
||||||
|
|
||||||
static ssize_t shared_cpu_map_func(struct kobject *kobj, int type, char *buf)
|
static ssize_t shared_cpu_map_func(struct kobject *kobj, int type, char *buf)
|
||||||
|
@ -298,6 +322,8 @@ static int __cpuinit cache_add_cpu(int cpu)
|
||||||
if (!cache_dir)
|
if (!cache_dir)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
list_for_each_entry(cache, &cache_list, list) {
|
list_for_each_entry(cache, &cache_list, list) {
|
||||||
|
if (!cache->private)
|
||||||
|
break;
|
||||||
rc = cache_create_index_dir(cache_dir, cache, index, cpu);
|
rc = cache_create_index_dir(cache_dir, cache, index, cpu);
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
return rc;
|
||||||
|
|
|
@ -58,6 +58,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
|
||||||
if (hwcap_str[i] && (elf_hwcap & (1UL << i)))
|
if (hwcap_str[i] && (elf_hwcap & (1UL << i)))
|
||||||
seq_printf(m, "%s ", hwcap_str[i]);
|
seq_printf(m, "%s ", hwcap_str[i]);
|
||||||
seq_puts(m, "\n");
|
seq_puts(m, "\n");
|
||||||
|
show_cacheinfo(m);
|
||||||
}
|
}
|
||||||
get_online_cpus();
|
get_online_cpus();
|
||||||
if (cpu_online(n)) {
|
if (cpu_online(n)) {
|
||||||
|
|
Loading…
Reference in New Issue