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. 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 (5): s390: remove unneeded includes KVM: s390: remove unneeded srcu lock KVM: s390: refactor some functions in priv.c KVM: s390: refactor and split some gmap helpers KVM: s390: simplify and move pv code MAINTAINERS | 2 + arch/s390/include/asm/gmap_helpers.h | 18 ++ 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 | 11 +- 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 | 57 ++++++ arch/s390/kvm/priv.c | 287 +++++++++++++-------------- 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 | 47 +---- arch/s390/mm/gmap_helpers.c | 259 ++++++++++++++++++++++++ arch/s390/mm/init.c | 1 - arch/s390/mm/pgalloc.c | 2 - arch/s390/mm/pgtable.c | 1 - 24 files changed, 591 insertions(+), 376 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 -- 2.49.0
