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

Commit 63e708f8 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Juergen Gross
Browse files

x86/xen: Calculate __max_logical_packages on PV domains 



The kernel panics on PV domains because native_smp_cpus_done() is
only called for HVM domains.

Calculate __max_logical_packages for PV domains.

Fixes: b4c0a732 ("x86/smpboot: Fix __max_logical_packages estimate")
Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Tested-and-reported-by: default avatarSimon Gaiser <simon@invisiblethingslab.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Dou Liyang <douly.fnst@cn.fujitsu.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: xen-devel@lists.xenproject.org
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 29fee6ee

arch/x86/include/asm/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask) 
void cpu_disable_common(void);

void native_smp_prepare_boot_cpu(void);

void native_smp_prepare_cpus(unsigned int max_cpus);

void calculate_max_logical_packages(void);

void native_smp_cpus_done(unsigned int max_cpus);

void common_cpu_up(unsigned int cpunum, struct task_struct *tidle);

int native_cpu_up(unsigned int cpunum, struct task_struct *tidle);

arch/x86/kernel/smpboot.c

+8 −2
Original line number Diff line number Diff line
@@ -1281,11 +1281,10 @@ void __init native_smp_prepare_boot_cpu(void) 
	cpu_set_state_online(me);

}



void __init native_smp_cpus_done(unsigned int max_cpus)

void __init calculate_max_logical_packages(void)

{

	int ncpus;



	pr_debug("Boot done\n");

	/*

	 * Today neither Intel nor AMD support heterogenous systems so

	 * extrapolate the boot cpu's data to all packages.
@@ -1293,6 +1292,13 @@ void __init native_smp_cpus_done(unsigned int max_cpus) 
	ncpus = cpu_data(0).booted_cores * topology_max_smt_threads();

	__max_logical_packages = DIV_ROUND_UP(nr_cpu_ids, ncpus);

	pr_info("Max logical packages: %u\n", __max_logical_packages);

}



void __init native_smp_cpus_done(unsigned int max_cpus)

{

	pr_debug("Boot done\n");



	calculate_max_logical_packages();



	if (x86_has_numa_in_package)

		set_sched_topology(x86_numa_in_package_topology);

arch/x86/xen/smp.c

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ void __init xen_smp_cpus_done(unsigned int max_cpus) 


	if (xen_hvm_domain())

		native_smp_cpus_done(max_cpus);

	else

		calculate_max_logical_packages();



	if (xen_have_vcpu_info_placement)

		return;