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

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

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

KVM: s390: Features and fixes for 5.2

- VSIE crypto fixes
- new guest features for gen15
- disable halt polling for nested virtualization with overcommit
parents c110ae57 b2d0371d

Documentation/virtual/kvm/devices/vm.txt

+2 −1
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ struct kvm_s390_vm_cpu_subfunc { 
       u8 pcc[16];           # valid with Message-Security-Assist-Extension 4

       u8 ppno[16];          # valid with Message-Security-Assist-Extension 5

       u8 kma[16];           # valid with Message-Security-Assist-Extension 8

       u8 reserved[1808];    # reserved for future instructions

       u8 kdsa[16];          # valid with Message-Security-Assist-Extension 9

       u8 reserved[1792];    # reserved for future instructions

};



Parameters: address of a buffer to load the subfunction blocks from.

arch/s390/include/asm/cpacf.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define CPACF_KMCTR		0xb92d		/* MSA4 */

#define CPACF_PRNO		0xb93c		/* MSA5 */

#define CPACF_KMA		0xb929		/* MSA8 */

#define CPACF_KDSA		0xb93a		/* MSA9 */



/*

 * En/decryption modifier bits

arch/s390/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ struct kvm_s390_sie_block { 
#define ECD_HOSTREGMGMT	0x20000000

#define ECD_MEF		0x08000000

#define ECD_ETOKENF	0x02000000

#define ECD_ECC		0x00200000

	__u32	ecd;			/* 0x01c8 */

	__u8	reserved1cc[18];	/* 0x01cc */

	__u64	pp;			/* 0x01de */
@@ -312,6 +313,7 @@ struct kvm_vcpu_stat { 
	u64 halt_successful_poll;

	u64 halt_attempted_poll;

	u64 halt_poll_invalid;

	u64 halt_no_poll_steal;

	u64 halt_wakeup;

	u64 instruction_lctl;

	u64 instruction_lctlg;

arch/s390/include/uapi/asm/kvm.h

+4 −1
Original line number Diff line number Diff line
@@ -152,7 +152,10 @@ struct kvm_s390_vm_cpu_subfunc { 
	__u8 pcc[16];		/* with MSA4 */

	__u8 ppno[16];		/* with MSA5 */

	__u8 kma[16];		/* with MSA8 */

	__u8 reserved[1808];

	__u8 kdsa[16];		/* with MSA9 */

	__u8 sortl[32];		/* with STFLE.150 */

	__u8 dfltcc[32];	/* with STFLE.151 */

	__u8 reserved[1728];

};



/* kvm attributes for crypto */

arch/s390/kvm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ config KVM 
	select HAVE_KVM_IRQFD

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_INVALID_WAKEUPS

	select HAVE_KVM_NO_POLL

	select SRCU

	select KVM_VFIO

	---help---