Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM update from Paolo Bonzini:
 "3.19 changes for KVM:

   - spring cleaning: removed support for IA64, and for hardware-
     assisted virtualization on the PPC970

   - ARM, PPC, s390 all had only small fixes

  For x86:
   - small performance improvements (though only on weird guests)
   - usual round of hardware-compliancy fixes from Nadav
   - APICv fixes
   - XSAVES support for hosts and guests.  XSAVES hosts were broken
     because the (non-KVM) XSAVES patches inadvertently changed the KVM
     userspace ABI whenever XSAVES was enabled; hence, this part is
     going to stable.  Guest support is just a matter of exposing the
     feature and CPUID leaves support"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (179 commits)
  KVM: move APIC types to arch/x86/
  KVM: PPC: Book3S: Enable in-kernel XICS emulation by default
  KVM: PPC: Book3S HV: Improve H_CONFER implementation
  KVM: PPC: Book3S HV: Fix endianness of instruction obtained from HEIR register
  KVM: PPC: Book3S HV: Remove code for PPC970 processors
  KVM: PPC: Book3S HV: Tracepoints for KVM HV guest interactions
  KVM: PPC: Book3S HV: Simplify locking around stolen time calculations
  arch: powerpc: kvm: book3s_paired_singles.c: Remove unused function
  arch: powerpc: kvm: book3s_pr.c: Remove unused function
  arch: powerpc: kvm: book3s.c: Remove some unused functions
  arch: powerpc: kvm: book3s_32_mmu.c: Remove unused function
  KVM: PPC: Book3S HV: Check wait conditions before sleeping in kvmppc_vcore_blocked
  KVM: PPC: Book3S HV: ptes are big endian
  KVM: PPC: Book3S HV: Fix inaccuracies in ICP emulation for H_IPI
  KVM: PPC: Book3S HV: Fix KSM memory corruption
  KVM: PPC: Book3S HV: Fix an issue where guest is paused on receiving HMI
  KVM: PPC: Book3S HV: Fix computation of tlbie operand
  KVM: PPC: Book3S HV: Add missing HPTE unlock
  KVM: PPC: BookE: Improve irq inject tracepoint
  arm/arm64: KVM: Require in-kernel vgic for the arch timers
  ...

1 files changed, 40 insertions, 1 deletions

diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 71c7eff2c89f..be99357d238c 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -844,7 +844,7 @@ int set_guest_storage_key(struct mm_struct *mm, unsigned long addr,
 
         down_read(&mm->mmap_sem);
 retry:
-        ptep = get_locked_pte(current->mm, addr, &ptl);
+        ptep = get_locked_pte(mm, addr, &ptl);
         if (unlikely(!ptep)) {
                 up_read(&mm->mmap_sem);
                 return -EFAULT;
@@ -888,6 +888,45 @@ retry:
 }
 EXPORT_SYMBOL(set_guest_storage_key);
 
+unsigned long get_guest_storage_key(struct mm_struct *mm, unsigned long addr)
+{
+        spinlock_t *ptl;
+        pgste_t pgste;
+        pte_t *ptep;
+        uint64_t physaddr;
+        unsigned long key = 0;
+
+        down_read(&mm->mmap_sem);
+        ptep = get_locked_pte(mm, addr, &ptl);
+        if (unlikely(!ptep)) {
+                up_read(&mm->mmap_sem);
+                return -EFAULT;
+        }
+        pgste = pgste_get_lock(ptep);
+
+        if (pte_val(*ptep) & _PAGE_INVALID) {
+                key |= (pgste_val(pgste) & PGSTE_ACC_BITS) >> 56;
+                key |= (pgste_val(pgste) & PGSTE_FP_BIT) >> 56;
+                key |= (pgste_val(pgste) & PGSTE_GR_BIT) >> 48;
+                key |= (pgste_val(pgste) & PGSTE_GC_BIT) >> 48;
+        } else {
+                physaddr = pte_val(*ptep) & PAGE_MASK;
+                key = page_get_storage_key(physaddr);
+
+                /* Reflect guest's logical view, not physical */
+                if (pgste_val(pgste) & PGSTE_GR_BIT)
+                        key |= _PAGE_REFERENCED;
+                if (pgste_val(pgste) & PGSTE_GC_BIT)
+                        key |= _PAGE_CHANGED;
+        }
+
+        pgste_set_unlock(ptep, pgste);
+        pte_unmap_unlock(ptep, ptl);
+        up_read(&mm->mmap_sem);
+        return key;
+}
+EXPORT_SYMBOL(get_guest_storage_key);
+
 #else /* CONFIG_PGSTE */
 
 static inline int page_table_with_pgste(struct page *page)