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

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

Pull xen fixes from Juergen Gross:
 "Some minor cleanups and fixes of some theoretical bugs, as well as a
  fix of a bug introduced in 5.15-rc1"

* tag 'for-linus-5.15b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/x86: fix PV trap handling on secondary processors
  xen/balloon: fix balloon kthread freezing
  swiotlb-xen: this is PV-only on x86
  xen/pci-swiotlb: reduce visibility of symbols
  PCI: only build xen-pcifront in PV-enabled environments
  swiotlb-xen: ensure to issue well-formed XENMEM_exchange requests
  Xen/gntdev: don't ignore kernel unmapping error
  xen/x86: drop redundant zeroing from cpu_initialize_context()
parents 90316e6e 0594c581

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2610,7 +2610,6 @@ config PCI_OLPC 
config PCI_XEN

	def_bool y

	depends on PCI && XEN

	select SWIOTLB_XEN



config MMCONF_FAM10H

	def_bool y

arch/x86/include/asm/xen/swiotlb-xen.h

+1 −5
Original line number Diff line number Diff line
@@ -3,14 +3,10 @@ 
#define _ASM_X86_SWIOTLB_XEN_H



#ifdef CONFIG_SWIOTLB_XEN

extern int xen_swiotlb;

extern int __init pci_xen_swiotlb_detect(void);

extern void __init pci_xen_swiotlb_init(void);

extern int pci_xen_swiotlb_init_late(void);

#else

#define xen_swiotlb (0)

static inline int __init pci_xen_swiotlb_detect(void) { return 0; }

static inline void __init pci_xen_swiotlb_init(void) { }

#define pci_xen_swiotlb_detect NULL

static inline int pci_xen_swiotlb_init_late(void) { return -ENXIO; }

#endif

arch/x86/xen/enlighten_pv.c

+9 −6
Original line number Diff line number Diff line
@@ -755,8 +755,8 @@ static void xen_write_idt_entry(gate_desc *dt, int entrynum, const gate_desc *g) 
	preempt_enable();

}



static void xen_convert_trap_info(const struct desc_ptr *desc,

				  struct trap_info *traps)

static unsigned xen_convert_trap_info(const struct desc_ptr *desc,

				      struct trap_info *traps, bool full)

{

	unsigned in, out, count;
@@ -766,17 +766,18 @@ static void xen_convert_trap_info(const struct desc_ptr *desc, 
	for (in = out = 0; in < count; in++) {

		gate_desc *entry = (gate_desc *)(desc->address) + in;



		if (cvt_gate_to_trap(in, entry, &traps[out]))

		if (cvt_gate_to_trap(in, entry, &traps[out]) || full)

			out++;

	}

	traps[out].address = 0;



	return out;

}



void xen_copy_trap_info(struct trap_info *traps)

{

	const struct desc_ptr *desc = this_cpu_ptr(&idt_desc);



	xen_convert_trap_info(desc, traps);

	xen_convert_trap_info(desc, traps, true);

}



/* Load a new IDT into Xen.  In principle this can be per-CPU, so we
@@ -786,6 +787,7 @@ static void xen_load_idt(const struct desc_ptr *desc) 
{

	static DEFINE_SPINLOCK(lock);

	static struct trap_info traps[257];

	unsigned out;



	trace_xen_cpu_load_idt(desc);
@@ -793,7 +795,8 @@ static void xen_load_idt(const struct desc_ptr *desc) 


	memcpy(this_cpu_ptr(&idt_desc), desc, sizeof(idt_desc));



	xen_convert_trap_info(desc, traps);

	out = xen_convert_trap_info(desc, traps, false);

	memset(&traps[out], 0, sizeof(traps[0]));



	xen_mc_flush();

	if (HYPERVISOR_set_trap_table(traps))

arch/x86/xen/pci-swiotlb-xen.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#endif

#include <linux/export.h>



int xen_swiotlb __read_mostly;

static int xen_swiotlb __read_mostly;



/*

 * pci_xen_swiotlb_detect - set xen_swiotlb to 1 if necessary
@@ -56,7 +56,7 @@ int __init pci_xen_swiotlb_detect(void) 
	return xen_swiotlb;

}



void __init pci_xen_swiotlb_init(void)

static void __init pci_xen_swiotlb_init(void)

{

	if (xen_swiotlb) {

		xen_swiotlb_init_early();

arch/x86/xen/smp_pv.c

+0 −4
Original line number Diff line number Diff line
@@ -290,8 +290,6 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 


	gdt = get_cpu_gdt_rw(cpu);



	memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));



	/*

	 * Bring up the CPU in cpu_bringup_and_idle() with the stack

	 * pointing just below where pt_regs would be if it were a normal
@@ -308,8 +306,6 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 


	xen_copy_trap_info(ctxt->trap_ctxt);



	ctxt->ldt_ents = 0;



	BUG_ON((unsigned long)gdt & ~PAGE_MASK);



	gdt_mfn = arbitrary_virt_to_mfn(gdt);