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

Commit bcd84683 authored by Jens Freimann's avatar Jens Freimann Committed by Christian Borntraeger
Browse files

KVM: s390: allow injecting every kind of interrupt 



Add a new data structure and function that allows to inject
all kinds of interrupt as defined in the PoP

Signed-off-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 4f718eab

arch/s390/include/asm/kvm_host.h

+52 −7
Original line number Diff line number Diff line
@@ -193,6 +193,51 @@ struct kvm_vcpu_stat { 
#define PGM_ADDRESSING			0x05

#define PGM_SPECIFICATION		0x06

#define PGM_DATA			0x07

#define PGM_FIXED_POINT_OVERFLOW	0x08

#define PGM_FIXED_POINT_DIVIDE		0x09

#define PGM_DECIMAL_OVERFLOW		0x0a

#define PGM_DECIMAL_DIVIDE		0x0b

#define PGM_HFP_EXPONENT_OVERFLOW	0x0c

#define PGM_HFP_EXPONENT_UNDERFLOW	0x0d

#define PGM_HFP_SIGNIFICANCE		0x0e

#define PGM_HFP_DIVIDE			0x0f

#define PGM_SEGMENT_TRANSLATION		0x10

#define PGM_PAGE_TRANSLATION		0x11

#define PGM_TRANSLATION_SPEC		0x12

#define PGM_SPECIAL_OPERATION		0x13

#define PGM_OPERAND			0x15

#define PGM_TRACE_TABEL			0x16

#define PGM_SPACE_SWITCH		0x1c

#define PGM_HFP_SQUARE_ROOT		0x1d

#define PGM_PC_TRANSLATION_SPEC		0x1f

#define PGM_AFX_TRANSLATION		0x20

#define PGM_ASX_TRANSLATION		0x21

#define PGM_LX_TRANSLATION		0x22

#define PGM_EX_TRANSLATION		0x23

#define PGM_PRIMARY_AUTHORITY		0x24

#define PGM_SECONDARY_AUTHORITY		0x25

#define PGM_LFX_TRANSLATION		0x26

#define PGM_LSX_TRANSLATION		0x27

#define PGM_ALET_SPECIFICATION		0x28

#define PGM_ALEN_TRANSLATION		0x29

#define PGM_ALE_SEQUENCE		0x2a

#define PGM_ASTE_VALIDITY		0x2b

#define PGM_ASTE_SEQUENCE		0x2c

#define PGM_EXTENDED_AUTHORITY		0x2d

#define PGM_LSTE_SEQUENCE		0x2e

#define PGM_ASTE_INSTANCE		0x2f

#define PGM_STACK_FULL			0x30

#define PGM_STACK_EMPTY			0x31

#define PGM_STACK_SPECIFICATION		0x32

#define PGM_STACK_TYPE			0x33

#define PGM_STACK_OPERATION		0x34

#define PGM_ASCE_TYPE			0x38

#define PGM_REGION_FIRST_TRANS		0x39

#define PGM_REGION_SECOND_TRANS		0x3a

#define PGM_REGION_THIRD_TRANS		0x3b

#define PGM_MONITOR			0x40

#define PGM_PER				0x80

#define PGM_CRYPTO_OPERATION		0x119



struct kvm_s390_interrupt_info {

	struct list_head list;

arch/s390/kvm/interrupt.c

+25 −0
Original line number Diff line number Diff line
@@ -660,6 +660,31 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code) 
	return 0;

}



int kvm_s390_inject_prog_irq(struct kvm_vcpu *vcpu,

			     struct kvm_s390_pgm_info *pgm_info)

{

	struct kvm_s390_local_interrupt *li = &vcpu->arch.local_int;

	struct kvm_s390_interrupt_info *inti;



	inti = kzalloc(sizeof(*inti), GFP_KERNEL);

	if (!inti)

		return -ENOMEM;



	VCPU_EVENT(vcpu, 3, "inject: prog irq %d (from kernel)",

		   pgm_info->code);

	trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, KVM_S390_PROGRAM_INT,

				   pgm_info->code, 0, 1);



	inti->type = KVM_S390_PROGRAM_INT;

	memcpy(&inti->pgm, pgm_info, sizeof(inti->pgm));

	spin_lock_bh(&li->lock);

	list_add(&inti->list, &li->list);

	atomic_set(&li->active, 1);

	BUG_ON(waitqueue_active(li->wq));

	spin_unlock_bh(&li->lock);

	return 0;

}



struct kvm_s390_interrupt_info *kvm_s390_get_io_int(struct kvm *kvm,

						    u64 cr6, u64 schid)

{

arch/s390/kvm/kvm-s390.h

+3 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ bool kvm_s390_cmma_enabled(struct kvm *kvm); 


/* implemented in diag.c */

int kvm_s390_handle_diag(struct kvm_vcpu *vcpu);

/* implemented in interrupt.c */

int kvm_s390_inject_prog_irq(struct kvm_vcpu *vcpu,

			     struct kvm_s390_pgm_info *pgm_info);



/* implemented in interrupt.c */

int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu);