Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 paravirt updates from Ingo Molnar:
 "Two main changes:

   - Remove no longer used parts of the paravirt infrastructure and put
     large quantities of paravirt ops under a new config option
     PARAVIRT_XXL=y, which is selected by XEN_PV only. (Joergen Gross)

   - Enable PV spinlocks on Hyperv (Yi Sun)"

* 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/hyperv: Enable PV qspinlock for Hyper-V
  x86/hyperv: Add GUEST_IDLE_MSR support
  x86/paravirt: Clean up native_patch()
  x86/paravirt: Prevent redefinition of SAVE_FLAGS macro
  x86/xen: Make xen_reservation_lock static
  x86/paravirt: Remove unneeded mmu related paravirt ops bits
  x86/paravirt: Move the Xen-only pv_mmu_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move the pv_irq_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move the Xen-only pv_cpu_ops under the PARAVIRT_XXL umbrella
  x86/paravirt: Move items in pv_info under PARAVIRT_XXL umbrella
  x86/paravirt: Introduce new config option PARAVIRT_XXL
  x86/paravirt: Remove unused paravirt bits
  x86/paravirt: Use a single ops structure
  x86/paravirt: Remove clobbers from struct paravirt_patch_site
  x86/paravirt: Remove clobbers parameter from paravirt patch functions
  x86/paravirt: Make paravirt_patch_call() and paravirt_patch_jmp() static
  x86/xen: Add SPDX identifier in arch/x86/xen files
  x86/xen: Link platform-pci-unplug.o only if CONFIG_XEN_PVHVM
  x86/xen: Move pv specific parts of arch/x86/xen/mmu.c to mmu_pv.c
  x86/xen: Move pv irq related functions under CONFIG_XEN_PV umbrella

3 files changed, 90 insertions, 51 deletions

diff --git a/include/xen/events.h b/include/xen/events.h
index c3e6bc643a7b..a48897199975 100644
--- a/include/xen/events.h
+++ b/include/xen/events.h
@@ -89,11 +89,13 @@ unsigned irq_from_evtchn(unsigned int evtchn);
 int irq_from_virq(unsigned int cpu, unsigned int virq);
 unsigned int evtchn_from_irq(unsigned irq);
 
+#ifdef CONFIG_XEN_PVHVM
 /* Xen HVM evtchn vector callback */
 void xen_hvm_callback_vector(void);
 #ifdef CONFIG_TRACING
 #define trace_xen_hvm_callback_vector xen_hvm_callback_vector
 #endif
+#endif
 int xen_set_callback_via(uint64_t via);
 void xen_evtchn_do_upcall(struct pt_regs *regs);
 void xen_hvm_evtchn_do_upcall(void);
diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
index 4c5751c26f87..447004861f00 100644
--- a/include/xen/interface/memory.h
+++ b/include/xen/interface/memory.h
@@ -245,12 +245,6 @@ DEFINE_GUEST_HANDLE_STRUCT(xen_memory_map);
 
 
 /*
- * Prevent the balloon driver from changing the memory reservation
- * during a driver critical region.
- */
-extern spinlock_t xen_reservation_lock;
-
-/*
  * Unmaps the page appearing at a particular GPFN from the specified guest's
  * pseudophysical address space.
  * arg == addr of xen_remove_from_physmap_t.
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index fd18c974a619..18803ff76e27 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -5,6 +5,7 @@
 #include <linux/percpu.h>
 #include <linux/notifier.h>
 #include <linux/efi.h>
+#include <xen/features.h>
 #include <asm/xen/interface.h>
 #include <xen/interface/vcpu.h>
 
@@ -47,6 +48,10 @@ int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order,
                                 dma_addr_t *dma_handle);
 
 void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order);
+
+int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
+                  xen_pfn_t *pfn, int nr, int *err_ptr, pgprot_t prot,
+                  unsigned int domid, bool no_translate, struct page **pages);
 #else
 static inline int xen_create_contiguous_region(phys_addr_t pstart,
                                                unsigned int order,
@@ -58,10 +63,50 @@ static inline int xen_create_contiguous_region(phys_addr_t pstart,
 
 static inline void xen_destroy_contiguous_region(phys_addr_t pstart,
                                                  unsigned int order) { }
+
+static inline int xen_remap_pfn(struct vm_area_struct *vma, unsigned long addr,
+                                xen_pfn_t *pfn, int nr, int *err_ptr,
+                                pgprot_t prot,  unsigned int domid,
+                                bool no_translate, struct page **pages)
+{
+        BUG();
+        return 0;
+}
 #endif
 
 struct vm_area_struct;
 
+#ifdef CONFIG_XEN_AUTO_XLATE
+int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
+                              unsigned long addr,
+                              xen_pfn_t *gfn, int nr,
+                              int *err_ptr, pgprot_t prot,
+                              unsigned int domid,
+                              struct page **pages);
+int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
+                              int nr, struct page **pages);
+#else
+/*
+ * These two functions are called from arch/x86/xen/mmu.c and so stubs
+ * are needed for a configuration not specifying CONFIG_XEN_AUTO_XLATE.
+ */
+static inline int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
+                                            unsigned long addr,
+                                            xen_pfn_t *gfn, int nr,
+                                            int *err_ptr, pgprot_t prot,
+                                            unsigned int domid,
+                                            struct page **pages)
+{
+        return -EOPNOTSUPP;
+}
+
+static inline int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
+                                            int nr, struct page **pages)
+{
+        return -EOPNOTSUPP;
+}
+#endif
+
 /*
  * xen_remap_domain_gfn_array() - map an array of foreign frames by gfn
  * @vma:     VMA to map the pages into
@@ -79,12 +124,25 @@ struct vm_area_struct;
  * Returns the number of successfully mapped frames, or a -ve error
  * code.
  */
-int xen_remap_domain_gfn_array(struct vm_area_struct *vma,
-                               unsigned long addr,
-                               xen_pfn_t *gfn, int nr,
-                               int *err_ptr, pgprot_t prot,
-                               unsigned domid,
-                               struct page **pages);
+static inline int xen_remap_domain_gfn_array(struct vm_area_struct *vma,
+                                             unsigned long addr,
+                                             xen_pfn_t *gfn, int nr,
+                                             int *err_ptr, pgprot_t prot,
+                                             unsigned int domid,
+                                             struct page **pages)
+{
+        if (xen_feature(XENFEAT_auto_translated_physmap))
+                return xen_xlate_remap_gfn_array(vma, addr, gfn, nr, err_ptr,
+                                                 prot, domid, pages);
+
+        /* We BUG_ON because it's a programmer error to pass a NULL err_ptr,
+         * and the consequences later is quite hard to detect what the actual
+         * cause of "wrong memory was mapped in".
+         */
+        BUG_ON(err_ptr == NULL);
+        return xen_remap_pfn(vma, addr, gfn, nr, err_ptr, prot, domid,
+                             false, pages);
+}
 
 /*
  * xen_remap_domain_mfn_array() - map an array of foreign frames by mfn
@@ -103,10 +161,18 @@ int xen_remap_domain_gfn_array(struct vm_area_struct *vma,
  * Returns the number of successfully mapped frames, or a -ve error
  * code.
  */
-int xen_remap_domain_mfn_array(struct vm_area_struct *vma,
-                               unsigned long addr, xen_pfn_t *mfn, int nr,
-                               int *err_ptr, pgprot_t prot,
-                               unsigned int domid, struct page **pages);
+static inline int xen_remap_domain_mfn_array(struct vm_area_struct *vma,
+                                             unsigned long addr, xen_pfn_t *mfn,
+                                             int nr, int *err_ptr,
+                                             pgprot_t prot, unsigned int domid,
+                                             struct page **pages)
+{
+        if (xen_feature(XENFEAT_auto_translated_physmap))
+                return -EOPNOTSUPP;
+
+        return xen_remap_pfn(vma, addr, mfn, nr, err_ptr, prot, domid,
+                             true, pages);
+}
 
 /* xen_remap_domain_gfn_range() - map a range of foreign frames
  * @vma:     VMA to map the pages into
@@ -120,44 +186,21 @@ int xen_remap_domain_mfn_array(struct vm_area_struct *vma,
  * Returns the number of successfully mapped frames, or a -ve error
  * code.
  */
-int xen_remap_domain_gfn_range(struct vm_area_struct *vma,
-                               unsigned long addr,
-                               xen_pfn_t gfn, int nr,
-                               pgprot_t prot, unsigned domid,
-                               struct page **pages);
-int xen_unmap_domain_gfn_range(struct vm_area_struct *vma,
-                               int numpgs, struct page **pages);
-
-#ifdef CONFIG_XEN_AUTO_XLATE
-int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
-                              unsigned long addr,
-                              xen_pfn_t *gfn, int nr,
-                              int *err_ptr, pgprot_t prot,
-                              unsigned domid,
-                              struct page **pages);
-int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
-                              int nr, struct page **pages);
-#else
-/*
- * These two functions are called from arch/x86/xen/mmu.c and so stubs
- * are needed for a configuration not specifying CONFIG_XEN_AUTO_XLATE.
- */
-static inline int xen_xlate_remap_gfn_array(struct vm_area_struct *vma,
-                                            unsigned long addr,
-                                            xen_pfn_t *gfn, int nr,
-                                            int *err_ptr, pgprot_t prot,
-                                            unsigned int domid,
-                                            struct page **pages)
+static inline int xen_remap_domain_gfn_range(struct vm_area_struct *vma,
+                                             unsigned long addr,
+                                             xen_pfn_t gfn, int nr,
+                                             pgprot_t prot, unsigned int domid,
+                                             struct page **pages)
 {
-        return -EOPNOTSUPP;
-}
+        if (xen_feature(XENFEAT_auto_translated_physmap))
+                return -EOPNOTSUPP;
 
-static inline int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
-                                            int nr, struct page **pages)
-{
-        return -EOPNOTSUPP;
+        return xen_remap_pfn(vma, addr, &gfn, nr, NULL, prot, domid, false,
+                             pages);
 }
-#endif
+
+int xen_unmap_domain_gfn_range(struct vm_area_struct *vma,
+                               int numpgs, struct page **pages);
 
 int xen_xlate_map_ballooned_pages(xen_pfn_t **pfns, void **vaddr,
                                   unsigned long nr_grant_frames);