diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2015-02-09 12:54:16 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-02-10 10:15:57 +0100 |
| commit | 45cce4ccafe3cddc924ef5221d22b9853fc9a13c (patch) | |
| tree | 3afaaeec8ecc47be92aa209b715c84522ff9c1f5 /arch/s390/kernel/cache.c | |
| parent | s390/zcrypt: fixed domain scanning problem (again) (diff) | |
| download | linux-45cce4ccafe3cddc924ef5221d22b9853fc9a13c.tar.xz linux-45cce4ccafe3cddc924ef5221d22b9853fc9a13c.zip | |
s390/cacheinfo: don't use smp_processor_id() in preemptible context
show_cacheinfo() needs to access the cacheinfo structure of any online
cpu. This was done with using smp_processor_id() as in index while in
preemtible context.
This means the cpu could be offline and the data be gone when it would
be accessed.
Better use any online cpu address and protect the data by get_online_cpus()
and put_online_cpus().
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/cache.c')
| -rw-r--r-- | arch/s390/kernel/cache.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c index fe21f074cf9f..632fa06ea162 100644 --- a/arch/s390/kernel/cache.c +++ b/arch/s390/kernel/cache.c @@ -66,10 +66,12 @@ static const enum cache_type cache_type_map[] = { void show_cacheinfo(struct seq_file *m) { - int cpu = smp_processor_id(), idx; - struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); + struct cpu_cacheinfo *this_cpu_ci; struct cacheinfo *cache; + int idx; + get_online_cpus(); + this_cpu_ci = get_cpu_cacheinfo(cpumask_any(cpu_online_mask)); for (idx = 0; idx < this_cpu_ci->num_leaves; idx++) { cache = this_cpu_ci->info_list + idx; seq_printf(m, "cache%-11d: ", idx); @@ -82,6 +84,7 @@ void show_cacheinfo(struct seq_file *m) seq_printf(m, "associativity=%d", cache->ways_of_associativity); seq_puts(m, "\n"); } + put_online_cpus(); } static inline enum cache_type get_cache_type(struct cache_info *ci, int level) |