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

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

Pull xen updates from Juergen Gross:

 - A bunch of minor cleanups

 - A fix for kexec in Xen dom0 when executed on a high cpu number

 - A fix for resuming after suspend of a Xen guest with assigned PCI
   devices

 - A fix for a crash due to not disabled preemption when resuming as Xen
   dom0

* tag 'for-linus-5.18-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: fix is_xen_pmu()
  xen: don't hang when resuming PCI device
  arch:x86:xen: Remove unnecessary assignment in xen_apic_read()
  xen/grant-table: remove readonly parameter from functions
  xen/grant-table: remove gnttab_*transfer*() functions
  drivers/xen: use helper macro __ATTR_RW
  x86/xen: Fix kerneldoc warning
  xen: delay xen_hvm_init_time_ops() if kdump is boot on vcpu>=32
  xen: use time_is_before_eq_jiffies() instead of open coding it
parents 72030621 de2ae403

arch/x86/xen/apic.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static u32 xen_apic_read(u32 reg) 
		.interface_version = XENPF_INTERFACE_VERSION,

		.u.pcpu_info.xen_cpuid = 0,

	};

	int ret = 0;

	int ret;



	/* Shouldn't need this as APIC is turned off for PV, and we only

	 * get called on the bootup processor. But just in case. */

arch/x86/xen/pmu.c

+4 −6
Original line number Diff line number Diff line
@@ -506,10 +506,7 @@ irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id) 
	return ret;

}



bool is_xen_pmu(int cpu)

{

	return (get_xenpmu_data() != NULL);

}

bool is_xen_pmu;



void xen_pmu_init(int cpu)

{
@@ -520,7 +517,7 @@ void xen_pmu_init(int cpu) 


	BUILD_BUG_ON(sizeof(struct xen_pmu_data) > PAGE_SIZE);



	if (xen_hvm_domain())

	if (xen_hvm_domain() || (cpu != 0 && !is_xen_pmu))

		return;



	xenpmu_data = (struct xen_pmu_data *)get_zeroed_page(GFP_KERNEL);
@@ -541,7 +538,8 @@ void xen_pmu_init(int cpu) 
	per_cpu(xenpmu_shared, cpu).xenpmu_data = xenpmu_data;

	per_cpu(xenpmu_shared, cpu).flags = 0;



	if (cpu == 0) {

	if (!is_xen_pmu) {

		is_xen_pmu = true;

		perf_register_guest_info_callbacks(&xen_guest_cbs);

		xen_pmu_arch_init();

	}

arch/x86/xen/pmu.h

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


#include <xen/interface/xenpmu.h>



extern bool is_xen_pmu;



irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id);

#ifdef CONFIG_XEN_HAVE_VPMU

void xen_pmu_init(int cpu);
@@ -12,7 +14,6 @@ void xen_pmu_finish(int cpu); 
static inline void xen_pmu_init(int cpu) {}

static inline void xen_pmu_finish(int cpu) {}

#endif

bool is_xen_pmu(int cpu);

bool pmu_msr_read(unsigned int msr, uint64_t *val, int *err);

bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err);

int pmu_apic_update(uint32_t reg);

arch/x86/xen/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static void __init xen_reserve_xen_mfnlist(void) 
}



/**

 * machine_specific_memory_setup - Hook for machine specific memory setup.

 * xen_memory_setup - Hook for machine specific memory setup.

 **/

char * __init xen_memory_setup(void)

{

arch/x86/xen/smp_hvm.c

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ static void __init xen_hvm_smp_prepare_boot_cpu(void) 
	 */

	xen_vcpu_setup(0);



	/*

	 * Called again in case the kernel boots on vcpu >= MAX_VIRT_CPUS.

	 * Refer to comments in xen_hvm_init_time_ops().

	 */

	xen_hvm_init_time_ops();



	/*

	 * The alternative logic (which patches the unlock/lock) runs before

	 * the smp bootup up code is activated. Hence we need to set this up