Commit 6383cb42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.6-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 patch adding irqfd support for virtio backends running as user
   daemon supporting Xen guests

* tag 'for-linus-6.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: privcmd: Add support for irqfd
  xen/xenbus: Avoid a lockdep warning when adding a watch
  xen: Fix one kernel-doc comment
  xen: xenbus: Use helper function IS_ERR_OR_NULL()
  xen: Switch to use kmemdup() helper
  xen-pciback: Remove unused function declarations
  x86/xen: Make virt_to_pfn() a static inline
  xen: remove a confusing comment on auto-translated guest I/O
  xen/evtchn: Remove unused function declaration xen_set_affinity_evtchn()
parents 54203417 f8941e6c

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

+4 −1
Original line number Diff line number Diff line
@@ -295,7 +295,10 @@ static inline unsigned long bfn_to_local_pfn(unsigned long mfn) 


/* VIRT <-> MACHINE conversion */

#define virt_to_machine(v)	(phys_to_machine(XPADDR(__pa(v))))

#define virt_to_pfn(v)          (PFN_DOWN(__pa(v)))

static inline unsigned long virt_to_pfn(const void *v)

{

	return PFN_DOWN(__pa(v));

}

#define virt_to_mfn(v)		(pfn_to_mfn(virt_to_pfn(v)))

#define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))

arch/x86/xen/enlighten_pv.c

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr) 
	BUG_ON(size > PAGE_SIZE);

	BUG_ON(va & ~PAGE_MASK);



	pfn = virt_to_pfn(va);

	pfn = virt_to_pfn((void *)va);

	mfn = pfn_to_mfn(pfn);



	pte = pfn_pte(pfn, PAGE_KERNEL_RO);

arch/x86/xen/mmu_pv.c

+6 −12
Original line number Diff line number Diff line
@@ -2202,13 +2202,13 @@ static void xen_zap_pfn_range(unsigned long vaddr, unsigned int order, 
		mcs = __xen_mc_entry(0);



		if (in_frames)

			in_frames[i] = virt_to_mfn(vaddr);

			in_frames[i] = virt_to_mfn((void *)vaddr);



		MULTI_update_va_mapping(mcs.mc, vaddr, VOID_PTE, 0);

		__set_phys_to_machine(virt_to_pfn(vaddr), INVALID_P2M_ENTRY);

		__set_phys_to_machine(virt_to_pfn((void *)vaddr), INVALID_P2M_ENTRY);



		if (out_frames)

			out_frames[i] = virt_to_pfn(vaddr);

			out_frames[i] = virt_to_pfn((void *)vaddr);

	}

	xen_mc_issue(0);

}
@@ -2250,7 +2250,7 @@ static void xen_remap_exchanged_ptes(unsigned long vaddr, int order, 
		MULTI_update_va_mapping(mcs.mc, vaddr,

				mfn_pte(mfn, PAGE_KERNEL), flags);



		set_phys_to_machine(virt_to_pfn(vaddr), mfn);

		set_phys_to_machine(virt_to_pfn((void *)vaddr), mfn);

	}



	xen_mc_issue(0);
@@ -2310,12 +2310,6 @@ int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, 
	int            success;

	unsigned long vstart = (unsigned long)phys_to_virt(pstart);



	/*

	 * Currently an auto-translated guest will not perform I/O, nor will

	 * it require PAE page directories below 4GB. Therefore any calls to

	 * this function are redundant and can be ignored.

	 */



	if (unlikely(order > MAX_CONTIG_ORDER))

		return -ENOMEM;
@@ -2327,7 +2321,7 @@ int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, 
	xen_zap_pfn_range(vstart, order, in_frames, NULL);



	/* 2. Get a new contiguous memory extent. */

	out_frame = virt_to_pfn(vstart);

	out_frame = virt_to_pfn((void *)vstart);

	success = xen_exchange_memory(1UL << order, 0, in_frames,

				      1, order, &out_frame,

				      address_bits);
@@ -2360,7 +2354,7 @@ void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order) 
	spin_lock_irqsave(&xen_reservation_lock, flags);



	/* 1. Find start MFN of contiguous extent. */

	in_frame = virt_to_mfn(vstart);

	in_frame = virt_to_mfn((void *)vstart);



	/* 2. Zap current PTEs. */

	xen_zap_pfn_range(vstart, order, NULL, out_frames);

arch/x86/xen/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static void __init xen_do_set_identity_and_remap_chunk( 


	WARN_ON(size == 0);



	mfn_save = virt_to_mfn(buf);

	mfn_save = virt_to_mfn((void *)buf);



	for (ident_pfn_iter = start_pfn, remap_pfn_iter = remap_pfn;

	     ident_pfn_iter < ident_end_pfn;
@@ -503,7 +503,7 @@ void __init xen_remap_memory(void) 
	unsigned long pfn_s = ~0UL;

	unsigned long len = 0;



	mfn_save = virt_to_mfn(buf);

	mfn_save = virt_to_mfn((void *)buf);



	while (xen_remap_mfn != INVALID_P2M_ENTRY) {

		/* Map the remap information */

drivers/xen/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -269,6 +269,13 @@ config XEN_PRIVCMD 
	  disaggregated Xen setups this driver might be needed for other

	  domains, too.



config XEN_PRIVCMD_IRQFD

	bool "Xen irqfd support"

	depends on XEN_PRIVCMD && XEN_VIRTIO && EVENTFD

	help

	  Using the irqfd mechanism a virtio backend running in a daemon can

	  speed up interrupt injection into a guest.



config XEN_ACPI_PROCESSOR

	tristate "Xen ACPI processor"

	depends on XEN && XEN_PV_DOM0 && X86 && ACPI_PROCESSOR && CPU_FREQ