Commit 9e856e4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen fixes from Juergen Gross:
 "Some fixes for the new Xen 9pfs frontend and some minor cleanups"

* tag 'for-linus-4.12b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: make xen_flush_tlb_all() static
  xen: cleanup pvh leftovers from pv-only sources
  xen/9pfs: p9_trans_xen_init and p9_trans_xen_exit can be static
  xen/9pfs: fix return value check in xen_9pfs_front_probe()
parents 1fbbed41 c71e6d80

arch/x86/xen/enlighten_pv.c

+4 −11
Original line number Diff line number Diff line
@@ -142,9 +142,7 @@ static void __init xen_banner(void) 
	struct xen_extraversion extra;

	HYPERVISOR_xen_version(XENVER_extraversion, &extra);



	pr_info("Booting paravirtualized kernel %son %s\n",

		xen_feature(XENFEAT_auto_translated_physmap) ?

			"with PVH extensions " : "", pv_info.name);

	pr_info("Booting paravirtualized kernel on %s\n", pv_info.name);

	printk(KERN_INFO "Xen version: %d.%d%s%s\n",

	       version >> 16, version & 0xffff, extra.extraversion,

	       xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : "");
@@ -957,15 +955,10 @@ static void xen_write_msr(unsigned int msr, unsigned low, unsigned high) 


void xen_setup_shared_info(void)

{

	if (!xen_feature(XENFEAT_auto_translated_physmap)) {

		set_fixmap(FIX_PARAVIRT_BOOTMAP,

			   xen_start_info->shared_info);

	set_fixmap(FIX_PARAVIRT_BOOTMAP, xen_start_info->shared_info);



	HYPERVISOR_shared_info =

		(struct shared_info *)fix_to_virt(FIX_PARAVIRT_BOOTMAP);

	} else

		HYPERVISOR_shared_info =

			(struct shared_info *)__va(xen_start_info->shared_info);



#ifndef CONFIG_SMP

	/* In UP this is as good a place as any to set up shared info */

arch/x86/xen/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ xmaddr_t arbitrary_virt_to_machine(void *vaddr) 
}

EXPORT_SYMBOL_GPL(arbitrary_virt_to_machine);



void xen_flush_tlb_all(void)

static void xen_flush_tlb_all(void)

{

	struct mmuext_op *op;

	struct multicall_space mcs;

arch/x86/xen/mmu_pv.c

+38 −64
Original line number Diff line number Diff line
@@ -355,10 +355,8 @@ static pteval_t pte_pfn_to_mfn(pteval_t val) 
		pteval_t flags = val & PTE_FLAGS_MASK;

		unsigned long mfn;



		if (!xen_feature(XENFEAT_auto_translated_physmap))

		mfn = __pfn_to_mfn(pfn);

		else

			mfn = pfn;



		/*

		 * If there's no mfn for the pfn, then just create an

		 * empty non-present pte.  Unfortunately this loses
@@ -647,9 +645,6 @@ static int __xen_pgd_walk(struct mm_struct *mm, pgd_t *pgd, 
	limit--;

	BUG_ON(limit >= FIXADDR_TOP);



	if (xen_feature(XENFEAT_auto_translated_physmap))

		return 0;



	/*

	 * 64-bit has a great big hole in the middle of the address

	 * space, which contains the Xen mappings.  On 32-bit these
@@ -1289,9 +1284,6 @@ static void __init xen_pagetable_cleanhighmap(void) 


static void __init xen_pagetable_p2m_setup(void)

{

	if (xen_feature(XENFEAT_auto_translated_physmap))

		return;



	xen_vmalloc_p2m_tree();



#ifdef CONFIG_X86_64
@@ -1314,7 +1306,6 @@ static void __init xen_pagetable_init(void) 
	xen_build_mfn_list_list();



	/* Remap memory freed due to conflicts with E820 map */

	if (!xen_feature(XENFEAT_auto_translated_physmap))

	xen_remap_memory();



	xen_setup_shared_info();
@@ -1925,21 +1916,20 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) 
	/* Zap identity mapping */

	init_level4_pgt[0] = __pgd(0);



	if (!xen_feature(XENFEAT_auto_translated_physmap)) {

	/* Pre-constructed entries are in pfn, so convert to mfn */

		/* L4[272] -> level3_ident_pgt

		 * L4[511] -> level3_kernel_pgt */

	/* L4[272] -> level3_ident_pgt  */

	/* L4[511] -> level3_kernel_pgt */

	convert_pfn_mfn(init_level4_pgt);



	/* L3_i[0] -> level2_ident_pgt */

	convert_pfn_mfn(level3_ident_pgt);

		/* L3_k[510] -> level2_kernel_pgt

		 * L3_k[511] -> level2_fixmap_pgt */

	/* L3_k[510] -> level2_kernel_pgt */

	/* L3_k[511] -> level2_fixmap_pgt */

	convert_pfn_mfn(level3_kernel_pgt);



	/* L3_k[511][506] -> level1_fixmap_pgt */

	convert_pfn_mfn(level2_fixmap_pgt);

	}



	/* We get [511][511] and have Xen's version of level2_kernel_pgt */

	l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);

	l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
@@ -1962,7 +1952,6 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) 
	if (i && i < pgd_index(__START_KERNEL_map))

		init_level4_pgt[i] = ((pgd_t *)xen_start_info->pt_base)[i];



	if (!xen_feature(XENFEAT_auto_translated_physmap)) {

	/* Make pagetable pieces RO */

	set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);

	set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
@@ -1981,15 +1970,12 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) 
	pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd)));



	/*

		 * At this stage there can be no user pgd, and no page

		 * structure to attach it to, so make sure we just set kernel

		 * pgd.

	 * At this stage there can be no user pgd, and no page structure to

	 * attach it to, so make sure we just set kernel pgd.

	 */

	xen_mc_batch();

	__xen_write_cr3(true, __pa(init_level4_pgt));

	xen_mc_issue(PARAVIRT_LAZY_CPU);

	} else

		native_write_cr3(__pa(init_level4_pgt));



	/* We can't that easily rip out L3 and L2, as the Xen pagetables are

	 * set out this way: [L4], [L1], [L2], [L3], [L1], [L1] ...  for
@@ -2403,9 +2389,6 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot) 


static void __init xen_post_allocator_init(void)

{

	if (xen_feature(XENFEAT_auto_translated_physmap))

		return;



	pv_mmu_ops.set_pte = xen_set_pte;

	pv_mmu_ops.set_pmd = xen_set_pmd;

	pv_mmu_ops.set_pud = xen_set_pud;
@@ -2511,9 +2494,6 @@ void __init xen_init_mmu_ops(void) 
{

	x86_init.paging.pagetable_init = xen_pagetable_init;



	if (xen_feature(XENFEAT_auto_translated_physmap))

		return;



	pv_mmu_ops = xen_mmu_ops;



	memset(dummy_mapping, 0xff, PAGE_SIZE);
@@ -2650,9 +2630,6 @@ int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order, 
	 * this function are redundant and can be ignored.

	 */



	if (xen_feature(XENFEAT_auto_translated_physmap))

		return 0;



	if (unlikely(order > MAX_CONTIG_ORDER))

		return -ENOMEM;
@@ -2689,9 +2666,6 @@ void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order) 
	int success;

	unsigned long vstart;



	if (xen_feature(XENFEAT_auto_translated_physmap))

		return;



	if (unlikely(order > MAX_CONTIG_ORDER))

		return;

net/9p/trans_xen.c

+4 −4
Original line number Diff line number Diff line
@@ -454,8 +454,8 @@ static int xen_9pfs_front_probe(struct xenbus_device *dev, 
			goto error_xenbus;

	}

	priv->tag = xenbus_read(xbt, dev->nodename, "tag", NULL);

	if (!priv->tag) {

		ret = -EINVAL;

	if (IS_ERR(priv->tag)) {

		ret = PTR_ERR(priv->tag);

		goto error_xenbus;

	}

	ret = xenbus_transaction_end(xbt, 0);
@@ -525,7 +525,7 @@ static struct xenbus_driver xen_9pfs_front_driver = { 
	.otherend_changed = xen_9pfs_front_changed,

};



int p9_trans_xen_init(void)

static int p9_trans_xen_init(void)

{

	if (!xen_domain())

		return -ENODEV;
@@ -537,7 +537,7 @@ int p9_trans_xen_init(void) 
}

module_init(p9_trans_xen_init);



void p9_trans_xen_exit(void)

static void p9_trans_xen_exit(void)

{

	v9fs_unregister_trans(&p9_xen_trans);

	return xenbus_unregister_driver(&xen_9pfs_front_driver);

CRA Git | Maintained and supported by SUSTech CRA and CCSE