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

Commit 8ca7de91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'stable/for-linus-3.6-rc6-tag' of... 

Merge tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
 - Fix M2P batching re-using the incorrect structure field.

   In v3.5 we added batching for M2P override (Machine Frame Number ->
   Physical Frame Number), but the original MFN was saved in an
   incorrect structure - and we would oops/restore when restoring with
   the old MFN.

 - Disable BIOS SMP MP table search.

   A bootup issue that we had ignored until we found that on DL380 G6 it
   was needed.

* tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/boot: Disable BIOS SMP MP table search.
  xen/m2p: do not reuse kmap_op->dev_bus_addr
parents e05e279e bd49940a

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

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,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, bool clear_pte);

extern int m2p_remove_override(struct page *page,

				struct gnttab_map_grant_ref *kmap_op);

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/enlighten.c

+4 −0
Original line number Diff line number Diff line
@@ -1452,6 +1452,10 @@ asmlinkage void __init xen_start_kernel(void) 
		pci_request_acs();



		xen_acpi_sleep_register();



		/* Avoid searching for BIOS MP tables */

		x86_init.mpparse.find_smp_config = x86_init_noop;

		x86_init.mpparse.get_smp_config = x86_init_uint_noop;

	}

#ifdef CONFIG_PCI

	/* PCI BIOS service won't work from a PV guest. */

arch/x86/xen/p2m.c

+11 −16
Original line number Diff line number Diff line
@@ -828,9 +828,6 @@ int m2p_add_override(unsigned long mfn, struct page *page, 


			xen_mc_issue(PARAVIRT_LAZY_MMU);

		}

		/* let's use dev_bus_addr to record the old mfn instead */

		kmap_op->dev_bus_addr = page->index;

		page->index = (unsigned long) kmap_op;

	}

	spin_lock_irqsave(&m2p_override_lock, flags);

	list_add(&page->lru,  &m2p_overrides[mfn_hash(mfn)]);
@@ -857,7 +854,8 @@ int m2p_add_override(unsigned long mfn, struct page *page, 
	return 0;

}

EXPORT_SYMBOL_GPL(m2p_add_override);

int m2p_remove_override(struct page *page, bool clear_pte)

int m2p_remove_override(struct page *page,

		struct gnttab_map_grant_ref *kmap_op)

{

	unsigned long flags;

	unsigned long mfn;
@@ -887,10 +885,8 @@ int m2p_remove_override(struct page *page, bool clear_pte) 
	WARN_ON(!PagePrivate(page));

	ClearPagePrivate(page);



	if (clear_pte) {

		struct gnttab_map_grant_ref *map_op =

			(struct gnttab_map_grant_ref *) page->index;

		set_phys_to_machine(pfn, map_op->dev_bus_addr);

	set_phys_to_machine(pfn, page->index);

	if (kmap_op != NULL) {

		if (!PageHighMem(page)) {

			struct multicall_space mcs;

			struct gnttab_unmap_grant_ref *unmap_op;
@@ -902,13 +898,13 @@ int m2p_remove_override(struct page *page, bool clear_pte) 
			 * issued. In this case handle is going to -1 because

			 * it hasn't been modified yet.

			 */

			if (map_op->handle == -1)

			if (kmap_op->handle == -1)

				xen_mc_flush();

			/*

			 * Now if map_op->handle is negative it means that the

			 * Now if kmap_op->handle is negative it means that the

			 * hypercall actually returned an error.

			 */

			if (map_op->handle == GNTST_general_error) {

			if (kmap_op->handle == GNTST_general_error) {

				printk(KERN_WARNING "m2p_remove_override: "

						"pfn %lx mfn %lx, failed to modify kernel mappings",

						pfn, mfn);
@@ -918,8 +914,8 @@ int m2p_remove_override(struct page *page, bool clear_pte) 
			mcs = xen_mc_entry(

					sizeof(struct gnttab_unmap_grant_ref));

			unmap_op = mcs.args;

			unmap_op->host_addr = map_op->host_addr;

			unmap_op->handle = map_op->handle;

			unmap_op->host_addr = kmap_op->host_addr;

			unmap_op->handle = kmap_op->handle;

			unmap_op->dev_bus_addr = 0;



			MULTI_grant_table_op(mcs.mc,
@@ -930,10 +926,9 @@ int m2p_remove_override(struct page *page, bool clear_pte) 
			set_pte_at(&init_mm, address, ptep,

					pfn_pte(pfn, PAGE_KERNEL));

			__flush_tlb_single(address);

			map_op->host_addr = 0;

			kmap_op->host_addr = 0;

		}

	}

	} else

		set_phys_to_machine(pfn, page->index);



	/* p2m(m2p(mfn)) == FOREIGN_FRAME(mfn): the mfn is already present

	 * somewhere in this domain, even before being added to the

drivers/block/xen-blkback/blkback.c

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static void xen_blkbk_unmap(struct pending_req *req) 
		invcount++;

	}



	ret = gnttab_unmap_refs(unmap, pages, invcount, false);

	ret = gnttab_unmap_refs(unmap, NULL, pages, invcount);

	BUG_ON(ret);

}

drivers/xen/gntdev.c

+3 −2
Original line number Diff line number Diff line
@@ -314,8 +314,9 @@ static int __unmap_grant_pages(struct grant_map *map, int offset, int pages) 
		}

	}



	err = gnttab_unmap_refs(map->unmap_ops + offset, map->pages + offset,

				pages, true);

	err = gnttab_unmap_refs(map->unmap_ops + offset,

			use_ptemod ? map->kmap_ops + offset : NULL, map->pages + offset,

			pages);

	if (err)

		return err;