Commit 6cd3d401 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen updates from Juergen Gross:

 - a cleanup patch removing an unused function

 - a small fix for the xen pciback driver

 - a series for making the unwinder hyppay with the Xen PV guest idle
   task stacks

* tag 'for-linus-5.7-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  x86/xen: Make the secondary CPU idle tasks reliable
  x86/xen: Make the boot CPU idle task reliable
  xen-pciback: fix INTERRUPT_TYPE_* defines
  xen/xenbus: remove unused xenbus_map_ring()
parents 0adb8bc0 c3881eb5

arch/x86/xen/smp_pv.c

+2 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static DEFINE_PER_CPU(struct xen_common_irq, xen_irq_work) = { .irq = -1 }; 
static DEFINE_PER_CPU(struct xen_common_irq, xen_pmu_irq) = { .irq = -1 };



static irqreturn_t xen_irq_work_interrupt(int irq, void *dev_id);

void asm_cpu_bringup_and_idle(void);



static void cpu_bringup(void)

{
@@ -309,7 +310,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
	 * pointing just below where pt_regs would be if it were a normal

	 * kernel entry.

	 */

	ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;

	ctxt->user_regs.eip = (unsigned long)asm_cpu_bringup_and_idle;

	ctxt->flags = VGCF_IN_KERNEL;

	ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */

	ctxt->user_regs.ds = __USER_DS;

arch/x86/xen/xen-head.S

+16 −2
Original line number Diff line number Diff line
@@ -35,7 +35,11 @@ SYM_CODE_START(startup_xen) 
	rep __ASM_SIZE(stos)



	mov %_ASM_SI, xen_start_info

	mov $init_thread_union+THREAD_SIZE, %_ASM_SP

#ifdef CONFIG_X86_64

	mov initial_stack(%rip), %rsp

#else

	mov pa(initial_stack), %esp

#endif



#ifdef CONFIG_X86_64

	/* Set up %gs.
@@ -51,9 +55,19 @@ SYM_CODE_START(startup_xen) 
	wrmsr

#endif



	jmp xen_start_kernel

	call xen_start_kernel

SYM_CODE_END(startup_xen)

	__FINIT



#ifdef CONFIG_XEN_PV_SMP

.pushsection .text

SYM_CODE_START(asm_cpu_bringup_and_idle)

	UNWIND_HINT_EMPTY



	call cpu_bringup_and_idle

SYM_CODE_END(asm_cpu_bringup_and_idle)

.popsection

#endif

#endif



.pushsection .text

drivers/xen/xen-pciback/conf_space.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ int xen_pcibk_get_interrupt_type(struct pci_dev *dev) 
		if (val & PCI_MSIX_FLAGS_ENABLE)

			ret |= INTERRUPT_TYPE_MSIX;

	}

	return ret;

	return ret ?: INTERRUPT_TYPE_NONE;

}



void xen_pcibk_config_free_dyn_fields(struct pci_dev *dev)

drivers/xen/xen-pciback/conf_space.h

+4 −4
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ struct config_field_entry { 
	void *data;

};



#define INTERRUPT_TYPE_NONE (1<<0)

#define INTERRUPT_TYPE_INTX (1<<1)

#define INTERRUPT_TYPE_MSI  (1<<2)

#define INTERRUPT_TYPE_MSIX (1<<3)

#define INTERRUPT_TYPE_NONE (0)

#define INTERRUPT_TYPE_INTX (1<<0)

#define INTERRUPT_TYPE_MSI  (1<<1)

#define INTERRUPT_TYPE_MSIX (1<<2)



extern bool xen_pcibk_permissive;

drivers/xen/xenbus/xenbus_client.c

+42 −84
Original line number Diff line number Diff line
@@ -517,6 +517,48 @@ static int __xenbus_map_ring(struct xenbus_device *dev, 
	return err;

}



/**

 * xenbus_unmap_ring

 * @dev: xenbus device

 * @handles: grant handle array

 * @nr_handles: number of handles in the array

 * @vaddrs: addresses to unmap

 *

 * Unmap memory in this domain that was imported from another domain.

 * Returns 0 on success and returns GNTST_* on error

 * (see xen/include/interface/grant_table.h).

 */

static int xenbus_unmap_ring(struct xenbus_device *dev, grant_handle_t *handles,

			     unsigned int nr_handles, unsigned long *vaddrs)

{

	struct gnttab_unmap_grant_ref unmap[XENBUS_MAX_RING_GRANTS];

	int i;

	int err;



	if (nr_handles > XENBUS_MAX_RING_GRANTS)

		return -EINVAL;



	for (i = 0; i < nr_handles; i++)

		gnttab_set_unmap_op(&unmap[i], vaddrs[i],

				    GNTMAP_host_map, handles[i]);



	if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i))

		BUG();



	err = GNTST_okay;

	for (i = 0; i < nr_handles; i++) {

		if (unmap[i].status != GNTST_okay) {

			xenbus_dev_error(dev, unmap[i].status,

					 "unmapping page at handle %d error %d",

					 handles[i], unmap[i].status);

			err = unmap[i].status;

			break;

		}

	}



	return err;

}



struct map_ring_valloc_hvm

{

	unsigned int idx;
@@ -608,45 +650,6 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev, 
	return err;

}





/**

 * xenbus_map_ring

 * @dev: xenbus device

 * @gnt_refs: grant reference array

 * @nr_grefs: number of grant reference

 * @handles: pointer to grant handle to be filled

 * @vaddrs: addresses to be mapped to

 * @leaked: fail to clean up a failed map, caller should not free vaddr

 *

 * Map pages of memory into this domain from another domain's grant table.

 * xenbus_map_ring does not allocate the virtual address space (you must do

 * this yourself!). It only maps in the pages to the specified address.

 * Returns 0 on success, and GNTST_* (see xen/include/interface/grant_table.h)

 * or -ENOMEM / -EINVAL on error. If an error is returned, device will switch to

 * XenbusStateClosing and the first error message will be saved in XenStore.

 * Further more if we fail to map the ring, caller should check @leaked.

 * If @leaked is not zero it means xenbus_map_ring fails to clean up, caller

 * should not free the address space of @vaddr.

 */

int xenbus_map_ring(struct xenbus_device *dev, grant_ref_t *gnt_refs,

		    unsigned int nr_grefs, grant_handle_t *handles,

		    unsigned long *vaddrs, bool *leaked)

{

	phys_addr_t phys_addrs[XENBUS_MAX_RING_GRANTS];

	int i;



	if (nr_grefs > XENBUS_MAX_RING_GRANTS)

		return -EINVAL;



	for (i = 0; i < nr_grefs; i++)

		phys_addrs[i] = (unsigned long)vaddrs[i];



	return __xenbus_map_ring(dev, gnt_refs, nr_grefs, handles,

				 phys_addrs, GNTMAP_host_map, leaked);

}

EXPORT_SYMBOL_GPL(xenbus_map_ring);





/**

 * xenbus_unmap_ring_vfree

 * @dev: xenbus device
@@ -858,51 +861,6 @@ static int xenbus_unmap_ring_vfree_hvm(struct xenbus_device *dev, void *vaddr) 
	return rv;

}



/**

 * xenbus_unmap_ring

 * @dev: xenbus device

 * @handles: grant handle array

 * @nr_handles: number of handles in the array

 * @vaddrs: addresses to unmap

 *

 * Unmap memory in this domain that was imported from another domain.

 * Returns 0 on success and returns GNTST_* on error

 * (see xen/include/interface/grant_table.h).

 */

int xenbus_unmap_ring(struct xenbus_device *dev,

		      grant_handle_t *handles, unsigned int nr_handles,

		      unsigned long *vaddrs)

{

	struct gnttab_unmap_grant_ref unmap[XENBUS_MAX_RING_GRANTS];

	int i;

	int err;



	if (nr_handles > XENBUS_MAX_RING_GRANTS)

		return -EINVAL;



	for (i = 0; i < nr_handles; i++)

		gnttab_set_unmap_op(&unmap[i], vaddrs[i],

				    GNTMAP_host_map, handles[i]);



	if (HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, unmap, i))

		BUG();



	err = GNTST_okay;

	for (i = 0; i < nr_handles; i++) {

		if (unmap[i].status != GNTST_okay) {

			xenbus_dev_error(dev, unmap[i].status,

					 "unmapping page at handle %d error %d",

					 handles[i], unmap[i].status);

			err = unmap[i].status;

			break;

		}

	}



	return err;

}

EXPORT_SYMBOL_GPL(xenbus_unmap_ring);





/**

 * xenbus_read_driver_state

 * @path: path for driver

CRA Git | Maintained and supported by SUSTech CRA and CCSE