Commit 3ee31b89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen updates from Juergen Gross:

 - the new pvcalls backend for routing socket calls from a guest to dom0

 - some cleanups of Xen code

 - a fix for wrong usage of {get,put}_cpu()

* tag 'for-linus-4.14b-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (27 commits)
  xen/mmu: set MMU_NORMAL_PT_UPDATE in remap_area_mfn_pte_fn
  xen: Don't try to call xen_alloc_p2m_entry() on autotranslating guests
  xen/events: events_fifo: Don't use {get,put}_cpu() in xen_evtchn_fifo_init()
  xen/pvcalls: use WARN_ON(1) instead of __WARN()
  xen: remove not used trace functions
  xen: remove unused function xen_set_domain_pte()
  xen: remove tests for pvh mode in pure pv paths
  xen-platform: constify pci_device_id.
  xen: cleanup xen.h
  xen: introduce a Kconfig option to enable the pvcalls backend
  xen/pvcalls: implement write
  xen/pvcalls: implement read
  xen/pvcalls: implement the ioworker functions
  xen/pvcalls: disconnect and module_exit
  xen/pvcalls: implement release command
  xen/pvcalls: implement poll command
  xen/pvcalls: implement accept command
  xen/pvcalls: implement listen command
  xen/pvcalls: implement bind command
  xen/pvcalls: implement connect command
  ...
parents bac65d9d d785d9ec

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

+0 −5
Original line number Diff line number Diff line
@@ -158,9 +158,6 @@ static inline unsigned long mfn_to_pfn_no_overrides(unsigned long mfn) 
	unsigned long pfn;

	int ret;



	if (xen_feature(XENFEAT_auto_translated_physmap))

		return mfn;



	if (unlikely(mfn >= machine_to_phys_nr))

		return ~0;
@@ -317,8 +314,6 @@ static inline pte_t __pte_ma(pteval_t x) 
#define p4d_val_ma(x)	((x).p4d)

#endif



void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid);



xmaddr_t arbitrary_virt_to_machine(void *address);

unsigned long arbitrary_virt_to_mfn(void *vaddr);

void make_lowmem_page_readonly(void *vaddr);

arch/x86/xen/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int remap_area_mfn_pte_fn(pte_t *ptep, pgtable_t token, 
	else

		rmd->mfn++;



	rmd->mmu_update->ptr = virt_to_machine(ptep).maddr;

	rmd->mmu_update->ptr = virt_to_machine(ptep).maddr | MMU_NORMAL_PT_UPDATE;

	rmd->mmu_update->val = pte_val_ma(pte);

	rmd->mmu_update++;

arch/x86/xen/mmu_pv.c

+0 −20
Original line number Diff line number Diff line
@@ -162,26 +162,6 @@ static bool xen_page_pinned(void *ptr) 
	return PagePinned(page);

}



void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid)

{

	struct multicall_space mcs;

	struct mmu_update *u;



	trace_xen_mmu_set_domain_pte(ptep, pteval, domid);



	mcs = xen_mc_entry(sizeof(*u));

	u = mcs.args;



	/* ptep might be kmapped when using 32-bit HIGHPTE */

	u->ptr = virt_to_machine(ptep).maddr;

	u->val = pte_val_ma(pteval);



	MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, domid);



	xen_mc_issue(PARAVIRT_LAZY_MMU);

}

EXPORT_SYMBOL_GPL(xen_set_domain_pte);



static void xen_extend_mmu_update(const struct mmu_update *update)

{

	struct multicall_space mcs;

arch/x86/xen/p2m.c

+1 −24
Original line number Diff line number Diff line
@@ -212,8 +212,7 @@ void __ref xen_build_mfn_list_list(void) 
	unsigned int level, topidx, mididx;

	unsigned long *mid_mfn_p;



	if (xen_feature(XENFEAT_auto_translated_physmap) ||

	    xen_start_info->flags & SIF_VIRT_P2M_4TOOLS)

	if (xen_start_info->flags & SIF_VIRT_P2M_4TOOLS)

		return;



	/* Pre-initialize p2m_top_mfn to be completely missing */
@@ -269,9 +268,6 @@ void __ref xen_build_mfn_list_list(void) 


void xen_setup_mfn_list_list(void)

{

	if (xen_feature(XENFEAT_auto_translated_physmap))

		return;



	BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info);



	if (xen_start_info->flags & SIF_VIRT_P2M_4TOOLS)
@@ -291,9 +287,6 @@ void __init xen_build_dynamic_phys_to_machine(void) 
{

	unsigned long pfn;



	 if (xen_feature(XENFEAT_auto_translated_physmap))

		return;



	xen_p2m_addr = (unsigned long *)xen_start_info->mfn_list;

	xen_p2m_size = ALIGN(xen_start_info->nr_pages, P2M_PER_PAGE);
@@ -540,9 +533,6 @@ int xen_alloc_p2m_entry(unsigned long pfn) 
	unsigned long addr = (unsigned long)(xen_p2m_addr + pfn);

	unsigned long p2m_pfn;



	if (xen_feature(XENFEAT_auto_translated_physmap))

		return 0;



	ptep = lookup_address(addr, &level);

	BUG_ON(!ptep || level != PG_LEVEL_4K);

	pte_pg = (pte_t *)((unsigned long)ptep & ~(PAGE_SIZE - 1));
@@ -640,9 +630,6 @@ unsigned long __init set_phys_range_identity(unsigned long pfn_s, 
	if (unlikely(pfn_s >= xen_p2m_size))

		return 0;



	if (unlikely(xen_feature(XENFEAT_auto_translated_physmap)))

		return pfn_e - pfn_s;



	if (pfn_s > pfn_e)

		return 0;
@@ -660,10 +647,6 @@ bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
	pte_t *ptep;

	unsigned int level;



	/* don't track P2M changes in autotranslate guests */

	if (unlikely(xen_feature(XENFEAT_auto_translated_physmap)))

		return true;



	if (unlikely(pfn >= xen_p2m_size)) {

		BUG_ON(mfn != INVALID_P2M_ENTRY);

		return true;
@@ -711,9 +694,6 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops, 
	int i, ret = 0;

	pte_t *pte;



	if (xen_feature(XENFEAT_auto_translated_physmap))

		return 0;



	if (kmap_ops) {

		ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref,

						kmap_ops, count);
@@ -756,9 +736,6 @@ int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops, 
{

	int i, ret = 0;



	if (xen_feature(XENFEAT_auto_translated_physmap))

		return 0;



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

		unsigned long mfn = __pfn_to_mfn(page_to_pfn(pages[i]));

		unsigned long pfn = page_to_pfn(pages[i]);

arch/x86/xen/setup.c

+1 −4
Original line number Diff line number Diff line
@@ -340,8 +340,6 @@ static void __init xen_do_set_identity_and_remap_chunk( 


	WARN_ON(size == 0);



	BUG_ON(xen_feature(XENFEAT_auto_translated_physmap));



	mfn_save = virt_to_mfn(buf);



	for (ident_pfn_iter = start_pfn, remap_pfn_iter = remap_pfn;
@@ -1024,7 +1022,6 @@ void __init xen_pvmmu_arch_setup(void) 
void __init xen_arch_setup(void)

{

	xen_panic_handler_init();

	if (!xen_feature(XENFEAT_auto_translated_physmap))

	xen_pvmmu_arch_setup();



#ifdef CONFIG_ACPI

CRA Git | Maintained and supported by SUSTech CRA and CCSE