Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14164b46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.14-rc0-late-tag' of... 

Merge tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull Xen bugfixes from Konrad Rzeszutek Wilk:
 "Bug-fixes for the new features that were added during this cycle.

  There are also two fixes for long-standing issues for which we have a
  solution: grant-table operations extra work that was not needed
  causing performance issues and the self balloon code was too
  aggressive causing OOMs.

  Details:
   - Xen ARM couldn't use the new FIFO events
   - Xen ARM couldn't use the SWIOTLB if compiled as 32-bit with 64-bit PCIe devices.
   - Grant table were doing needless M2P operations.
   - Ratchet down the self-balloon code so it won't OOM.
   - Fix misplaced kfree in Xen PVH error code paths"

* tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/pvh: Fix misplaced kfree from xlated_setup_gnttab_pages
  drivers: xen: deaggressive selfballoon driver
  xen/grant-table: Avoid m2p_override during mapping
  xen/gnttab: Use phys_addr_t to describe the grant frame base address
  xen: swiotlb: handle sizeof(dma_addr_t) != sizeof(phys_addr_t)
  arm/xen: Initialize event channels earlier
parents e2a0f813 f93576e1

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1905,6 +1905,7 @@ config XEN 
	depends on !GENERIC_ATOMIC64

	select ARM_PSCI

	select SWIOTLB_XEN

	select ARCH_DMA_ADDR_T_64BIT

	help

	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.

arch/arm/xen/enlighten.c

+47 −30
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/of_address.h>

#include <linux/cpuidle.h>

#include <linux/cpufreq.h>

#include <linux/cpu.h>



#include <linux/mm.h>
@@ -154,7 +155,7 @@ int xen_unmap_domain_mfn_range(struct vm_area_struct *vma, 
}

EXPORT_SYMBOL_GPL(xen_unmap_domain_mfn_range);



static void __init xen_percpu_init(void *unused)

static void xen_percpu_init(void)

{

	struct vcpu_register_vcpu_info info;

	struct vcpu_info *vcpup;
@@ -193,6 +194,31 @@ static void xen_power_off(void) 
		BUG();

}



static int xen_cpu_notification(struct notifier_block *self,

				unsigned long action,

				void *hcpu)

{

	switch (action) {

	case CPU_STARTING:

		xen_percpu_init();

		break;

	default:

		break;

	}



	return NOTIFY_OK;

}



static struct notifier_block xen_cpu_notifier = {

	.notifier_call = xen_cpu_notification,

};



static irqreturn_t xen_arm_callback(int irq, void *arg)

{

	xen_hvm_evtchn_do_upcall();

	return IRQ_HANDLED;

}



/*

 * see Documentation/devicetree/bindings/arm/xen.txt for the

 * documentation of the Xen Device Tree format.
@@ -208,7 +234,7 @@ static int __init xen_guest_init(void) 
	const char *version = NULL;

	const char *xen_prefix = "xen,xen-";

	struct resource res;

	unsigned long grant_frames;

	phys_addr_t grant_frames;



	node = of_find_compatible_node(NULL, NULL, "xen,xen");

	if (!node) {
@@ -227,8 +253,12 @@ static int __init xen_guest_init(void) 
		return 0;

	grant_frames = res.start;

	xen_events_irq = irq_of_parse_and_map(node, 0);

	pr_info("Xen %s support found, events_irq=%d gnttab_frame_pfn=%lx\n",

			version, xen_events_irq, (grant_frames >> PAGE_SHIFT));

	pr_info("Xen %s support found, events_irq=%d gnttab_frame=%pa\n",

			version, xen_events_irq, &grant_frames);



	if (xen_events_irq < 0)

		return -ENODEV;



	xen_domain_type = XEN_HVM_DOMAIN;



	xen_setup_features();
@@ -281,9 +311,21 @@ static int __init xen_guest_init(void) 
	disable_cpuidle();

	disable_cpufreq();



	xen_init_IRQ();



	if (request_percpu_irq(xen_events_irq, xen_arm_callback,

			       "events", &xen_vcpu)) {

		pr_err("Error request IRQ %d\n", xen_events_irq);

		return -EINVAL;

	}



	xen_percpu_init();



	register_cpu_notifier(&xen_cpu_notifier);



	return 0;

}

core_initcall(xen_guest_init);

early_initcall(xen_guest_init);



static int __init xen_pm_init(void)

{
@@ -297,31 +339,6 @@ static int __init xen_pm_init(void) 
}

late_initcall(xen_pm_init);



static irqreturn_t xen_arm_callback(int irq, void *arg)

{

	xen_hvm_evtchn_do_upcall();

	return IRQ_HANDLED;

}



static int __init xen_init_events(void)

{

	if (!xen_domain() || xen_events_irq < 0)

		return -ENODEV;



	xen_init_IRQ();



	if (request_percpu_irq(xen_events_irq, xen_arm_callback,

			"events", &xen_vcpu)) {

		pr_err("Error requesting IRQ %d\n", xen_events_irq);

		return -EINVAL;

	}



	on_each_cpu(xen_percpu_init, NULL, 0);



	return 0;

}

postcore_initcall(xen_init_events);



/* In the hypervisor.S file. */

EXPORT_SYMBOL_GPL(HYPERVISOR_event_channel_op);

EXPORT_SYMBOL_GPL(HYPERVISOR_grant_table_op);

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

+3 −2
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ extern unsigned long set_phys_range_identity(unsigned long pfn_s, 
extern int m2p_add_override(unsigned long mfn, struct page *page,

			    struct gnttab_map_grant_ref *kmap_op);

extern int m2p_remove_override(struct page *page,

				struct gnttab_map_grant_ref *kmap_op);

			       struct gnttab_map_grant_ref *kmap_op,

			       unsigned long mfn);

extern struct page *m2p_find_override(unsigned long mfn);

extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);

arch/x86/xen/grant-table.c

+2 −1
Original line number Diff line number Diff line
@@ -162,14 +162,15 @@ static int __init xlated_setup_gnttab_pages(void) 
	rc = arch_gnttab_map_shared(pfns, nr_grant_frames, nr_grant_frames,

				    &xen_auto_xlat_grant_frames.vaddr);



	kfree(pages);

	if (rc) {

		pr_warn("%s Couldn't map %ld pfns rc:%d\n", __func__,

			nr_grant_frames, rc);

		free_xenballooned_pages(nr_grant_frames, pages);

		kfree(pages);

		kfree(pfns);

		return rc;

	}

	kfree(pages);



	xen_auto_xlat_grant_frames.pfn = pfns;

	xen_auto_xlat_grant_frames.count = nr_grant_frames;

arch/x86/xen/p2m.c

+2 −15
Original line number Diff line number Diff line
@@ -899,13 +899,6 @@ int m2p_add_override(unsigned long mfn, struct page *page, 
					"m2p_add_override: pfn %lx not mapped", pfn))

			return -EINVAL;

	}

	WARN_ON(PagePrivate(page));

	SetPagePrivate(page);

	set_page_private(page, mfn);

	page->index = pfn_to_mfn(pfn);



	if (unlikely(!set_phys_to_machine(pfn, FOREIGN_FRAME(mfn))))

		return -ENOMEM;



	if (kmap_op != NULL) {

		if (!PageHighMem(page)) {
@@ -944,19 +937,16 @@ int m2p_add_override(unsigned long mfn, struct page *page, 
}

EXPORT_SYMBOL_GPL(m2p_add_override);

int m2p_remove_override(struct page *page,

		struct gnttab_map_grant_ref *kmap_op)

			struct gnttab_map_grant_ref *kmap_op,

			unsigned long mfn)

{

	unsigned long flags;

	unsigned long mfn;

	unsigned long pfn;

	unsigned long uninitialized_var(address);

	unsigned level;

	pte_t *ptep = NULL;



	pfn = page_to_pfn(page);

	mfn = get_phys_to_machine(pfn);

	if (mfn == INVALID_P2M_ENTRY || !(mfn & FOREIGN_FRAME_BIT))

		return -EINVAL;



	if (!PageHighMem(page)) {

		address = (unsigned long)__va(pfn << PAGE_SHIFT);
@@ -970,10 +960,7 @@ int m2p_remove_override(struct page *page, 
	spin_lock_irqsave(&m2p_override_lock, flags);

	list_del(&page->lru);

	spin_unlock_irqrestore(&m2p_override_lock, flags);

	WARN_ON(!PagePrivate(page));

	ClearPagePrivate(page);



	set_phys_to_machine(pfn, page->index);

	if (kmap_op != NULL) {

		if (!PageHighMem(page)) {

			struct multicall_space mcs;