KVM: s390: Some cleanup and small fixes
Claudio Imbrenda
maintainerv5 cover KVM: s390: Some cleanup and small fixes
This series has some cleanups and small fixes in preparation of the upcoming series that will finally completely move all guest page table handling into kvm. The cleaups and fixes in this series are good enough on their own, hence why they are being sent now.
v4->v5
* add missing #include <linux/swap.h> to mm/gmap_helpers.c (thanks kernel test robot)
* fix diag_release_pages(), I had accidentally removed the guest absolute to qemu virtual address translation
* fix patch subject lines (thanks Heiko)
v3->v4
* remove orphaned find_zeropage_ops and find_zeropage_pte_entry() from mm/gmap.c (thanks kernel test robot)
* add missing #include <linux/swapops.h> to mm/gmap_helpers.c (thanks kernel test robot)
v2->v3 (mainly addresses Nina's and Heiko's comments)
* drop patch 3 - it was just an attempt to clean up the code a little and make it more readable, but there were too many issues to address
* remove all dead code from s390/mm/gmap.c that is being replaced by code in s390/mm/gmap_helpers.c
* remove a couple of unused functions from s390/mm/gmap_helpers.c, some of them will be introduced again in a later series when they are actually needed
* added documentation to the functions in s390/mm/gmap_helpers.c
* general readability improvements
v1->v2
* remove uneeded "gmap.h" include from gaccess.c (thanks Christph)
* use a custom helper instead of u64_replace_bits() (thanks Nina)
* new helper functions in priv.c to increase readability (thanks Nina)
* add lockdep assertion in handle_essa() (thanks Nina)
* gmap_helper_disable_cow_sharing() will not take the mmap lock, and must now be called while already holding the mmap lock in write mode
Claudio Imbrenda (4):
s390: Remove unneeded includes
KVM: s390: Remove unneeded srcu lock
KVM: s390: Refactor and split some gmap helpers
KVM: s390: Simplify and move pv code
MAINTAINERS | 2 + arch/s390/include/asm/gmap.h | 2 - arch/s390/include/asm/gmap_helpers.h | 15 ++ arch/s390/include/asm/tlb.h | 1 + arch/s390/include/asm/uv.h | 1 - arch/s390/kernel/uv.c | 12 +- arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/diag.c | 30 +++- arch/s390/kvm/gaccess.c | 3 +- arch/s390/kvm/gmap-vsie.c | 1 - arch/s390/kvm/gmap.c | 121 --------------- arch/s390/kvm/gmap.h | 39 ----- arch/s390/kvm/intercept.c | 9 +- arch/s390/kvm/kvm-s390.c | 10 +- arch/s390/kvm/kvm-s390.h | 42 +++++ arch/s390/kvm/priv.c | 6 +- arch/s390/kvm/pv.c | 61 +++++++- arch/s390/kvm/vsie.c | 19 ++- arch/s390/mm/Makefile | 2 + arch/s390/mm/fault.c | 1 - arch/s390/mm/gmap.c | 185 +--------------------- arch/s390/mm/gmap_helpers.c | 221 +++++++++++++++++++++++++++ arch/s390/mm/init.c | 1 - arch/s390/mm/pgalloc.c | 2 - arch/s390/mm/pgtable.c | 1 - 25 files changed, 410 insertions(+), 379 deletions(-) create mode 100644 arch/s390/include/asm/gmap_helpers.h delete mode 100644 arch/s390/kvm/gmap.c delete mode 100644 arch/s390/kvm/gmap.h create mode 100644 arch/s390/mm/gmap_helpers.c
Signature · 1 line
2.49.0
Claudio Imbrenda
maintainerPATCH v5 1/4 s390: Remove unneeded includes
Many files don't need to include asm/tlb.h or asm/gmap.h. On the other hand, asm/tlb.h does need to include asm/gmap.h.
Remove all unneeded includes so that asm/tlb.h is not directly used by s390 arch code anymore. Remove asm/gmap.h from a few other files as well, so that now only KVM code, mm/gmap.c, and asm/tlb.h include it.
--- arch/s390/include/asm/tlb.h | 1 + arch/s390/include/asm/uv.h | 1 - arch/s390/kvm/intercept.c | 1 + arch/s390/mm/fault.c | 1 - arch/s390/mm/gmap.c | 1 - arch/s390/mm/init.c | 1 - arch/s390/mm/pgalloc.c | 2 -- arch/s390/mm/pgtable.c | 1 - 8 files changed, 2 insertions(+), 7 deletions(-)
arch/s390/include/asm/tlb.h +1 -0
@@ -36,6 +36,7 @@ static inline bool __tlb_remove_folio_pages(struct mmu_gather *tlb,#include <asm/tlbflush.h> #include <asm-generic/tlb.h> +#include <asm/gmap.h> /* * Release the page cache reference for a pte removed by
arch/s390/include/asm/uv.h +0 -1
@@ -16,7 +16,6 @@#include <linux/bug.h> #include <linux/sched.h> #include <asm/page.h> -#include <asm/gmap.h> #include <asm/asm.h> #define UVC_CC_OK 0
arch/s390/kvm/intercept.c +1 -0
@@ -16,6 +16,7 @@#include <asm/irq.h> #include <asm/sysinfo.h> #include <asm/uv.h> +#include <asm/gmap.h> #include "kvm-s390.h" #include "gaccess.h"
arch/s390/mm/fault.c +0 -1
@@ -40,7 +40,6 @@#include <asm/ptrace.h> #include <asm/fault.h> #include <asm/diag.h> -#include <asm/gmap.h> #include <asm/irq.h> #include <asm/facility.h> #include <asm/uv.h>
arch/s390/mm/gmap.c +0 -1
@@ -24,7 +24,6 @@#include <asm/machine.h> #include <asm/gmap.h> #include <asm/page.h> -#include <asm/tlb.h> /* * The address is saved in a radix tree directly; NULL would be ambiguous,
arch/s390/mm/init.c +0 -1
@@ -40,7 +40,6 @@#include <asm/kfence.h> #include <asm/dma.h> #include <asm/abs_lowcore.h> -#include <asm/tlb.h> #include <asm/tlbflush.h> #include <asm/sections.h> #include <asm/sclp.h>
arch/s390/mm/pgalloc.c +0 -2
@@ -12,8 +12,6 @@#include <asm/mmu_context.h> #include <asm/page-states.h> #include <asm/pgalloc.h> -#include <asm/gmap.h> -#include <asm/tlb.h> #include <asm/tlbflush.h> unsigned long *crst_table_alloc (struct mm_struct *mm)
arch/s390/mm/pgtable.c +0 -1
@@ -20,7 +20,6 @@#include <linux/ksm.h> #include <linux/mman.h> -#include <asm/tlb.h> #include <asm/tlbflush.h> #include <asm/mmu_context.h> #include <asm/page-states.h>
Signature · 1 line
2.49.0
Claudio Imbrenda
maintainerPATCH v5 2/4 KVM: s390: Remove unneeded srcu lock
In reply to Claudio ImbrendaAll paths leading to handle_essa() already hold the kvm->srcu. Remove unneeded srcu locking from handle_essa().
Add lockdep assertion to make sure we will always be holding kvm->srcu when entering handle_essa().
--- arch/s390/kvm/priv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/s390/kvm/priv.c +2 -4
@@ -1248,6 +1248,8 @@ static inline int __do_essa(struct kvm_vcpu *vcpu, const int orc)static int handle_essa (struct kvm_vcpu *vcpu) { +lockdep_assert_held (&vcpu->kvm->srcu); +/* entries expected to be 1FF */ int entries = (vcpu->arch.sie_block->cbrlo & ~PAGE_MASK ) >>3 ;unsigned long *cbrlo;
@@ -1297,12 +1299,8 @@ static int handle_essa(struct kvm_vcpu *vcpu)/* Retry the ESSA instruction */ kvm_s390_retry_instr (vcpu); }else { -int srcu_idx; -mmap_read_lock (vcpu->kvm->mm); - srcu_idx =srcu_read_lock (&vcpu->kvm->srcu); i =__do_essa (vcpu, orc); -srcu_read_unlock (&vcpu->kvm->srcu, srcu_idx);mmap_read_unlock (vcpu->kvm->mm);if (i <0 )return i;
Signature · 1 line
2.49.0
Claudio Imbrenda
maintainerPATCH v5 3/4 KVM: s390: Refactor and split some gmap helpers
In reply to Claudio ImbrendaRefactor some gmap functions; move the implementation into a separate file with only helper functions. The new helper functions work on vm addresses, leaving all gmap logic in the gmap functions, which mostly become just wrappers.
The whole gmap handling is going to be moved inside KVM soon, but the helper functions need to touch core mm functions, and thus need to stay in the core of kernel.
--- MAINTAINERS | 2 + arch/s390/include/asm/gmap.h | 2 - arch/s390/include/asm/gmap_helpers.h | 15 ++ arch/s390/kvm/diag.c | 30 +++- arch/s390/kvm/kvm-s390.c | 5 +- arch/s390/mm/Makefile | 2 + arch/s390/mm/gmap.c | 184 +--------------------- arch/s390/mm/gmap_helpers.c | 221 +++++++++++++++++++++++++++ 8 files changed, 274 insertions(+), 187 deletions(-) create mode 100644 arch/s390/include/asm/gmap_helpers.h create mode 100644 arch/s390/mm/gmap_helpers.c
MAINTAINERS +2 -0
@@ -13093,12 +13093,14 @@ S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git F: Documentation/virt/kvm/s390* F: arch/s390/include/asm/gmap.h +F: arch/s390/include/asm/gmap_helpers.h F: arch/s390/include/asm/kvm* F: arch/s390/include/uapi/asm/kvm* F: arch/s390/include/uapi/asm/uvdevice.h F: arch/s390/kernel/uv.c F: arch/s390/kvm/ F: arch/s390/mm/gmap.c +F: arch/s390/mm/gmap_helpers.c F: drivers/s390/char/uvdevice.c F: tools/testing/selftests/drivers/s390x/uvdevice/ F: tools/testing/selftests/kvm/*/s390/
arch/s390/include/asm/gmap.h +0 -2
@@ -110,7 +110,6 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,int gmap_unmap_segment (struct gmap *gmap,unsigned long to,unsigned long len);unsigned long __gmap_translate (struct gmap *,unsigned long gaddr);int __gmap_link (struct gmap *gmap,unsigned long gaddr,unsigned long vmaddr); -void gmap_discard (struct gmap *,unsigned long from,unsigned long to);void __gmap_zap (struct gmap *,unsigned long gaddr);void gmap_unlink (struct mm_struct *,unsigned long *table,unsigned long vmaddr);
@@ -134,7 +133,6 @@ int gmap_protect_one(struct gmap *gmap, unsigned long gaddr, int prot, unsignedvoid gmap_sync_dirty_log_pmd (struct gmap *gmap,unsigned long dirty_bitmap[4 ],unsigned long gaddr,unsigned long vmaddr); -int s390_disable_cow_sharing (void );int s390_replace_asce (struct gmap *gmap);void s390_uv_destroy_pfns (unsigned long count,unsigned long *pfns); int __s390_uv_destroy_range(struct mm_struct *mm, unsigned long start,
arch/s390/include/asm/gmap_helpers.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Helper functions for KVM guest address space mapping code +* +* Copyright IBM Corp. 2025 +*/ + +#ifndef _ASM_S390_GMAP_HELPERS_H +#define _ASM_S390_GMAP_HELPERS_H + +void gmap_helper_zap_one_page (struct mm_struct *mm,unsigned long vmaddr); +void gmap_helper_discard (struct mm_struct *mm,unsigned long vmaddr,unsigned long end); +int gmap_helper_disable_cow_sharing (void ); + +#endif /* _ASM_S390_GMAP_HELPERS_H */
arch/s390/kvm/diag.c +25 -5
@@ -11,12 +11,30 @@#include <linux/kvm.h> #include <linux/kvm_host.h> #include <asm/gmap.h> +#include <asm/gmap_helpers.h> #include <asm/virtio-ccw.h> #include "kvm-s390.h" #include "trace.h" #include "trace-s390.h" #include "gaccess.h" +static void do_discard_gfn_range (struct kvm_vcpu *vcpu,gfn_t gfn_start,gfn_t gfn_end) +{ +struct kvm_memslot_iter iter; +struct kvm_memory_slot *slot; +struct kvm_memslots *slots; +unsigned long start, end; + + slots =kvm_vcpu_memslots (vcpu); + +kvm_for_each_memslot_in_gfn_range (&iter, slots, gfn_start, gfn_end) { + slot = iter.slot; + start =__gfn_to_hva_memslot (slot,max (gfn_start, slot->base_gfn)); + end =__gfn_to_hva_memslot (slot,min (gfn_end, slot->base_gfn + slot->npages)); +gmap_helper_discard (vcpu->kvm->mm, start, end); + } +} +static int diag_release_pages (struct kvm_vcpu *vcpu) {unsigned long start, end;
@@ -32,12 +50,13 @@ static int diag_release_pages(struct kvm_vcpu *vcpu)VCPU_EVENT (vcpu,5 ,"diag release pages %lX %lX" , start, end); +mmap_read_lock (vcpu->kvm->mm);/* * We checked for start >= end above, so lets check for the * fast path (no prefix swap page involved) */ if (end <= prefix || start >= prefix +2 *PAGE_SIZE ) { -gmap_discard (vcpu->arch.gmap, start, end); +do_discard_gfn_range (vcpu,gpa_to_gfn (start),gpa_to_gfn (end)); }else {/* * This is slow path. gmap_discard will check for start
@@ -45,13 +64,14 @@ static int diag_release_pages(struct kvm_vcpu *vcpu)* prefix and let gmap_discard make some of these calls * NOPs. */ -gmap_discard (vcpu->arch.gmap, start, prefix); +do_discard_gfn_range (vcpu,gpa_to_gfn (start),gpa_to_gfn (prefix));if (start <= prefix) -gmap_discard (vcpu->arch.gmap,0 ,PAGE_SIZE ); +do_discard_gfn_range (vcpu,0 ,1 );if (end > prefix +PAGE_SIZE ) -gmap_discard (vcpu->arch.gmap,PAGE_SIZE ,2 *PAGE_SIZE ); -gmap_discard (vcpu->arch.gmap, prefix +2 *PAGE_SIZE , end); +do_discard_gfn_range (vcpu,1 ,2 ); +do_discard_gfn_range (vcpu,gpa_to_gfn (prefix) +2 ,gpa_to_gfn (end)); } +mmap_read_unlock (vcpu->kvm->mm);return 0 ; }
arch/s390/kvm/kvm-s390.c +4 -1
@@ -40,6 +40,7 @@#include <asm/machine.h> #include <asm/stp.h> #include <asm/gmap.h> +#include <asm/gmap_helpers.h> #include <asm/nmi.h> #include <asm/isc.h> #include <asm/sclp.h>
@@ -2674,7 +2675,9 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)if (r)break ; - r =s390_disable_cow_sharing (); +mmap_write_lock (kvm->mm); + r =gmap_helper_disable_cow_sharing (); +mmap_write_unlock (kvm->mm);if (r)break ;
arch/s390/mm/Makefile +2 -0
@@ -12,3 +12,5 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_PTDUMP) += dump_pagetables.o obj-$(CONFIG_PGSTE) += gmap.o obj-$(CONFIG_PFAULT) += pfault.o + +obj-$(subst m,y,$(CONFIG_KVM)) += gmap_helpers.o
arch/s390/mm/gmap.c +5 -179
219 lines not on this page · raw message
arch/s390/mm/gmap_helpers.c new file +221 -0
221 lines not on this page · raw message
Signature · 1 line
2.49.0
Re: [PATCH v5 3/4] KVM: s390: Refactor and split some gmap helpers
Quoted 5 lines · Claudio Imbrenda
Refactor some gmap functions; move the implementation into a separate file with only helper functions. The new helper functions work on vm addresses, leaving all gmap logic in the gmap functions, which mostly become just wrappers.
Quoted 8 lines
The whole gmap handling is going to be moved inside KVM soon, but the helper functions need to touch core mm functions, and thus need to stay in the core of kernel.
Signed-off-by Claudio Imbrenda <[email protected]>Reviewed-by Steffen Eiden <[email protected]>Reviewed-by Christoph Schlameuss <[email protected]>---
Quoted 12 lines
MAINTAINERS | 2 + arch/s390/include/asm/gmap.h | 2 - arch/s390/include/asm/gmap_helpers.h | 15 ++ arch/s390/kvm/diag.c | 30 +++- arch/s390/kvm/kvm-s390.c | 5 +- arch/s390/mm/Makefile | 2 + arch/s390/mm/gmap.c | 184 +--------------------- arch/s390/mm/gmap_helpers.c | 221 +++++++++++++++++++++++++++ 8 files changed, 274 insertions(+), 187 deletions(-)create mode 100644
arch/s390/include/asm/gmap_helpers.hcreate mode 100644arch/s390/mm/gmap_helpers.c
[...]
Quoted 8 lines
arch/s390/include/asm/gmap_helpers.h new file +1
-0+#endif /* _ASM_S390_GMAP_HELPERS_H */ arch/s390/kvm/diag.c +0
-0@@ -11,12 +11,30 @@#include <linux/kvm.h> #include <linux/kvm_host.h>
arch/s390/kvm/diag.c line 22
Quoted 10 lines
arch/s390/kvm/diag.c +3
-0#include <asm/gmap.h> +#include <asm/gmap_helpers.h> #include <asm/virtio-ccw.h> #include "kvm-s390.h" #include "trace.h" #include "trace-s390.h" #include "gaccess.h" +static void do_discard_gfn_range (struct kvm_vcpu *vcpu,gfn_t gfn_start,gfn_t gfn_end) +{
A helper function for your helper function :)
Claudio Imbrenda
maintainerPATCH v5 4/4 KVM: s390: Simplify and move pv code
In reply to Claudio ImbrendaAll functions in kvm/gmap.c fit better in kvm/pv.c instead. Move and rename them appropriately, then delete the now empty kvm/gmap.c and kvm/gmap.h.
--- arch/s390/kernel/uv.c | 12 ++-- arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/gaccess.c | 3 +- arch/s390/kvm/gmap-vsie.c | 1 - arch/s390/kvm/gmap.c | 121 -------------------------------------- arch/s390/kvm/gmap.h | 39 ------------ arch/s390/kvm/intercept.c | 10 +--- arch/s390/kvm/kvm-s390.c | 5 +- arch/s390/kvm/kvm-s390.h | 42 +++++++++++++ arch/s390/kvm/pv.c | 61 ++++++++++++++++++- arch/s390/kvm/vsie.c | 19 +++++- 11 files changed, 133 insertions(+), 182 deletions(-) delete mode 100644 arch/s390/kvm/gmap.c delete mode 100644 arch/s390/kvm/gmap.h
arch/s390/kernel/uv.c +6 -6
@@ -135,7 +135,7 @@ int uv_destroy_folio(struct folio *folio) {int rc; -/* See gmap_make_secure(): large folios cannot be secure */ +/* Large folios cannot be secure */ if (unlikely (folio_test_large (folio)))return 0 ;
@@ -184,7 +184,7 @@ int uv_convert_from_secure_folio(struct folio *folio) {int rc; -/* See gmap_make_secure(): large folios cannot be secure */ +/* Large folios cannot be secure */ if (unlikely (folio_test_large (folio)))return 0 ;
@@ -403,15 +403,15 @@ EXPORT_SYMBOL_GPL(make_hva_secure);/* * To be called with the folio locked or with an extra reference! This will -* prevent gmap_make_secure from touching the folio concurrently. Having 2 -* parallel arch_make_folio_accessible is fine, as the UV calls will become a -* no-op if the folio is already exported. +* prevent kvm_s390_pv_make_secure() from touching the folio concurrently. +* Having 2 parallel arch_make_folio_accessible is fine, as the UV calls will +* become a no-op if the folio is already exported. */ int arch_make_folio_accessible (struct folio *folio) {int rc =0 ; -/* See gmap_make_secure(): large folios cannot be secure */ +/* Large folios cannot be secure */ if (unlikely (folio_test_large (folio)))return 0 ;
arch/s390/kvm/Makefile +1 -1
@@ -8,7 +8,7 @@ include $(srctree)/virt/kvm/Makefile.kvm ccflags-y := -Ivirt/kvm -Iarch/s390/kvm kvm-y += kvm-s390.o intercept.o interrupt.o priv.o sigp.o -kvm-y += diag.o gaccess.o guestdbg.o vsie.o pv.o gmap.o gmap-vsie.o +kvm-y += diag.o gaccess.o guestdbg.o vsie.o pv.o gmap-vsie.o kvm-$(CONFIG_VFIO_PCI_ZDEV_KVM) += pci.o obj-$(CONFIG_KVM) += kvm.o
arch/s390/kvm/gaccess.c +2 -1
@@ -16,9 +16,10 @@#include <asm/gmap.h> #include <asm/dat-bits.h> #include "kvm-s390.h" -#include "gmap.h" #include "gaccess.h" +#define GMAP_SHADOW_FAKE_TABLE 1ULL +/* * vaddress union in order to easily decode a virtual address into its * region first index, region second index etc. parts.
arch/s390/kvm/gmap-vsie.c +0 -1
@@ -22,7 +22,6 @@#include <asm/uv.h> #include "kvm-s390.h" -#include "gmap.h" /** * gmap_find_shadow - find a specific asce in the list of shadow tables
arch/s390/kvm/gmap.c deleted +0 -121
121 lines not on this page · raw message
arch/s390/kvm/gmap.h deleted +0 -39
@@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* KVM guest address space mapping code -* -* Copyright IBM Corp. 2007, 2016, 2025 -* Author(s): Martin Schwidefsky <[email protected]> -* Claudio Imbrenda <[email protected]> -*/ - -#ifndef ARCH_KVM_S390_GMAP_H -#define ARCH_KVM_S390_GMAP_H - -#define GMAP_SHADOW_FAKE_TABLE 1ULL - -int gmap_make_secure (struct gmap *gmap,unsigned long gaddr,void *uvcb); -int gmap_convert_to_secure (struct gmap *gmap,unsigned long gaddr); -int gmap_destroy_page (struct gmap *gmap,unsigned long gaddr); -struct gmap *gmap_shadow (struct gmap *parent,unsigned long asce,int edat_level); - -/** -* gmap_shadow_valid - check if a shadow guest address space matches the -* given properties and is still valid -* @sg: pointer to the shadow guest address space structure -* @asce: ASCE for which the shadow table is requested -* @edat_level: edat level to be used for the shadow translation -* -* Returns 1 if the gmap shadow is still valid and matches the given -* properties, the caller can continue using it. Returns 0 otherwise, the -* caller has to request a new shadow gmap in this case. -* -*/ -static inline int gmap_shadow_valid (struct gmap *sg,unsigned long asce,int edat_level) -{ -if (sg->removed) -return 0 ; -return sg->orig_asce == asce && sg->edat_level == edat_level; -} - -#endif
arch/s390/kvm/intercept.c +3 -7
@@ -16,13 +16,11 @@#include <asm/irq.h> #include <asm/sysinfo.h> #include <asm/uv.h> -#include <asm/gmap.h> #include "kvm-s390.h" #include "gaccess.h" #include "trace.h" #include "trace-s390.h" -#include "gmap.h" u8 kvm_s390_get_ilen (struct kvm_vcpu *vcpu) {
@@ -546,7 +544,7 @@ static int handle_pv_uvc(struct kvm_vcpu *vcpu) guest_uvcb->header.cmd);return 0 ; } - rc =gmap_make_secure (vcpu->arch.gmap, uvcb.gaddr, &uvcb); + rc =kvm_s390_pv_make_secure (vcpu->kvm, uvcb.gaddr, &uvcb);/* * If the unpin did not succeed, the guest will exit again for the UVC * and we will retry the unpin.
@@ -654,10 +652,8 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu)break ;case ICPT_PV_PREF : rc =0 ; -gmap_convert_to_secure (vcpu->arch.gmap, -kvm_s390_get_prefix (vcpu)); -gmap_convert_to_secure (vcpu->arch.gmap, -kvm_s390_get_prefix (vcpu) +PAGE_SIZE ); +kvm_s390_pv_convert_to_secure (vcpu->kvm,kvm_s390_get_prefix (vcpu)); +kvm_s390_pv_convert_to_secure (vcpu->kvm,kvm_s390_get_prefix (vcpu) +PAGE_SIZE );break ;default :return -EOPNOTSUPP ;
arch/s390/kvm/kvm-s390.c +2 -3
@@ -53,7 +53,6 @@#include "kvm-s390.h" #include "gaccess.h" #include "pci.h" -#include "gmap.h" #define CREATE_TRACE_POINTS #include "trace.h"
@@ -4976,7 +4975,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu)* previous protected guest. The old pages need to be destroyed * so the new guest can use them. */ -if (gmap_destroy_page (vcpu->arch.gmap, gaddr)) { +if (kvm_s390_pv_destroy_page (vcpu->kvm, gaddr)) {/* * Either KVM messed up the secure guest mapping or the * same page is mapped into multiple secure guests.
@@ -4998,7 +4997,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu)* guest has not been imported yet. Try to import the page into * the protected guest. */ - rc =gmap_convert_to_secure (vcpu->arch.gmap, gaddr); + rc =kvm_s390_pv_convert_to_secure (vcpu->kvm, gaddr);if (rc == -EINVAL )send_sig (SIGSEGV , current,0 );if (rc != -ENXIO )
arch/s390/kvm/kvm-s390.h +42 -0
60 lines not on this page · raw message
arch/s390/kvm/pv.c +59 -2
79 lines not on this page · raw message
arch/s390/kvm/vsie.c +18 -1
@@ -23,7 +23,6 @@#include <asm/facility.h> #include "kvm-s390.h" #include "gaccess.h" -#include "gmap.h" enum vsie_page_flags {VSIE_PAGE_IN_USE =0 ,
@@ -68,6 +67,24 @@ struct vsie_page {__u8 fac[S390_ARCH_FAC_LIST_SIZE_BYTE ];/* 0x0800 */ }; +/** +* gmap_shadow_valid() - check if a shadow guest address space matches the +* given properties and is still valid +* @sg: pointer to the shadow guest address space structure +* @asce: ASCE for which the shadow table is requested +* @edat_level: edat level to be used for the shadow translation +* +* Returns 1 if the gmap shadow is still valid and matches the given +* properties, the caller can continue using it. Returns 0 otherwise; the +* caller has to request a new shadow gmap in this case. +*/ +int gmap_shadow_valid (struct gmap *sg,unsigned long asce,int edat_level) +{ +if (sg->removed) +return 0 ; +return sg->orig_asce == asce && sg->edat_level == edat_level; +} +/* trigger a validity icpt for the given scb */ static int set_validity_icpt (struct kvm_s390_sie_block *scb,__u16 reason_code)
Signature · 1 line
2.49.0
Re: [PATCH v5 4/4] KVM: s390: Simplify and move pv code
Quoted 9 lines · Claudio Imbrenda
All functions in
kvm/gmap.cfit better inkvm/pv.cinstead. Move and rename them appropriately, then delete the now emptykvm/gmap.candkvm/gmap.h.Signed-off-by Claudio Imbrenda <[email protected]>Reviewed-by Nina Schoetterl-Glausch <[email protected]>Reviewed-by Steffen Eiden <[email protected]>Reviewed-by Christoph Schlameuss <[email protected]>---