Commit 88a174a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.6a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fixes from Juergen Gross:

 - remove some unused functions in the Xen event channel handling

 - fix a regression (introduced during the merge window) when booting as
   Xen PV guest

 - small cleanup removing another strncpy() instance

* tag 'for-linus-6.6a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/efi: refactor deprecated strncpy
  x86/xen: allow nesting of same lazy mode
  x86/xen: move paravirt lazy code
  arm/xen: remove lazy mode related definitions
  xen: simplify evtchn_do_upcall() call maze
parents fb8b1b93 0fc6ff5a

arch/arm/xen/enlighten.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static void xen_power_off(void) 


static irqreturn_t xen_arm_callback(int irq, void *arg)

{

	xen_hvm_evtchn_do_upcall();

	xen_evtchn_do_upcall();

	return IRQ_HANDLED;

}

arch/x86/entry/common.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static void __xen_pv_evtchn_do_upcall(struct pt_regs *regs) 


	inc_irq_stat(irq_hv_callback_count);



	xen_hvm_evtchn_do_upcall();

	xen_evtchn_do_upcall();



	set_irq_regs(old_regs);

}

arch/x86/include/asm/paravirt_types.h

+0 −15
Original line number Diff line number Diff line
@@ -9,13 +9,6 @@ struct paravirt_patch_site { 
	u8 type;		/* type of this instruction */

	u8 len;			/* length of original instruction */

};



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

enum paravirt_lazy_mode {

	PARAVIRT_LAZY_NONE,

	PARAVIRT_LAZY_MMU,

	PARAVIRT_LAZY_CPU,

};

#endif



#ifdef CONFIG_PARAVIRT
@@ -549,14 +542,6 @@ int paravirt_disable_iospace(void); 
	__PVOP_VCALL(op, PVOP_CALL_ARG1(arg1), PVOP_CALL_ARG2(arg2),	\

		     PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4))



enum paravirt_lazy_mode paravirt_get_lazy_mode(void);

void paravirt_start_context_switch(struct task_struct *prev);

void paravirt_end_context_switch(struct task_struct *next);



void paravirt_enter_lazy_mmu(void);

void paravirt_leave_lazy_mmu(void);

void paravirt_flush_lazy_mmu(void);



void _paravirt_nop(void);

void paravirt_BUG(void);

unsigned long paravirt_ret0(void);

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

+37 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
extern struct shared_info *HYPERVISOR_shared_info;

extern struct start_info *xen_start_info;



#include <asm/bug.h>

#include <asm/processor.h>



#define XEN_SIGNATURE "XenVMMXenVMM"
@@ -63,4 +64,40 @@ void __init xen_pvh_init(struct boot_params *boot_params); 
void __init mem_map_via_hcall(struct boot_params *boot_params_p);

#endif



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

enum xen_lazy_mode {

	XEN_LAZY_NONE,

	XEN_LAZY_MMU,

	XEN_LAZY_CPU,

};



DECLARE_PER_CPU(enum xen_lazy_mode, xen_lazy_mode);

DECLARE_PER_CPU(unsigned int, xen_lazy_nesting);



static inline void enter_lazy(enum xen_lazy_mode mode)

{

	enum xen_lazy_mode old_mode = this_cpu_read(xen_lazy_mode);



	if (mode == old_mode) {

		this_cpu_inc(xen_lazy_nesting);

		return;

	}



	BUG_ON(old_mode != XEN_LAZY_NONE);



	this_cpu_write(xen_lazy_mode, mode);

}



static inline void leave_lazy(enum xen_lazy_mode mode)

{

	BUG_ON(this_cpu_read(xen_lazy_mode) != mode);



	if (this_cpu_read(xen_lazy_nesting) == 0)

		this_cpu_write(xen_lazy_mode, XEN_LAZY_NONE);

	else

		this_cpu_dec(xen_lazy_nesting);

}



enum xen_lazy_mode xen_get_lazy_mode(void);



#endif /* _ASM_X86_XEN_HYPERVISOR_H */

arch/x86/kernel/paravirt.c

+0 −67
Original line number Diff line number Diff line
@@ -143,66 +143,7 @@ int paravirt_disable_iospace(void) 
	return request_resource(&ioport_resource, &reserve_ioports);

}



static DEFINE_PER_CPU(enum paravirt_lazy_mode, paravirt_lazy_mode) = PARAVIRT_LAZY_NONE;



static inline void enter_lazy(enum paravirt_lazy_mode mode)

{

	BUG_ON(this_cpu_read(paravirt_lazy_mode) != PARAVIRT_LAZY_NONE);



	this_cpu_write(paravirt_lazy_mode, mode);

}



static void leave_lazy(enum paravirt_lazy_mode mode)

{

	BUG_ON(this_cpu_read(paravirt_lazy_mode) != mode);



	this_cpu_write(paravirt_lazy_mode, PARAVIRT_LAZY_NONE);

}



void paravirt_enter_lazy_mmu(void)

{

	enter_lazy(PARAVIRT_LAZY_MMU);

}



void paravirt_leave_lazy_mmu(void)

{

	leave_lazy(PARAVIRT_LAZY_MMU);

}



void paravirt_flush_lazy_mmu(void)

{

	preempt_disable();



	if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) {

		arch_leave_lazy_mmu_mode();

		arch_enter_lazy_mmu_mode();

	}



	preempt_enable();

}



#ifdef CONFIG_PARAVIRT_XXL

void paravirt_start_context_switch(struct task_struct *prev)

{

	BUG_ON(preemptible());



	if (this_cpu_read(paravirt_lazy_mode) == PARAVIRT_LAZY_MMU) {

		arch_leave_lazy_mmu_mode();

		set_ti_thread_flag(task_thread_info(prev), TIF_LAZY_MMU_UPDATES);

	}

	enter_lazy(PARAVIRT_LAZY_CPU);

}



void paravirt_end_context_switch(struct task_struct *next)

{

	BUG_ON(preemptible());



	leave_lazy(PARAVIRT_LAZY_CPU);



	if (test_and_clear_ti_thread_flag(task_thread_info(next), TIF_LAZY_MMU_UPDATES))

		arch_enter_lazy_mmu_mode();

}



static noinstr void pv_native_write_cr2(unsigned long val)

{

	native_write_cr2(val);
@@ -229,14 +170,6 @@ static noinstr void pv_native_safe_halt(void) 
}

#endif



enum paravirt_lazy_mode paravirt_get_lazy_mode(void)

{

	if (in_interrupt())

		return PARAVIRT_LAZY_NONE;



	return this_cpu_read(paravirt_lazy_mode);

}



struct pv_info pv_info = {

	.name = "bare hardware",

#ifdef CONFIG_PARAVIRT_XXL