Commit e9ba21fb authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-next-6.16-1' of... 

Merge tag 'kvm-s390-next-6.16-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

* Fix interaction between some filesystems and Secure Execution
* Some cleanups and refactorings, preparing for an upcoming big series
parents 8e86e736 d6c80978

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -13102,12 +13102,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
Original line number Diff line number Diff line
@@ -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, unsigned 


void 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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
/* 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/include/asm/tlb.h

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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