Commit 0a8abd97 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen fixes from Juergen Gross:
 "A fix for a missing __init annotation and two cleanup patches"

* tag 'for-linus-4.14b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen, arm64: drop dummy lookup_address()
  xen: don't compile pv-specific parts if XEN_PV isn't configured
  xen: x86: mark xen_find_pt_base as __init
parents d6396a73 0555ac43

arch/x86/xen/mmu_pv.c

+1 −1
Original line number Diff line number Diff line
@@ -2220,7 +2220,7 @@ static void __init xen_write_cr3_init(unsigned long cr3) 
 * not the first page table in the page table pool.

 * Iterate through the initial page tables to find the real page table base.

 */

static phys_addr_t xen_find_pt_base(pmd_t *pmd)

static phys_addr_t __init xen_find_pt_base(pmd_t *pmd)

{

	phys_addr_t pt_base, paddr;

	unsigned pmdidx;

drivers/xen/xenbus/xenbus_client.c

+67 −63
Original line number Diff line number Diff line
@@ -519,64 +519,6 @@ static int __xenbus_map_ring(struct xenbus_device *dev, 
	return err;

}



static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,

				     grant_ref_t *gnt_refs,

				     unsigned int nr_grefs,

				     void **vaddr)

{

	struct xenbus_map_node *node;

	struct vm_struct *area;

	pte_t *ptes[XENBUS_MAX_RING_GRANTS];

	phys_addr_t phys_addrs[XENBUS_MAX_RING_GRANTS];

	int err = GNTST_okay;

	int i;

	bool leaked;



	*vaddr = NULL;



	if (nr_grefs > XENBUS_MAX_RING_GRANTS)

		return -EINVAL;



	node = kzalloc(sizeof(*node), GFP_KERNEL);

	if (!node)

		return -ENOMEM;



	area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, ptes);

	if (!area) {

		kfree(node);

		return -ENOMEM;

	}



	for (i = 0; i < nr_grefs; i++)

		phys_addrs[i] = arbitrary_virt_to_machine(ptes[i]).maddr;



	err = __xenbus_map_ring(dev, gnt_refs, nr_grefs, node->handles,

				phys_addrs,

				GNTMAP_host_map | GNTMAP_contains_pte,

				&leaked);

	if (err)

		goto failed;



	node->nr_handles = nr_grefs;

	node->pv.area = area;



	spin_lock(&xenbus_valloc_lock);

	list_add(&node->next, &xenbus_valloc_pages);

	spin_unlock(&xenbus_valloc_lock);



	*vaddr = area->addr;

	return 0;



failed:

	if (!leaked)

		free_vm_area(area);

	else

		pr_alert("leaking VM area %p size %u page(s)", area, nr_grefs);



	kfree(node);

	return err;

}



struct map_ring_valloc_hvm

{

	unsigned int idx;
@@ -725,6 +667,65 @@ int xenbus_unmap_ring_vfree(struct xenbus_device *dev, void *vaddr) 
}

EXPORT_SYMBOL_GPL(xenbus_unmap_ring_vfree);



#ifdef CONFIG_XEN_PV

static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,

				     grant_ref_t *gnt_refs,

				     unsigned int nr_grefs,

				     void **vaddr)

{

	struct xenbus_map_node *node;

	struct vm_struct *area;

	pte_t *ptes[XENBUS_MAX_RING_GRANTS];

	phys_addr_t phys_addrs[XENBUS_MAX_RING_GRANTS];

	int err = GNTST_okay;

	int i;

	bool leaked;



	*vaddr = NULL;



	if (nr_grefs > XENBUS_MAX_RING_GRANTS)

		return -EINVAL;



	node = kzalloc(sizeof(*node), GFP_KERNEL);

	if (!node)

		return -ENOMEM;



	area = alloc_vm_area(XEN_PAGE_SIZE * nr_grefs, ptes);

	if (!area) {

		kfree(node);

		return -ENOMEM;

	}



	for (i = 0; i < nr_grefs; i++)

		phys_addrs[i] = arbitrary_virt_to_machine(ptes[i]).maddr;



	err = __xenbus_map_ring(dev, gnt_refs, nr_grefs, node->handles,

				phys_addrs,

				GNTMAP_host_map | GNTMAP_contains_pte,

				&leaked);

	if (err)

		goto failed;



	node->nr_handles = nr_grefs;

	node->pv.area = area;



	spin_lock(&xenbus_valloc_lock);

	list_add(&node->next, &xenbus_valloc_pages);

	spin_unlock(&xenbus_valloc_lock);



	*vaddr = area->addr;

	return 0;



failed:

	if (!leaked)

		free_vm_area(area);

	else

		pr_alert("leaking VM area %p size %u page(s)", area, nr_grefs);



	kfree(node);

	return err;

}



static int xenbus_unmap_ring_vfree_pv(struct xenbus_device *dev, void *vaddr)

{

	struct xenbus_map_node *node;
@@ -788,6 +789,12 @@ static int xenbus_unmap_ring_vfree_pv(struct xenbus_device *dev, void *vaddr) 
	return err;

}



static const struct xenbus_ring_ops ring_ops_pv = {

	.map = xenbus_map_ring_valloc_pv,

	.unmap = xenbus_unmap_ring_vfree_pv,

};

#endif



struct unmap_ring_vfree_hvm

{

	unsigned int idx;
@@ -916,11 +923,6 @@ enum xenbus_state xenbus_read_driver_state(const char *path) 
}

EXPORT_SYMBOL_GPL(xenbus_read_driver_state);



static const struct xenbus_ring_ops ring_ops_pv = {

	.map = xenbus_map_ring_valloc_pv,

	.unmap = xenbus_unmap_ring_vfree_pv,

};



static const struct xenbus_ring_ops ring_ops_hvm = {

	.map = xenbus_map_ring_valloc_hvm,

	.unmap = xenbus_unmap_ring_vfree_hvm,
@@ -928,8 +930,10 @@ static const struct xenbus_ring_ops ring_ops_hvm = { 


void __init xenbus_ring_ops_init(void)

{

#ifdef CONFIG_XEN_PV

	if (!xen_feature(XENFEAT_auto_translated_physmap))

		ring_ops = &ring_ops_pv;

	else

#endif

		ring_ops = &ring_ops_hvm;

}

include/xen/arm/page.h

+0 −10
Original line number Diff line number Diff line
@@ -84,16 +84,6 @@ static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr) 
	BUG();

}



/* TODO: this shouldn't be here but it is because the frontend drivers

 * are using it (its rolled in headers) even though we won't hit the code path.

 * So for right now just punt with this.

 */

static inline pte_t *lookup_address(unsigned long address, unsigned int *level)

{

	BUG();

	return NULL;

}



extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,

				   struct gnttab_map_grant_ref *kmap_ops,

				   struct page **pages, unsigned int count);

CRA Git | Maintained and supported by SUSTech CRA and CCSE