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

Merge tag 'kvm-s390-20140516' of... 

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

1. Correct locking for lazy storage key handling
   A test loop with multiple CPUs triggered a race in the lazy storage
   key handling as introduced by commit 934bc131
   (KVM: s390: Allow skeys to be enabled for the current process). This
   race should not happen with Linux guests, but let's fix it anyway.
   Patch touches !/kvm/ code, but is from the s390 maintainer.

2. Better handling of broken guests
   If we detect a program check loop we stop the guest instead of
   wasting CPU cycles.

3. Better handling on MVPG emulation
   The move page handling is improved to be architecturally correct.

3. Trace point rework
   Let's rework the kvm trace points to have a common header file (for
   later perf usage) and provided a table based instruction decoder.

4. Interpretive execution of SIGP external call
   Let the hardware handle most cases of SIGP external call (IPI) and
   wire up the fixup code for the corner cases.

5. Initial preparations for the IBC facility
   Prepare the code to handle instruction blocking
parents d9f89b88 fda902cb

arch/s390/include/asm/kvm_host.h

+6 −2
Original line number Diff line number Diff line
@@ -32,8 +32,10 @@ 
#define KVM_NR_IRQCHIPS 1

#define KVM_IRQCHIP_NUM_PINS 4096



#define SIGP_CTRL_C	0x00800000



struct sca_entry {

	atomic_t scn;

	atomic_t ctrl;

	__u32	reserved;

	__u64	sda;

	__u64	reserved2[2];
@@ -80,7 +82,9 @@ struct sca_block { 


struct kvm_s390_sie_block {

	atomic_t cpuflags;		/* 0x0000 */

	__u32	prefix;			/* 0x0004 */

	__u32 : 1;			/* 0x0004 */

	__u32 prefix : 18;

	__u32 : 13;

	__u8	reserved08[4];		/* 0x0008 */

#define PROG_IN_SIE (1<<0)

	__u32	prog0c;			/* 0x000c */

arch/s390/include/asm/sclp.h

+1 −0
Original line number Diff line number Diff line
@@ -66,5 +66,6 @@ int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode); 
unsigned long sclp_get_hsa_size(void);

void sclp_early_detect(void);

int sclp_has_siif(void);

unsigned int sclp_get_ibc(void);



#endif /* _ASM_S390_SCLP_H */

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

0 → 100644
+245 −0
Original line number Diff line number Diff line 
#ifndef _UAPI_ASM_S390_SIE_H

#define _UAPI_ASM_S390_SIE_H



#include <asm/sigp.h>



#define diagnose_codes						\

	{ 0x10, "DIAG (0x10) release pages" },			\

	{ 0x44, "DIAG (0x44) time slice end" },			\

	{ 0x9c, "DIAG (0x9c) time slice end directed" },	\

	{ 0x204, "DIAG (0x204) logical-cpu utilization" },	\

	{ 0x258, "DIAG (0x258) page-reference services" },	\

	{ 0x308, "DIAG (0x308) ipl functions" },		\

	{ 0x500, "DIAG (0x500) KVM virtio functions" },		\

	{ 0x501, "DIAG (0x501) KVM breakpoint" }



#define sigp_order_codes						\

	{ SIGP_SENSE, "SIGP sense" },					\

	{ SIGP_EXTERNAL_CALL, "SIGP external call" },			\

	{ SIGP_EMERGENCY_SIGNAL, "SIGP emergency signal" },		\

	{ SIGP_STOP, "SIGP stop" },					\

	{ SIGP_STOP_AND_STORE_STATUS, "SIGP stop and store status" },	\

	{ SIGP_SET_ARCHITECTURE, "SIGP set architecture" },		\

	{ SIGP_SET_PREFIX, "SIGP set prefix" },				\

	{ SIGP_SENSE_RUNNING, "SIGP sense running" },			\

	{ SIGP_RESTART, "SIGP restart" },				\

	{ SIGP_INITIAL_CPU_RESET, "SIGP initial cpu reset" },		\

	{ SIGP_STORE_STATUS_AT_ADDRESS, "SIGP store status at address" }



#define icpt_prog_codes						\

	{ 0x0001, "Prog Operation" },				\

	{ 0x0002, "Prog Privileged Operation" },		\

	{ 0x0003, "Prog Execute" },				\

	{ 0x0004, "Prog Protection" },				\

	{ 0x0005, "Prog Addressing" },				\

	{ 0x0006, "Prog Specification" },			\

	{ 0x0007, "Prog Data" },				\

	{ 0x0008, "Prog Fixedpoint overflow" },			\

	{ 0x0009, "Prog Fixedpoint divide" },			\

	{ 0x000A, "Prog Decimal overflow" },			\

	{ 0x000B, "Prog Decimal divide" },			\

	{ 0x000C, "Prog HFP exponent overflow" },		\

	{ 0x000D, "Prog HFP exponent underflow" },		\

	{ 0x000E, "Prog HFP significance" },			\

	{ 0x000F, "Prog HFP divide" },				\

	{ 0x0010, "Prog Segment translation" },			\

	{ 0x0011, "Prog Page translation" },			\

	{ 0x0012, "Prog Translation specification" },		\

	{ 0x0013, "Prog Special operation" },			\

	{ 0x0015, "Prog Operand" },				\

	{ 0x0016, "Prog Trace table" },				\

	{ 0x0017, "Prog ASNtranslation specification" },	\

	{ 0x001C, "Prog Spaceswitch event" },			\

	{ 0x001D, "Prog HFP square root" },			\

	{ 0x001F, "Prog PCtranslation specification" },		\

	{ 0x0020, "Prog AFX translation" },			\

	{ 0x0021, "Prog ASX translation" },			\

	{ 0x0022, "Prog LX translation" },			\

	{ 0x0023, "Prog EX translation" },			\

	{ 0x0024, "Prog Primary authority" },			\

	{ 0x0025, "Prog Secondary authority" },			\

	{ 0x0026, "Prog LFXtranslation exception" },		\

	{ 0x0027, "Prog LSXtranslation exception" },		\

	{ 0x0028, "Prog ALET specification" },			\

	{ 0x0029, "Prog ALEN translation" },			\

	{ 0x002A, "Prog ALE sequence" },			\

	{ 0x002B, "Prog ASTE validity" },			\

	{ 0x002C, "Prog ASTE sequence" },			\

	{ 0x002D, "Prog Extended authority" },			\

	{ 0x002E, "Prog LSTE sequence" },			\

	{ 0x002F, "Prog ASTE instance" },			\

	{ 0x0030, "Prog Stack full" },				\

	{ 0x0031, "Prog Stack empty" },				\

	{ 0x0032, "Prog Stack specification" },			\

	{ 0x0033, "Prog Stack type" },				\

	{ 0x0034, "Prog Stack operation" },			\

	{ 0x0039, "Prog Region first translation" },		\

	{ 0x003A, "Prog Region second translation" },		\

	{ 0x003B, "Prog Region third translation" },		\

	{ 0x0040, "Prog Monitor event" },			\

	{ 0x0080, "Prog PER event" },				\

	{ 0x0119, "Prog Crypto operation" }



#define exit_code_ipa0(ipa0, opcode, mnemonic)		\

	{ (ipa0 << 8 | opcode), #ipa0 " " mnemonic }

#define exit_code(opcode, mnemonic)			\

	{ opcode, mnemonic }



#define icpt_insn_codes				\

	exit_code_ipa0(0x01, 0x01, "PR"),	\

	exit_code_ipa0(0x01, 0x04, "PTFF"),	\

	exit_code_ipa0(0x01, 0x07, "SCKPF"),	\

	exit_code_ipa0(0xAA, 0x00, "RINEXT"),	\

	exit_code_ipa0(0xAA, 0x01, "RION"),	\

	exit_code_ipa0(0xAA, 0x02, "TRIC"),	\

	exit_code_ipa0(0xAA, 0x03, "RIOFF"),	\

	exit_code_ipa0(0xAA, 0x04, "RIEMIT"),	\

	exit_code_ipa0(0xB2, 0x02, "STIDP"),	\

	exit_code_ipa0(0xB2, 0x04, "SCK"),	\

	exit_code_ipa0(0xB2, 0x05, "STCK"),	\

	exit_code_ipa0(0xB2, 0x06, "SCKC"),	\

	exit_code_ipa0(0xB2, 0x07, "STCKC"),	\

	exit_code_ipa0(0xB2, 0x08, "SPT"),	\

	exit_code_ipa0(0xB2, 0x09, "STPT"),	\

	exit_code_ipa0(0xB2, 0x0d, "PTLB"),	\

	exit_code_ipa0(0xB2, 0x10, "SPX"),	\

	exit_code_ipa0(0xB2, 0x11, "STPX"),	\

	exit_code_ipa0(0xB2, 0x12, "STAP"),	\

	exit_code_ipa0(0xB2, 0x14, "SIE"),	\

	exit_code_ipa0(0xB2, 0x16, "SETR"),	\

	exit_code_ipa0(0xB2, 0x17, "STETR"),	\

	exit_code_ipa0(0xB2, 0x18, "PC"),	\

	exit_code_ipa0(0xB2, 0x20, "SERVC"),	\

	exit_code_ipa0(0xB2, 0x28, "PT"),	\

	exit_code_ipa0(0xB2, 0x29, "ISKE"),	\

	exit_code_ipa0(0xB2, 0x2a, "RRBE"),	\

	exit_code_ipa0(0xB2, 0x2b, "SSKE"),	\

	exit_code_ipa0(0xB2, 0x2c, "TB"),	\

	exit_code_ipa0(0xB2, 0x2e, "PGIN"),	\

	exit_code_ipa0(0xB2, 0x2f, "PGOUT"),	\

	exit_code_ipa0(0xB2, 0x30, "CSCH"),	\

	exit_code_ipa0(0xB2, 0x31, "HSCH"),	\

	exit_code_ipa0(0xB2, 0x32, "MSCH"),	\

	exit_code_ipa0(0xB2, 0x33, "SSCH"),	\

	exit_code_ipa0(0xB2, 0x34, "STSCH"),	\

	exit_code_ipa0(0xB2, 0x35, "TSCH"),	\

	exit_code_ipa0(0xB2, 0x36, "TPI"),	\

	exit_code_ipa0(0xB2, 0x37, "SAL"),	\

	exit_code_ipa0(0xB2, 0x38, "RSCH"),	\

	exit_code_ipa0(0xB2, 0x39, "STCRW"),	\

	exit_code_ipa0(0xB2, 0x3a, "STCPS"),	\

	exit_code_ipa0(0xB2, 0x3b, "RCHP"),	\

	exit_code_ipa0(0xB2, 0x3c, "SCHM"),	\

	exit_code_ipa0(0xB2, 0x40, "BAKR"),	\

	exit_code_ipa0(0xB2, 0x48, "PALB"),	\

	exit_code_ipa0(0xB2, 0x4c, "TAR"),	\

	exit_code_ipa0(0xB2, 0x50, "CSP"),	\

	exit_code_ipa0(0xB2, 0x54, "MVPG"),	\

	exit_code_ipa0(0xB2, 0x58, "BSG"),	\

	exit_code_ipa0(0xB2, 0x5a, "BSA"),	\

	exit_code_ipa0(0xB2, 0x5f, "CHSC"),	\

	exit_code_ipa0(0xB2, 0x74, "SIGA"),	\

	exit_code_ipa0(0xB2, 0x76, "XSCH"),	\

	exit_code_ipa0(0xB2, 0x78, "STCKE"),	\

	exit_code_ipa0(0xB2, 0x7c, "STCKF"),	\

	exit_code_ipa0(0xB2, 0x7d, "STSI"),	\

	exit_code_ipa0(0xB2, 0xb0, "STFLE"),	\

	exit_code_ipa0(0xB2, 0xb1, "STFL"),	\

	exit_code_ipa0(0xB2, 0xb2, "LPSWE"),	\

	exit_code_ipa0(0xB2, 0xf8, "TEND"),	\

	exit_code_ipa0(0xB2, 0xfc, "TABORT"),	\

	exit_code_ipa0(0xB9, 0x1e, "KMAC"),	\

	exit_code_ipa0(0xB9, 0x28, "PCKMO"),	\

	exit_code_ipa0(0xB9, 0x2a, "KMF"),	\

	exit_code_ipa0(0xB9, 0x2b, "KMO"),	\

	exit_code_ipa0(0xB9, 0x2d, "KMCTR"),	\

	exit_code_ipa0(0xB9, 0x2e, "KM"),	\

	exit_code_ipa0(0xB9, 0x2f, "KMC"),	\

	exit_code_ipa0(0xB9, 0x3e, "KIMD"),	\

	exit_code_ipa0(0xB9, 0x3f, "KLMD"),	\

	exit_code_ipa0(0xB9, 0x8a, "CSPG"),	\

	exit_code_ipa0(0xB9, 0x8d, "EPSW"),	\

	exit_code_ipa0(0xB9, 0x8e, "IDTE"),	\

	exit_code_ipa0(0xB9, 0x8f, "CRDTE"),	\

	exit_code_ipa0(0xB9, 0x9c, "EQBS"),	\

	exit_code_ipa0(0xB9, 0xa2, "PTF"),	\

	exit_code_ipa0(0xB9, 0xab, "ESSA"),	\

	exit_code_ipa0(0xB9, 0xae, "RRBM"),	\

	exit_code_ipa0(0xB9, 0xaf, "PFMF"),	\

	exit_code_ipa0(0xE3, 0x03, "LRAG"),	\

	exit_code_ipa0(0xE3, 0x13, "LRAY"),	\

	exit_code_ipa0(0xE3, 0x25, "NTSTG"),	\

	exit_code_ipa0(0xE5, 0x00, "LASP"),	\

	exit_code_ipa0(0xE5, 0x01, "TPROT"),	\

	exit_code_ipa0(0xE5, 0x60, "TBEGIN"),	\

	exit_code_ipa0(0xE5, 0x61, "TBEGINC"),	\

	exit_code_ipa0(0xEB, 0x25, "STCTG"),	\

	exit_code_ipa0(0xEB, 0x2f, "LCTLG"),	\

	exit_code_ipa0(0xEB, 0x60, "LRIC"),	\

	exit_code_ipa0(0xEB, 0x61, "STRIC"),	\

	exit_code_ipa0(0xEB, 0x62, "MRIC"),	\

	exit_code_ipa0(0xEB, 0x8a, "SQBS"),	\

	exit_code_ipa0(0xC8, 0x01, "ECTG"),	\

	exit_code(0x0a, "SVC"),			\

	exit_code(0x80, "SSM"),			\

	exit_code(0x82, "LPSW"),		\

	exit_code(0x83, "DIAG"),		\

	exit_code(0xae, "SIGP"),		\

	exit_code(0xac, "STNSM"),		\

	exit_code(0xad, "STOSM"),		\

	exit_code(0xb1, "LRA"),			\

	exit_code(0xb6, "STCTL"),		\

	exit_code(0xb7, "LCTL"),		\

	exit_code(0xee, "PLO")



#define sie_intercept_code					\

	{ 0x00, "Host interruption" },				\

	{ 0x04, "Instruction" },				\

	{ 0x08, "Program interruption" },			\

	{ 0x0c, "Instruction and program interruption" },	\

	{ 0x10, "External request" },				\

	{ 0x14, "External interruption" },			\

	{ 0x18, "I/O request" },				\

	{ 0x1c, "Wait state" },					\

	{ 0x20, "Validity" },					\

	{ 0x28, "Stop request" },				\

	{ 0x2c, "Operation exception" },			\

	{ 0x38, "Partial-execution" },				\

	{ 0x3c, "I/O interruption" },				\

	{ 0x40, "I/O instruction" },				\

	{ 0x48, "Timing subset" }



/*

 * This is the simple interceptable instructions decoder.

 *

 * It will be used as userspace interface and it can be used in places

 * that does not allow to use general decoder functions,

 * such as trace events declarations.

 *

 * Some userspace tools may want to parse this code

 * and would be confused by switch(), if() and other statements,

 * but they can understand conditional operator.

 */

#define INSN_DECODE_IPA0(ipa0, insn, rshift, mask)		\

	(insn >> 56) == (ipa0) ?				\

		((ipa0 << 8) | ((insn >> rshift) & mask)) :



#define INSN_DECODE(insn) (insn >> 56)



/*

 * The macro icpt_insn_decoder() takes an intercepted instruction

 * and returns a key, which can be used to find a mnemonic name

 * of the instruction in the icpt_insn_codes table.

 */

#define icpt_insn_decoder(insn)			\

	INSN_DECODE_IPA0(0x01, insn, 48, 0xff)	\

	INSN_DECODE_IPA0(0xaa, insn, 48, 0x0f)	\

	INSN_DECODE_IPA0(0xb2, insn, 48, 0xff)	\

	INSN_DECODE_IPA0(0xb9, insn, 48, 0xff)	\

	INSN_DECODE_IPA0(0xe3, insn, 48, 0xff)	\

	INSN_DECODE_IPA0(0xe5, insn, 48, 0xff)	\

	INSN_DECODE_IPA0(0xeb, insn, 16, 0xff)	\

	INSN_DECODE_IPA0(0xc8, insn, 48, 0x0f)	\

	INSN_DECODE(insn)



#endif /* _UAPI_ASM_S390_SIE_H */

arch/s390/kvm/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
static int diag_release_pages(struct kvm_vcpu *vcpu)

{

	unsigned long start, end;

	unsigned long prefix  = vcpu->arch.sie_block->prefix;

	unsigned long prefix  = kvm_s390_get_prefix(vcpu);



	start = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];

	end = vcpu->run->s.regs.gprs[vcpu->arch.sie_block->ipa & 0xf] + 4096;

arch/s390/kvm/gaccess.h

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
static inline unsigned long kvm_s390_real_to_abs(struct kvm_vcpu *vcpu,

						 unsigned long gra)

{

	unsigned long prefix = vcpu->arch.sie_block->prefix;

	unsigned long prefix  = kvm_s390_get_prefix(vcpu);



	if (gra < 2 * PAGE_SIZE)

		gra += prefix;
@@ -99,7 +99,7 @@ static inline unsigned long kvm_s390_logical_to_effective(struct kvm_vcpu *vcpu, 
	unsigned long __gpa;					\

								\

	__gpa = (unsigned long)(gra);				\

	__gpa += __vcpu->arch.sie_block->prefix;		\

	__gpa += kvm_s390_get_prefix(__vcpu);			\

	kvm_write_guest(__vcpu->kvm, __gpa, &__x, sizeof(__x));	\

})
@@ -124,7 +124,7 @@ static inline __must_check 
int write_guest_lc(struct kvm_vcpu *vcpu, unsigned long gra, void *data,

		   unsigned long len)

{

	unsigned long gpa = gra + vcpu->arch.sie_block->prefix;

	unsigned long gpa = gra + kvm_s390_get_prefix(vcpu);



	return kvm_write_guest(vcpu->kvm, gpa, data, len);

}
@@ -150,7 +150,7 @@ static inline __must_check 
int read_guest_lc(struct kvm_vcpu *vcpu, unsigned long gra, void *data,

		  unsigned long len)

{

	unsigned long gpa = gra + vcpu->arch.sie_block->prefix;

	unsigned long gpa = gra + kvm_s390_get_prefix(vcpu);



	return kvm_read_guest(vcpu->kvm, gpa, data, len);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE