Commit bdccc4ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull xen features and fixes from David Vrabel:

 - Reworked handling for foreign (grant mapped) pages to simplify the
   code, enable a number of additional use cases and fix a number of
   long-standing bugs.

 - Prefer the TSC over the Xen PV clock when dom0 (and the TSC is
   stable).

 - Assorted other cleanup and minor bug fixes.

* tag 'stable/for-linus-3.20-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: (25 commits)
  xen/manage: Fix USB interaction issues when resuming
  xenbus: Add proper handling of XS_ERROR from Xenbus for transactions.
  xen/gntdev: provide find_special_page VMA operation
  xen/gntdev: mark userspace PTEs as special on x86 PV guests
  xen-blkback: safely unmap grants in case they are still in use
  xen/gntdev: safely unmap grants in case they are still in use
  xen/gntdev: convert priv->lock to a mutex
  xen/grant-table: add a mechanism to safely unmap pages that are in use
  xen-netback: use foreign page information from the pages themselves
  xen: mark grant mapped pages as foreign
  xen/grant-table: add helpers for allocating pages
  x86/xen: require ballooned pages for grant maps
  xen: remove scratch frames for ballooned pages and m2p override
  xen/grant-table: pre-populate kernel unmap ops for xen_gnttab_unmap_refs()
  mm: add 'foreign' alias for the 'pinned' page flag
  mm: provide a find_special_page vma operation
  x86/xen: cleanup arch/x86/xen/mmu.c
  x86/xen: add some __init annotations in arch/x86/xen/mmu.c
  x86/xen: add some __init and static annotations in arch/x86/xen/setup.c
  x86/xen: use correct types for addresses in arch/x86/xen/setup.c
  ...
parents 98368ab4 72978b2f

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -92,7 +92,7 @@ extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops, 
				   struct page **pages, unsigned int count);

				   struct page **pages, unsigned int count);





extern int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

extern int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

				     struct gnttab_map_grant_ref *kmap_ops,

				     struct gnttab_unmap_grant_ref *kunmap_ops,

				     struct page **pages, unsigned int count);

				     struct page **pages, unsigned int count);





bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);

bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);

arch/arm/xen/enlighten.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,10 +29,10 @@ 




struct start_info _xen_start_info;

struct start_info _xen_start_info;

struct start_info *xen_start_info = &_xen_start_info;

struct start_info *xen_start_info = &_xen_start_info;

EXPORT_SYMBOL_GPL(xen_start_info);

EXPORT_SYMBOL(xen_start_info);





enum xen_domain_type xen_domain_type = XEN_NATIVE;

enum xen_domain_type xen_domain_type = XEN_NATIVE;

EXPORT_SYMBOL_GPL(xen_domain_type);

EXPORT_SYMBOL(xen_domain_type);





struct shared_info xen_dummy_shared_info;

struct shared_info xen_dummy_shared_info;

struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info;

struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info;

arch/arm/xen/mm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order) 
EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region);

EXPORT_SYMBOL_GPL(xen_destroy_contiguous_region);





struct dma_map_ops *xen_dma_ops;

struct dma_map_ops *xen_dma_ops;

EXPORT_SYMBOL_GPL(xen_dma_ops);

EXPORT_SYMBOL(xen_dma_ops);





static struct dma_map_ops xen_swiotlb_dma_ops = {

static struct dma_map_ops xen_swiotlb_dma_ops = {

	.mapping_error = xen_swiotlb_dma_mapping_error,

	.mapping_error = xen_swiotlb_dma_mapping_error,

arch/arm/xen/p2m.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops, 
EXPORT_SYMBOL_GPL(set_foreign_p2m_mapping);

EXPORT_SYMBOL_GPL(set_foreign_p2m_mapping);





int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

			      struct gnttab_map_grant_ref *kmap_ops,

			      struct gnttab_unmap_grant_ref *kunmap_ops,

			      struct page **pages, unsigned int count)

			      struct page **pages, unsigned int count)

{

{

	int i;

	int i;

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

+5 −15
Original line number Original line Diff line number Diff line
@@ -55,9 +55,8 @@ extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops, 
				   struct gnttab_map_grant_ref *kmap_ops,

				   struct gnttab_map_grant_ref *kmap_ops,

				   struct page **pages, unsigned int count);

				   struct page **pages, unsigned int count);

extern int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

extern int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

				     struct gnttab_map_grant_ref *kmap_ops,

				     struct gnttab_unmap_grant_ref *kunmap_ops,

				     struct page **pages, unsigned int count);

				     struct page **pages, unsigned int count);

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





/*

/*

 * Helper functions to write or read unsigned long values to/from

 * Helper functions to write or read unsigned long values to/from
@@ -154,21 +153,12 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) 
		return mfn;

		return mfn;





	pfn = mfn_to_pfn_no_overrides(mfn);

	pfn = mfn_to_pfn_no_overrides(mfn);

	if (__pfn_to_mfn(pfn) != mfn) {

	if (__pfn_to_mfn(pfn) != mfn)

		/*

		pfn = ~0;

		 * If this appears to be a foreign mfn (because the pfn

		 * doesn't map back to the mfn), then check the local override

		 * table to see if there's a better pfn to use.

		 *

		 * m2p_find_override_pfn returns ~0 if it doesn't find anything.

		 */

		pfn = m2p_find_override_pfn(mfn, ~0);

	}





	/*

	/*

	 * pfn is ~0 if there are no entries in the m2p for mfn or if the

	 * pfn is ~0 if there are no entries in the m2p for mfn or the

	 * entry doesn't map back to the mfn and m2p_override doesn't have a

	 * entry doesn't map back to the mfn.

	 * valid entry for it.

	 */

	 */

	if (pfn == ~0 && __pfn_to_mfn(mfn) == IDENTITY_FRAME(mfn))

	if (pfn == ~0 && __pfn_to_mfn(mfn) == IDENTITY_FRAME(mfn))

		pfn = mfn;

		pfn = mfn;