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

Commit 6ac0f61f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

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

KVM: s390: features and fixes for 4.7 part2

- Use hardware provided information about facility bits that do not
  need any hypervisor activitiy
- Add missing documentation for KVM_CAP_S390_RI
- Some updates/fixes for handling cpu models and facilities
parents 4ac33429 60a37709

Documentation/virtual/kvm/api.txt

+8 −0
Original line number Diff line number Diff line
@@ -3788,6 +3788,14 @@ a KVM_EXIT_IOAPIC_EOI vmexit will be reported to userspace. 
Fails if VCPU has already been created, or if the irqchip is already in the

kernel (i.e. KVM_CREATE_IRQCHIP has already been called).



7.6 KVM_CAP_S390_RI



Architectures: s390

Parameters: none



Allows use of runtime-instrumentation introduced with zEC12 processor.

Will return -EINVAL if the machine does not support runtime-instrumentation.

Will return -EBUSY if a VCPU has already been created.



8. Other capabilities.

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

arch/s390/include/asm/kvm_host.h

+1 −5
Original line number Diff line number Diff line
@@ -544,10 +544,6 @@ struct kvm_vcpu_arch { 
	struct kvm_s390_local_interrupt local_int;

	struct hrtimer    ckc_timer;

	struct kvm_s390_pgm_info pgm;

	union  {

		struct cpuid	cpu_id;

		u64		stidp_data;

	};

	struct gmap *gmap;

	struct kvm_guestdbg_info_arch guestdbg;

	unsigned long pfault_token;
@@ -605,7 +601,7 @@ struct kvm_s390_cpu_model { 
	__u64 fac_mask[S390_ARCH_FAC_LIST_SIZE_U64];

	/* facility list requested by guest (in dma page) */

	__u64 *fac_list;

	struct cpuid cpu_id;

	u64 cpuid;

	unsigned short ibc;

};

arch/s390/include/asm/sclp.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct sclp_info { 
	unsigned int max_cores;

	unsigned long hsa_size;

	unsigned long facilities;

	unsigned int hmfai;

};

extern struct sclp_info sclp;

arch/s390/include/asm/sigp.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


/* SIGP cpu status bits */



#define SIGP_STATUS_INVALID_ORDER	0x00000002UL

#define SIGP_STATUS_CHECK_STOP		0x00000010UL

#define SIGP_STATUS_STOPPED		0x00000040UL

#define SIGP_STATUS_EXT_CALL_PENDING	0x00000080UL

arch/s390/kvm/kvm-s390.c

+41 −14
Original line number Diff line number Diff line
@@ -118,9 +118,9 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
};



/* upper facilities limit for kvm */

unsigned long kvm_s390_fac_list_mask[] = {

	0xffe6fffbfcfdfc40UL,

	0x005e800000000000UL,

unsigned long kvm_s390_fac_list_mask[16] = {

	0xffe6000000000000UL,

	0x005e000000000000UL,

};



unsigned long kvm_s390_fac_list_mask_size(void)
@@ -638,6 +638,7 @@ static int kvm_s390_get_tod(struct kvm *kvm, struct kvm_device_attr *attr) 
static int kvm_s390_set_processor(struct kvm *kvm, struct kvm_device_attr *attr)

{

	struct kvm_s390_vm_cpu_processor *proc;

	u16 lowest_ibc, unblocked_ibc;

	int ret = 0;



	mutex_lock(&kvm->lock);
@@ -652,9 +653,17 @@ static int kvm_s390_set_processor(struct kvm *kvm, struct kvm_device_attr *attr) 
	}

	if (!copy_from_user(proc, (void __user *)attr->addr,

			    sizeof(*proc))) {

		memcpy(&kvm->arch.model.cpu_id, &proc->cpuid,

		       sizeof(struct cpuid));

		kvm->arch.model.cpuid = proc->cpuid;

		lowest_ibc = sclp.ibc >> 16 & 0xfff;

		unblocked_ibc = sclp.ibc & 0xfff;

		if (lowest_ibc) {

			if (proc->ibc > unblocked_ibc)

				kvm->arch.model.ibc = unblocked_ibc;

			else if (proc->ibc < lowest_ibc)

				kvm->arch.model.ibc = lowest_ibc;

			else

				kvm->arch.model.ibc = proc->ibc;

		}

		memcpy(kvm->arch.model.fac_list, proc->fac_list,

		       S390_ARCH_FAC_LIST_SIZE_BYTE);

	} else
@@ -687,7 +696,7 @@ static int kvm_s390_get_processor(struct kvm *kvm, struct kvm_device_attr *attr) 
		ret = -ENOMEM;

		goto out;

	}

	memcpy(&proc->cpuid, &kvm->arch.model.cpu_id, sizeof(struct cpuid));

	proc->cpuid = kvm->arch.model.cpuid;

	proc->ibc = kvm->arch.model.ibc;

	memcpy(&proc->fac_list, kvm->arch.model.fac_list,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);
@@ -1081,10 +1090,13 @@ static void kvm_s390_set_crycb_format(struct kvm *kvm) 
		kvm->arch.crypto.crycbd |= CRYCB_FORMAT1;

}



static void kvm_s390_get_cpu_id(struct cpuid *cpu_id)

static u64 kvm_s390_get_initial_cpuid(void)

{

	get_cpu_id(cpu_id);

	cpu_id->version = 0xff;

	struct cpuid cpuid;



	get_cpu_id(&cpuid);

	cpuid.version = 0xff;

	return *((u64 *) &cpuid);

}



static void kvm_s390_crypto_init(struct kvm *kvm)
@@ -1175,7 +1187,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	memcpy(kvm->arch.model.fac_list, kvm->arch.model.fac_mask,

	       S390_ARCH_FAC_LIST_SIZE_BYTE);



	kvm_s390_get_cpu_id(&kvm->arch.model.cpu_id);

	kvm->arch.model.cpuid = kvm_s390_get_initial_cpuid();

	kvm->arch.model.ibc = sclp.ibc & 0x0fff;



	kvm_s390_crypto_init(kvm);
@@ -1624,7 +1636,6 @@ static void kvm_s390_vcpu_setup_model(struct kvm_vcpu *vcpu) 
{

	struct kvm_s390_cpu_model *model = &vcpu->kvm->arch.model;



	vcpu->arch.cpu_id = model->cpu_id;

	vcpu->arch.sie_block->ibc = model->ibc;

	if (test_kvm_facility(vcpu->kvm, 7))

		vcpu->arch.sie_block->fac = (u32)(u64) model->fac_list;
@@ -1645,11 +1656,14 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 


	kvm_s390_vcpu_setup_model(vcpu);



	vcpu->arch.sie_block->ecb   = 6;

	vcpu->arch.sie_block->ecb = 0x02;

	if (test_kvm_facility(vcpu->kvm, 9))

		vcpu->arch.sie_block->ecb |= 0x04;

	if (test_kvm_facility(vcpu->kvm, 50) && test_kvm_facility(vcpu->kvm, 73))

		vcpu->arch.sie_block->ecb |= 0x10;



	vcpu->arch.sie_block->ecb2  = 8;

	if (test_kvm_facility(vcpu->kvm, 8))

		vcpu->arch.sie_block->ecb2 |= 0x08;

	vcpu->arch.sie_block->eca   = 0xC1002000U;

	if (sclp.has_siif)

		vcpu->arch.sie_block->eca |= 1;
@@ -2971,13 +2985,26 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, 
	return;

}



static inline unsigned long nonhyp_mask(int i)

{

	unsigned int nonhyp_fai = (sclp.hmfai << i * 2) >> 30;



	return 0x0000ffffffffffffUL >> (nonhyp_fai << 4);

}



static int __init kvm_s390_init(void)

{

	int i;



	if (!sclp.has_sief2) {

		pr_info("SIE not available\n");

		return -ENODEV;

	}



	for (i = 0; i < 16; i++)

		kvm_s390_fac_list_mask[i] |=

			S390_lowcore.stfle_fac_list[i] & nonhyp_mask(i);



	return kvm_init(NULL, sizeof(struct kvm_vcpu), 0, THIS_MODULE);

}