Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77bb36e5 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/cacheinfo: add missing facility check 



Git commit d97d929f ("s390: move cacheinfo sysfs to generic cacheinfo
infrastructure") removed the general-instructions-extension availability
check before the ecag instruction is executed.
Without this check this may lead to crashes on machines without this facility.
Therefore add the check again where needed.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1a327ffd

arch/s390/kernel/cache.c

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ void show_cacheinfo(struct seq_file *m) 
	struct cacheinfo *cache;

	int idx;



	if (!test_facility(34))

		return;

	get_online_cpus();

	this_cpu_ci = get_cpu_cacheinfo(cpumask_any(cpu_online_mask));

	for (idx = 0; idx < this_cpu_ci->num_leaves; idx++) {
@@ -159,6 +161,8 @@ int populate_cache_leaves(unsigned int cpu) 
	union cache_topology ct;

	enum cache_type ctype;



	if (!test_facility(34))

		return -EOPNOTSUPP;

	ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0);

	for (idx = 0, level = 0; level < this_cpu_ci->num_levels &&

	     idx < this_cpu_ci->num_leaves; idx++, level++) {