Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'kvm-s390-next-4.12-2' of... 

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

KVM: s390: Guarded storage fixup and keyless subset mode

- detect and use the keyless subset mode (guests without
  storage keys)
- fix vSIE support for sdnxc
- fix machine check data for guarded storage
parents ec594c47 730cd632

arch/s390/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ struct esca_block { 
#define CPUSTAT_SLSR       0x00002000

#define CPUSTAT_ZARCH      0x00000800

#define CPUSTAT_MCDS       0x00000100

#define CPUSTAT_KSS        0x00000200

#define CPUSTAT_SM         0x00000080

#define CPUSTAT_IBS        0x00000040

#define CPUSTAT_GED2       0x00000010
@@ -185,6 +186,7 @@ struct kvm_s390_sie_block { 
#define ICPT_OPEREXC	0x2C

#define ICPT_PARTEXEC	0x38

#define ICPT_IOINST	0x40

#define ICPT_KSS	0x5c

	__u8	icptcode;		/* 0x0050 */

	__u8	icptstatus;		/* 0x0051 */

	__u16	ihcpu;			/* 0x0052 */

arch/s390/include/asm/sclp.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct sclp_info { 
	unsigned char has_pfmfi : 1;

	unsigned char has_ibs : 1;

	unsigned char has_skey : 1;

	unsigned char has_kss : 1;

	unsigned int ibc;

	unsigned int mtid;

	unsigned int mtid_cp;

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

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ struct kvm_s390_vm_cpu_machine { 
#define KVM_S390_VM_CPU_FEAT_CMMA	10

#define KVM_S390_VM_CPU_FEAT_PFMFI	11

#define KVM_S390_VM_CPU_FEAT_SIGPIF	12

#define KVM_S390_VM_CPU_FEAT_KSS	13

struct kvm_s390_vm_cpu_feat {

	__u64 feat[16];

};

arch/s390/kvm/intercept.c

+3 −0
Original line number Diff line number Diff line
@@ -426,6 +426,9 @@ int kvm_handle_sie_intercept(struct kvm_vcpu *vcpu) 
	case ICPT_PARTEXEC:

		rc = handle_partial_execution(vcpu);

		break;

	case ICPT_KSS:

		rc = kvm_s390_skey_check_enable(vcpu);

		break;

	default:

		return -EOPNOTSUPP;

	}

arch/s390/kvm/interrupt.c

+2 −0
Original line number Diff line number Diff line
@@ -419,6 +419,8 @@ static int __write_machine_check(struct kvm_vcpu *vcpu, 
	/* take care of lazy register loading */

	save_fpu_regs();

	save_access_regs(vcpu->run->s.regs.acrs);

	if (MACHINE_HAS_GS && vcpu->arch.gs_enabled)

		save_gs_cb(current->thread.gs_cb);



	/* Extended save area */

	rc = read_guest_lc(vcpu, __LC_MCESAD, &ext_sa_addr,