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

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

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

From: Christian Borntraeger <borntraeger@de.ibm.com>

KVM: s390: features for 4.12

1. guarded storage support for guests
   This contains an s390 base Linux feature branch that is necessary
   to implement the KVM part
2. Provide an interface to implement adapter interruption suppression
   which is necessary for proper zPCI support
3. Use more defines instead of numbers
4. Provide logging for lazy enablement of runtime instrumentation
parents 28d06353 47a4693e

Documentation/virtual/kvm/api.txt

+17 −0
Original line number Diff line number Diff line
@@ -3983,6 +3983,23 @@ to take care of that. 
This capability can be enabled dynamically even if VCPUs were already

created and are running.



7.9 KVM_CAP_S390_GS



Architectures: s390

Parameters: none

Returns: 0 on success; -EINVAL if the machine does not support

	 guarded storage; -EBUSY if a VCPU has already been created.



Allows use of guarded storage for the KVM guest.



7.10 KVM_CAP_S390_AIS



Architectures: s390

Parameters: none



Allow use of adapter-interruption suppression.

Returns: 0 on success; -EBUSY if a VCPU has already been created.



8. Other capabilities.

----------------------

Documentation/virtual/kvm/devices/s390_flic.txt

+38 −3
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ FLIC provides support to 
- purge one pending floating I/O interrupt (KVM_DEV_FLIC_CLEAR_IO_IRQ)

- enable/disable for the guest transparent async page faults

- register and modify adapter interrupt sources (KVM_DEV_FLIC_ADAPTER_*)

- modify AIS (adapter-interruption-suppression) mode state (KVM_DEV_FLIC_AISM)

- inject adapter interrupts on a specified adapter (KVM_DEV_FLIC_AIRQ_INJECT)



Groups:

  KVM_DEV_FLIC_ENQUEUE
@@ -64,12 +66,18 @@ struct kvm_s390_io_adapter { 
	__u8 isc;

	__u8 maskable;

	__u8 swap;

	__u8 pad;

	__u8 flags;

};



   id contains the unique id for the adapter, isc the I/O interruption subclass

   to use, maskable whether this adapter may be masked (interrupts turned off)

   and swap whether the indicators need to be byte swapped.

   to use, maskable whether this adapter may be masked (interrupts turned off),

   swap whether the indicators need to be byte swapped, and flags contains

   further characteristics of the adapter.

   Currently defined values for 'flags' are:

   - KVM_S390_ADAPTER_SUPPRESSIBLE: adapter is subject to AIS

     (adapter-interrupt-suppression) facility. This flag only has an effect if

     the AIS capability is enabled.

   Unknown flag values are ignored.





  KVM_DEV_FLIC_ADAPTER_MODIFY
@@ -101,6 +109,33 @@ struct kvm_s390_io_adapter_req { 
      release a userspace page for the translated address specified in addr

      from the list of mappings



  KVM_DEV_FLIC_AISM

    modify the adapter-interruption-suppression mode for a given isc if the

    AIS capability is enabled. Takes a kvm_s390_ais_req describing:



struct kvm_s390_ais_req {

	__u8 isc;

	__u16 mode;

};



    isc contains the target I/O interruption subclass, mode the target

    adapter-interruption-suppression mode. The following modes are

    currently supported:

    - KVM_S390_AIS_MODE_ALL: ALL-Interruptions Mode, i.e. airq injection

      is always allowed;

    - KVM_S390_AIS_MODE_SINGLE: SINGLE-Interruption Mode, i.e. airq

      injection is only allowed once and the following adapter interrupts

      will be suppressed until the mode is set again to ALL-Interruptions

      or SINGLE-Interruption mode.



  KVM_DEV_FLIC_AIRQ_INJECT

    Inject adapter interrupts on a specified adapter.

    attr->attr contains the unique id for the adapter, which allows for

    adapter-specific checks and actions.

    For adapters subject to AIS, handle the airq injection suppression for

    an isc according to the adapter-interruption-suppression mode on condition

    that the AIS capability is enabled.



Note: The KVM_SET_DEVICE_ATTR/KVM_GET_DEVICE_ATTR device ioctls executed on

FLIC with an unknown group or attribute gives the error code EINVAL (instead of

ENXIO, as specified in the API documentation). It is not possible to conclude

arch/s390/include/asm/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
#define HWCAP_S390_VXRS		2048

#define HWCAP_S390_VXRS_BCD	4096

#define HWCAP_S390_VXRS_EXT	8192

#define HWCAP_S390_GS		16384



/* Internal bits, not exposed via elf */

#define HWCAP_INT_SIE		1UL

arch/s390/include/asm/kvm_host.h

+38 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <asm/cpu.h>

#include <asm/fpu/api.h>

#include <asm/isc.h>

#include <asm/guarded_storage.h>



#define KVM_S390_BSCA_CPU_SLOTS 64

#define KVM_S390_ESCA_CPU_SLOTS 248
@@ -164,11 +165,21 @@ struct kvm_s390_sie_block { 
#define ICTL_RRBE	0x00001000

#define ICTL_TPROT	0x00000200

	__u32	ictl;			/* 0x0048 */

#define ECA_CEI		0x80000000

#define ECA_IB		0x40000000

#define ECA_SIGPI	0x10000000

#define ECA_MVPGI	0x01000000

#define ECA_VX		0x00020000

#define ECA_PROTEXCI	0x00002000

#define ECA_SII		0x00000001

	__u32	eca;			/* 0x004c */

#define ICPT_INST	0x04

#define ICPT_PROGI	0x08

#define ICPT_INSTPROGI	0x0C

#define ICPT_EXTREQ	0x10

#define ICPT_EXTINT	0x14

#define ICPT_IOREQ	0x18

#define ICPT_WAIT	0x1c

#define ICPT_VALIDITY	0x20

#define ICPT_STOP	0x28

#define ICPT_OPEREXC	0x2C
@@ -182,10 +193,19 @@ struct kvm_s390_sie_block { 
	__u32	ipb;			/* 0x0058 */

	__u32	scaoh;			/* 0x005c */

	__u8	reserved60;		/* 0x0060 */

#define ECB_GS		0x40

#define ECB_TE		0x10

#define ECB_SRSI	0x04

#define ECB_HOSTPROTINT	0x02

	__u8	ecb;			/* 0x0061 */

#define ECB2_CMMA	0x80

#define ECB2_IEP	0x20

#define ECB2_PFMFI	0x08

#define ECB2_ESCA	0x04

	__u8    ecb2;                   /* 0x0062 */

#define ECB3_AES 0x04

#define ECB3_DEA 0x08

#define ECB3_AES 0x04

#define ECB3_RI  0x01

	__u8    ecb3;			/* 0x0063 */

	__u32	scaol;			/* 0x0064 */

	__u8	reserved68[4];		/* 0x0068 */
@@ -219,11 +239,14 @@ struct kvm_s390_sie_block { 
	__u32	crycbd;			/* 0x00fc */

	__u64	gcr[16];		/* 0x0100 */

	__u64	gbea;			/* 0x0180 */

	__u8	reserved188[24];	/* 0x0188 */

	__u8    reserved188[8];		/* 0x0188 */

	__u64   sdnxo;			/* 0x0190 */

	__u8    reserved198[8];		/* 0x0198 */

	__u32	fac;			/* 0x01a0 */

	__u8	reserved1a4[20];	/* 0x01a4 */

	__u64	cbrlo;			/* 0x01b8 */

	__u8	reserved1c0[8];		/* 0x01c0 */

#define ECD_HOSTREGMGMT	0x20000000

	__u32	ecd;			/* 0x01c8 */

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

	__u64	pp;			/* 0x01de */
@@ -498,6 +521,12 @@ struct kvm_s390_local_interrupt { 
#define FIRQ_CNTR_PFAULT   3

#define FIRQ_MAX_COUNT     4



/* mask the AIS mode for a given ISC */

#define AIS_MODE_MASK(isc) (0x80 >> isc)



#define KVM_S390_AIS_MODE_ALL    0

#define KVM_S390_AIS_MODE_SINGLE 1



struct kvm_s390_float_interrupt {

	unsigned long pending_irqs;

	spinlock_t lock;
@@ -507,6 +536,10 @@ struct kvm_s390_float_interrupt { 
	struct kvm_s390_ext_info srv_signal;

	int next_rr_cpu;

	unsigned long idle_mask[BITS_TO_LONGS(KVM_MAX_VCPUS)];

	struct mutex ais_lock;

	u8 simm;

	u8 nimm;

	int ais_enabled;

};



struct kvm_hw_wp_info_arch {
@@ -554,6 +587,7 @@ struct kvm_vcpu_arch { 
	/* if vsie is active, currently executed shadow sie control block */

	struct kvm_s390_sie_block *vsie_block;

	unsigned int      host_acrs[NUM_ACRS];

	struct gs_cb      *host_gscb;

	struct fpu	  host_fpregs;

	struct kvm_s390_local_interrupt local_int;

	struct hrtimer    ckc_timer;
@@ -574,6 +608,7 @@ struct kvm_vcpu_arch { 
	 */

	seqcount_t cputm_seqcount;

	__u64 cputm_start;

	bool gs_enabled;

};



struct kvm_vm_stat {
@@ -596,6 +631,7 @@ struct s390_io_adapter { 
	bool maskable;

	bool masked;

	bool swap;

	bool suppressible;

	struct rw_semaphore maps_lock;

	struct list_head maps;

	atomic_t nr_maps;

arch/s390/include/asm/lowcore.h

+3 −6
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ struct lowcore { 
	__u64	stfle_fac_list[32];		/* 0x0f00 */

	__u8	pad_0x1000[0x11b0-0x1000];	/* 0x1000 */



	/* Pointer to vector register save area */

	__u64	vector_save_area_addr;		/* 0x11b0 */

	/* Pointer to the machine check extended save area */

	__u64	mcesad;				/* 0x11b0 */



	/* 64 bit extparam used for pfault/diag 250: defined by architecture */

	__u64	ext_params2;			/* 0x11B8 */
@@ -182,10 +182,7 @@ struct lowcore { 


	/* Transaction abort diagnostic block */

	__u8	pgm_tdb[256];			/* 0x1800 */

	__u8	pad_0x1900[0x1c00-0x1900];	/* 0x1900 */



	/* Software defined save area for vector registers */

	__u8	vector_save_area[1024];		/* 0x1c00 */

	__u8	pad_0x1900[0x2000-0x1900];	/* 0x1900 */

} __packed;



#define S390_lowcore (*((struct lowcore *) 0))