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

Commit 92ea2b33 authored by Radim Krčmář's avatar Radim Krčmář
Browse files

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

KVM: s390: Fixes and features for 4.16 part 2

- exitless interrupts for emulated devices (Michael Mueller)
- cleanup of cpuflag handling (David Hildenbrand)
- kvm stat counter improvements (Christian Borntraeger)
- vsie improvements (David Hildenbrand)
- mm cleanup (Janosch Frank)
parents d7231e75 4b9f9525

arch/s390/include/asm/bitops.h

+5 −0
Original line number Diff line number Diff line
@@ -261,6 +261,11 @@ static inline void clear_bit_inv(unsigned long nr, volatile unsigned long *ptr) 
	return clear_bit(nr ^ (BITS_PER_LONG - 1), ptr);

}



static inline int test_and_clear_bit_inv(unsigned long nr, volatile unsigned long *ptr)

{

	return test_and_clear_bit(nr ^ (BITS_PER_LONG - 1), ptr);

}



static inline void __set_bit_inv(unsigned long nr, volatile unsigned long *ptr)

{

	return __set_bit(nr ^ (BITS_PER_LONG - 1), ptr);

arch/s390/include/asm/css_chars.h

+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ struct css_general_char { 
	u32 aif_tdd : 1; /* bit 56 */

	u32 : 1;

	u32 qebsm : 1;	 /* bit 58 */

	u32 : 8;

	u32 : 2;

	u32 aiv : 1;     /* bit 61 */

	u32 : 5;

	u32 aif_osa : 1; /* bit 67 */

	u32 : 12;

	u32 eadm_rf : 1; /* bit 80 */

arch/s390/include/asm/kvm_host.h

+88 −35
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * definition for kernel virtual machines on s390

 *

 * Copyright IBM Corp. 2008, 2009

 * Copyright IBM Corp. 2008, 2018

 *

 *    Author(s): Carsten Otte <cotte@de.ibm.com>

 */
@@ -183,6 +183,7 @@ struct kvm_s390_sie_block { 
#define ECA_IB		0x40000000

#define ECA_SIGPI	0x10000000

#define ECA_MVPGI	0x01000000

#define ECA_AIV		0x00200000

#define ECA_VX		0x00020000

#define ECA_PROTEXCI	0x00002000

#define ECA_SII		0x00000001
@@ -227,7 +228,9 @@ struct kvm_s390_sie_block { 
	__u8    epdx;			/* 0x0069 */

	__u8    reserved6a[2];		/* 0x006a */

	__u32	todpr;			/* 0x006c */

	__u8	reserved70[16];		/* 0x0070 */

#define GISA_FORMAT1 0x00000001

	__u32	gd;			/* 0x0070 */

	__u8	reserved74[12];		/* 0x0074 */

	__u64	mso;			/* 0x0080 */

	__u64	msl;			/* 0x0088 */

	psw_t	gpsw;			/* 0x0090 */
@@ -316,18 +319,30 @@ struct kvm_vcpu_stat { 
	u64 deliver_program_int;

	u64 deliver_io_int;

	u64 exit_wait_state;

	u64 instruction_epsw;

	u64 instruction_gs;

	u64 instruction_io_other;

	u64 instruction_lpsw;

	u64 instruction_lpswe;

	u64 instruction_pfmf;

	u64 instruction_ptff;

	u64 instruction_sck;

	u64 instruction_sckpf;

	u64 instruction_stidp;

	u64 instruction_spx;

	u64 instruction_stpx;

	u64 instruction_stap;

	u64 instruction_storage_key;

	u64 instruction_iske;

	u64 instruction_ri;

	u64 instruction_rrbe;

	u64 instruction_sske;

	u64 instruction_ipte_interlock;

	u64 instruction_stsch;

	u64 instruction_chsc;

	u64 instruction_stsi;

	u64 instruction_stfl;

	u64 instruction_tb;

	u64 instruction_tpi;

	u64 instruction_tprot;

	u64 instruction_tsch;

	u64 instruction_sie;

	u64 instruction_essa;

	u64 instruction_sthyi;
@@ -353,6 +368,7 @@ struct kvm_vcpu_stat { 
	u64 diagnose_258;

	u64 diagnose_308;

	u64 diagnose_500;

	u64 diagnose_other;

};



#define PGM_OPERATION			0x01
@@ -409,35 +425,35 @@ struct kvm_vcpu_stat { 
#define PGM_PER				0x80

#define PGM_CRYPTO_OPERATION		0x119



/* irq types in order of priority */

/* irq types in ascend order of priorities */

enum irq_types {

	IRQ_PEND_MCHK_EX = 0,

	IRQ_PEND_SVC,

	IRQ_PEND_PROG,

	IRQ_PEND_MCHK_REP,

	IRQ_PEND_EXT_IRQ_KEY,

	IRQ_PEND_EXT_MALFUNC,

	IRQ_PEND_EXT_EMERGENCY,

	IRQ_PEND_EXT_EXTERNAL,

	IRQ_PEND_EXT_CLOCK_COMP,

	IRQ_PEND_EXT_CPU_TIMER,

	IRQ_PEND_EXT_TIMING,

	IRQ_PEND_EXT_SERVICE,

	IRQ_PEND_EXT_HOST,

	IRQ_PEND_PFAULT_INIT,

	IRQ_PEND_PFAULT_DONE,

	IRQ_PEND_VIRTIO,

	IRQ_PEND_IO_ISC_0,

	IRQ_PEND_IO_ISC_1,

	IRQ_PEND_IO_ISC_2,

	IRQ_PEND_IO_ISC_3,

	IRQ_PEND_IO_ISC_4,

	IRQ_PEND_IO_ISC_5,

	IRQ_PEND_IO_ISC_6,

	IRQ_PEND_IO_ISC_7,

	IRQ_PEND_SIGP_STOP,

	IRQ_PEND_SET_PREFIX = 0,

	IRQ_PEND_RESTART,

	IRQ_PEND_SET_PREFIX,

	IRQ_PEND_SIGP_STOP,

	IRQ_PEND_IO_ISC_7,

	IRQ_PEND_IO_ISC_6,

	IRQ_PEND_IO_ISC_5,

	IRQ_PEND_IO_ISC_4,

	IRQ_PEND_IO_ISC_3,

	IRQ_PEND_IO_ISC_2,

	IRQ_PEND_IO_ISC_1,

	IRQ_PEND_IO_ISC_0,

	IRQ_PEND_VIRTIO,

	IRQ_PEND_PFAULT_DONE,

	IRQ_PEND_PFAULT_INIT,

	IRQ_PEND_EXT_HOST,

	IRQ_PEND_EXT_SERVICE,

	IRQ_PEND_EXT_TIMING,

	IRQ_PEND_EXT_CPU_TIMER,

	IRQ_PEND_EXT_CLOCK_COMP,

	IRQ_PEND_EXT_EXTERNAL,

	IRQ_PEND_EXT_EMERGENCY,

	IRQ_PEND_EXT_MALFUNC,

	IRQ_PEND_EXT_IRQ_KEY,

	IRQ_PEND_MCHK_REP,

	IRQ_PEND_PROG,

	IRQ_PEND_SVC,

	IRQ_PEND_MCHK_EX,

	IRQ_PEND_COUNT

};
@@ -703,14 +719,50 @@ struct kvm_s390_crypto_cb { 
	struct kvm_s390_apcb1 apcb1;		/* 0x0080 */

};



struct kvm_s390_gisa {

	union {

		struct { /* common to all formats */

			u32 next_alert;

			u8  ipm;

			u8  reserved01[2];

			u8  iam;

		};

		struct { /* format 0 */

			u32 next_alert;

			u8  ipm;

			u8  reserved01;

			u8  : 6;

			u8  g : 1;

			u8  c : 1;

			u8  iam;

			u8  reserved02[4];

			u32 airq_count;

		} g0;

		struct { /* format 1 */

			u32 next_alert;

			u8  ipm;

			u8  simm;

			u8  nimm;

			u8  iam;

			u8  aism[8];

			u8  : 6;

			u8  g : 1;

			u8  c : 1;

			u8  reserved03[11];

			u32 airq_count;

		} g1;

	};

};



/*

 * sie_page2 has to be allocated as DMA because fac_list and crycb need

 * 31bit addresses in the sie control block.

 * sie_page2 has to be allocated as DMA because fac_list, crycb and

 * gisa need 31bit addresses in the sie control block.

 */

struct sie_page2 {

	__u64 fac_list[S390_ARCH_FAC_LIST_SIZE_U64];	/* 0x0000 */

	struct kvm_s390_crypto_cb crycb;		/* 0x0800 */

	u8 reserved900[0x1000 - 0x900];			/* 0x0900 */

	struct kvm_s390_gisa gisa;			/* 0x0900 */

	u8 reserved920[0x1000 - 0x920];			/* 0x0920 */

};



struct kvm_s390_vsie {
@@ -757,6 +809,7 @@ struct kvm_arch{ 
	struct kvm_s390_migration_state *migration_state;

	/* subset of available cpu features enabled by user space */

	DECLARE_BITMAP(cpu_feat, KVM_S390_VM_CPU_FEAT_NR_BITS);

	struct kvm_s390_gisa *gisa;

};



#define KVM_HVA_ERR_BAD		(-1UL)

arch/s390/include/asm/sclp.h

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

	unsigned char has_skey : 1;

	unsigned char has_kss : 1;

	unsigned char has_gisaf : 1;

	unsigned int ibc;

	unsigned int mtid;

	unsigned int mtid_cp;

arch/s390/kvm/diag.c

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ int kvm_s390_handle_diag(struct kvm_vcpu *vcpu) 
	case 0x500:

		return __diag_virtio_hypercall(vcpu);

	default:

		vcpu->stat.diagnose_other++;

		return -EOPNOTSUPP;

	}

}