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

s390/sysinfo,topology: fix cpu topology maximum nesting detection 



The maximum nesting of the cpu topology is evaluated when /proc/sysinfo
is the first time read. This happens without a lock and a concurrent
reader on a different cpu can see and use an invalid intermediate value.
Besides the fact that this race is quite unlikely the worst thing that
could happen is that /proc/sysinfo would contain bogus information about
the machine's cpu topology.
Nevertheless this should be fixed. So move the detection code to the
early machine detection code and since now the value is early available
use it in the topology code as well.

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

arch/s390/include/asm/sysinfo.h

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ struct sysinfo_3_2_2 { 
	char reserved_544[3552];

};



extern int topology_max_mnest;



#define TOPOLOGY_CPU_BITS	64

#define TOPOLOGY_NR_MAG		6

arch/s390/kernel/early.c

+22 −5
Original line number Diff line number Diff line
@@ -215,26 +215,44 @@ static noinline __init void init_kernel_storage_key(void) 
				     PAGE_DEFAULT_KEY, 0);

}



static __initdata struct sysinfo_3_2_2 vmms __aligned(PAGE_SIZE);

static __initdata char sysinfo_page[PAGE_SIZE] __aligned(PAGE_SIZE);



static noinline __init void detect_machine_type(void)

{

	struct sysinfo_3_2_2 *vmms = (struct sysinfo_3_2_2 *)&sysinfo_page;



	/* Check current-configuration-level */

	if ((stsi(NULL, 0, 0, 0) >> 28) <= 2) {

		S390_lowcore.machine_flags |= MACHINE_FLAG_LPAR;

		return;

	}

	/* Get virtual-machine cpu information. */

	if (stsi(&vmms, 3, 2, 2) == -ENOSYS || !vmms.count)

	if (stsi(vmms, 3, 2, 2) == -ENOSYS || !vmms->count)

		return;



	/* Running under KVM? If not we assume z/VM */

	if (!memcmp(vmms.vm[0].cpi, "\xd2\xe5\xd4", 3))

	if (!memcmp(vmms->vm[0].cpi, "\xd2\xe5\xd4", 3))

		S390_lowcore.machine_flags |= MACHINE_FLAG_KVM;

	else

		S390_lowcore.machine_flags |= MACHINE_FLAG_VM;

}



static __init void setup_topology(void)

{

#ifdef CONFIG_64BIT

	int max_mnest;



	if (!test_facility(11))

		return;

	S390_lowcore.machine_flags |= MACHINE_FLAG_TOPOLOGY;

	for (max_mnest = 6; max_mnest > 1; max_mnest--) {

		if (stsi(&sysinfo_page, 15, 1, max_mnest) != -ENOSYS)

			break;

	}

	topology_max_mnest = max_mnest;

#endif

}



static void early_pgm_check_handler(void)

{

	unsigned long addr;
@@ -364,8 +382,6 @@ static __init void detect_machine_facilities(void) 
		S390_lowcore.machine_flags |= MACHINE_FLAG_IDTE;

	if (test_facility(8))

		S390_lowcore.machine_flags |= MACHINE_FLAG_PFMF;

	if (test_facility(11))

		S390_lowcore.machine_flags |= MACHINE_FLAG_TOPOLOGY;

	if (test_facility(27))

		S390_lowcore.machine_flags |= MACHINE_FLAG_MVCOS;

	if (test_facility(40))
@@ -467,6 +483,7 @@ void __init startup_init(void) 
	detect_diag44();

	detect_machine_facilities();

	setup_hpage();

	setup_topology();

	sclp_facilities_detect();

	detect_memory_layout(memory_chunk);

#ifdef CONFIG_DYNAMIC_FTRACE

arch/s390/kernel/sysinfo.c

+3 −9
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <math-emu/soft-fp.h>

#include <math-emu/single.h>



int topology_max_mnest;



static inline int stsi_0(void)

{

	int rc = stsi(NULL, 0, 0, 0);
@@ -95,15 +97,7 @@ static void stsi_15_1_x(struct seq_file *m, struct sysinfo_15_1_x *info) 
	seq_putc(m, '\n');

	if (!MACHINE_HAS_TOPOLOGY)

		return;

	if (max_mnest) {

		stsi(info, 15, 1, max_mnest);

	} else {

		for (max_mnest = 6; max_mnest > 1; max_mnest--) {

			rc = stsi(info, 15, 1, max_mnest);

			if (rc != -ENOSYS)

				break;

		}

	}

	stsi(info, 15, 1, topology_max_mnest);

	seq_printf(m, "CPU Topology HW:     ");

	for (i = 0; i < TOPOLOGY_NR_MAG; i++)

		seq_printf(m, " %d", info->mag[i]);

arch/s390/kernel/topology.c

+4 −6
Original line number Diff line number Diff line
@@ -251,11 +251,9 @@ static void update_cpu_core_map(void) 


void store_topology(struct sysinfo_15_1_x *info)

{

	int rc;



	rc = stsi(info, 15, 1, 3);

	if (rc != -ENOSYS)

		return;

	if (topology_max_mnest >= 3)

		stsi(info, 15, 1, 3);

	else

		stsi(info, 15, 1, 2);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE