Commit c17f1224 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.11-rc1a-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:
 "Two fixes for issues introduced in this merge window:

   - fix enhanced debugging in the Xen multicall handling

   - two patches fixing a boot failure when running as dom0 in PVH mode"

* tag 'for-linus-6.11-rc1a-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: fix memblock_reserve() usage on PVH
  x86/xen: move xen_reserve_extra_memory()
  xen: fix multicall debug data referencing
parents 3a7e02c0 4c006734

arch/x86/include/asm/xen/hypervisor.h

+0 −5
Original line number Diff line number Diff line
@@ -62,11 +62,6 @@ void xen_arch_unregister_cpu(int num); 
#ifdef CONFIG_PVH

void __init xen_pvh_init(struct boot_params *boot_params);

void __init mem_map_via_hcall(struct boot_params *boot_params_p);

#ifdef CONFIG_XEN_PVH

void __init xen_reserve_extra_memory(struct boot_params *bootp);

#else

static inline void xen_reserve_extra_memory(struct boot_params *bootp) { }

#endif

#endif



/* Lazy mode for batching updates / context switch */

arch/x86/platform/pvh/enlighten.c

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ static void __init init_pvh_bootparams(bool xen_guest) 
	} else

		xen_raw_printk("Warning: Can fit ISA range into e820\n");



	if (xen_guest)

		xen_reserve_extra_memory(&pvh_bootparams);



	pvh_bootparams.hdr.cmd_line_ptr =

		pvh_start_info.cmdline_paddr;

arch/x86/xen/enlighten_pvh.c

+58 −49
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/io_apic.h>

#include <asm/hypervisor.h>

#include <asm/e820/api.h>

#include <asm/setup.h>



#include <xen/xen.h>

#include <asm/xen/interface.h>
@@ -27,54 +28,6 @@ 
bool __ro_after_init xen_pvh;

EXPORT_SYMBOL_GPL(xen_pvh);



void __init xen_pvh_init(struct boot_params *boot_params)

{

	u32 msr;

	u64 pfn;



	xen_pvh = 1;

	xen_domain_type = XEN_HVM_DOMAIN;

	xen_start_flags = pvh_start_info.flags;



	msr = cpuid_ebx(xen_cpuid_base() + 2);

	pfn = __pa(hypercall_page);

	wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));



	if (xen_initial_domain())

		x86_init.oem.arch_setup = xen_add_preferred_consoles;

	x86_init.oem.banner = xen_banner;



	xen_efi_init(boot_params);



	if (xen_initial_domain()) {

		struct xen_platform_op op = {

			.cmd = XENPF_get_dom0_console,

		};

		int ret = HYPERVISOR_platform_op(&op);



		if (ret > 0)

			xen_init_vga(&op.u.dom0_console,

				     min(ret * sizeof(char),

					 sizeof(op.u.dom0_console)),

				     &boot_params->screen_info);

	}

}



void __init mem_map_via_hcall(struct boot_params *boot_params_p)

{

	struct xen_memory_map memmap;

	int rc;



	memmap.nr_entries = ARRAY_SIZE(boot_params_p->e820_table);

	set_xen_guest_handle(memmap.buffer, boot_params_p->e820_table);

	rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);

	if (rc) {

		xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);

		BUG();

	}

	boot_params_p->e820_entries = memmap.nr_entries;

}



/*

 * Reserve e820 UNUSABLE regions to inflate the memory balloon.

 *
@@ -89,8 +42,9 @@ void __init mem_map_via_hcall(struct boot_params *boot_params_p) 
 * hypervisor should notify us which memory ranges are suitable for creating

 * foreign mappings, but that's not yet implemented.

 */

void __init xen_reserve_extra_memory(struct boot_params *bootp)

static void __init pvh_reserve_extra_memory(void)

{

	struct boot_params *bootp = &boot_params;

	unsigned int i, ram_pages = 0, extra_pages;



	for (i = 0; i < bootp->e820_entries; i++) {
@@ -141,3 +95,58 @@ void __init xen_reserve_extra_memory(struct boot_params *bootp) 
		xen_add_extra_mem(PFN_UP(e->addr), pages);

	}

}



static void __init pvh_arch_setup(void)

{

	pvh_reserve_extra_memory();



	if (xen_initial_domain())

		xen_add_preferred_consoles();

}



void __init xen_pvh_init(struct boot_params *boot_params)

{

	u32 msr;

	u64 pfn;



	xen_pvh = 1;

	xen_domain_type = XEN_HVM_DOMAIN;

	xen_start_flags = pvh_start_info.flags;



	msr = cpuid_ebx(xen_cpuid_base() + 2);

	pfn = __pa(hypercall_page);

	wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));



	x86_init.oem.arch_setup = pvh_arch_setup;

	x86_init.oem.banner = xen_banner;



	xen_efi_init(boot_params);



	if (xen_initial_domain()) {

		struct xen_platform_op op = {

			.cmd = XENPF_get_dom0_console,

		};

		int ret = HYPERVISOR_platform_op(&op);



		if (ret > 0)

			xen_init_vga(&op.u.dom0_console,

				     min(ret * sizeof(char),

					 sizeof(op.u.dom0_console)),

				     &boot_params->screen_info);

	}

}



void __init mem_map_via_hcall(struct boot_params *boot_params_p)

{

	struct xen_memory_map memmap;

	int rc;



	memmap.nr_entries = ARRAY_SIZE(boot_params_p->e820_table);

	set_xen_guest_handle(memmap.buffer, boot_params_p->e820_table);

	rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);

	if (rc) {

		xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);

		BUG();

	}

	boot_params_p->e820_entries = memmap.nr_entries;

}

arch/x86/xen/multicalls.c

+12 −7
Original line number Diff line number Diff line
@@ -54,8 +54,9 @@ struct mc_debug_data { 


static DEFINE_PER_CPU(struct mc_buffer, mc_buffer);

static struct mc_debug_data mc_debug_data_early __initdata;

static struct mc_debug_data __percpu *mc_debug_data __refdata =

static DEFINE_PER_CPU(struct mc_debug_data *, mc_debug_data) =

	&mc_debug_data_early;

static struct mc_debug_data __percpu *mc_debug_data_ptr;

DEFINE_PER_CPU(unsigned long, xen_mc_irq_flags);



static struct static_key mc_debug __ro_after_init;
@@ -70,16 +71,20 @@ static int __init xen_parse_mc_debug(char *arg) 
}

early_param("xen_mc_debug", xen_parse_mc_debug);



void mc_percpu_init(unsigned int cpu)

{

	per_cpu(mc_debug_data, cpu) = per_cpu_ptr(mc_debug_data_ptr, cpu);

}



static int __init mc_debug_enable(void)

{

	struct mc_debug_data __percpu *mcdb;

	unsigned long flags;



	if (!mc_debug_enabled)

		return 0;



	mcdb = alloc_percpu(struct mc_debug_data);

	if (!mcdb) {

	mc_debug_data_ptr = alloc_percpu(struct mc_debug_data);

	if (!mc_debug_data_ptr) {

		pr_err("xen_mc_debug inactive\n");

		static_key_slow_dec(&mc_debug);

		return -ENOMEM;
@@ -88,7 +93,7 @@ static int __init mc_debug_enable(void) 
	/* Be careful when switching to percpu debug data. */

	local_irq_save(flags);

	xen_mc_flush();

	mc_debug_data = mcdb;

	mc_percpu_init(0);

	local_irq_restore(flags);



	pr_info("xen_mc_debug active\n");
@@ -150,7 +155,7 @@ void xen_mc_flush(void) 
	trace_xen_mc_flush(b->mcidx, b->argidx, b->cbidx);



	if (static_key_false(&mc_debug)) {

		mcdb = this_cpu_ptr(mc_debug_data);

		mcdb = __this_cpu_read(mc_debug_data);

		memcpy(mcdb->entries, b->entries,

		       b->mcidx * sizeof(struct multicall_entry));

	}
@@ -230,7 +235,7 @@ struct multicall_space __xen_mc_entry(size_t args) 


	ret.mc = &b->entries[b->mcidx];

	if (static_key_false(&mc_debug)) {

		struct mc_debug_data *mcdb = this_cpu_ptr(mc_debug_data);

		struct mc_debug_data *mcdb = __this_cpu_read(mc_debug_data);



		mcdb->caller[b->mcidx] = __builtin_return_address(0);

		mcdb->argsz[b->mcidx] = args;

arch/x86/xen/smp_pv.c

+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ static int xen_pv_kick_ap(unsigned int cpu, struct task_struct *idle) 
		return rc;



	xen_pmu_init(cpu);

	mc_percpu_init(cpu);



	/*

	 * Why is this a BUG? If the hypercall fails then everything can be