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

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

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

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

3 fixes
- memory leak on certain SIGP conditions
- wrong size for idle bitmap (always too big)
- clear local interrupts on initial CPU reset

1 performance improvement
- improve performance with many guests on certain workloads
parents ea2108c9 2ed10cc1

arch/s390/include/asm/kvm_host.h

+1 −2
Original line number Diff line number Diff line
@@ -222,8 +222,7 @@ struct kvm_s390_float_interrupt { 
	struct list_head list;

	atomic_t active;

	int next_rr_cpu;

	unsigned long idle_mask[(KVM_MAX_VCPUS + sizeof(long) - 1)

				/ sizeof(long)];

	unsigned long idle_mask[BITS_TO_LONGS(KVM_MAX_VCPUS)];

	unsigned int irq_count;

};

arch/s390/kvm/interrupt.c

+14 −0
Original line number Diff line number Diff line
@@ -510,6 +510,20 @@ enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer) 
	return HRTIMER_NORESTART;

}



void kvm_s390_clear_local_irqs(struct kvm_vcpu *vcpu)

{

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

	struct kvm_s390_interrupt_info  *n, *inti = NULL;



	spin_lock_bh(&li->lock);

	list_for_each_entry_safe(inti, n, &li->list, list) {

		list_del(&inti->list);

		kfree(inti);

	}

	atomic_set(&li->active, 0);

	spin_unlock_bh(&li->lock);

}



void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu)

{

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

arch/s390/kvm/kvm-s390.c

+6 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
{

	int rc;

	char debug_name[16];

	static unsigned long sca_offset;



	rc = -EINVAL;

#ifdef CONFIG_KVM_S390_UCONTROL
@@ -276,6 +277,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	kvm->arch.sca = (struct sca_block *) get_zeroed_page(GFP_KERNEL);

	if (!kvm->arch.sca)

		goto out_err;

	spin_lock(&kvm_lock);

	sca_offset = (sca_offset + 16) & 0x7f0;

	kvm->arch.sca = (struct sca_block *) ((char *) kvm->arch.sca + sca_offset);

	spin_unlock(&kvm_lock);



	sprintf(debug_name, "kvm-%u", current->pid);
@@ -432,6 +437,7 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu) 
	vcpu->arch.pfault_token = KVM_S390_PFAULT_TOKEN_INVALID;

	kvm_clear_async_pf_completion_queue(vcpu);

	atomic_set_mask(CPUSTAT_STOPPED, &vcpu->arch.sie_block->cpuflags);

	kvm_s390_clear_local_irqs(vcpu);

}



int kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)

arch/s390/kvm/kvm-s390.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer); 
void kvm_s390_tasklet(unsigned long parm);

void kvm_s390_deliver_pending_interrupts(struct kvm_vcpu *vcpu);

void kvm_s390_deliver_pending_machine_checks(struct kvm_vcpu *vcpu);

void kvm_s390_clear_local_irqs(struct kvm_vcpu *vcpu);

int __must_check kvm_s390_inject_vm(struct kvm *kvm,

				    struct kvm_s390_interrupt *s390int);

int __must_check kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,

arch/s390/kvm/sigp.c

+6 −8
Original line number Diff line number Diff line
@@ -58,7 +58,9 @@ static int __sigp_emergency(struct kvm_vcpu *vcpu, u16 cpu_addr) 
	struct kvm_s390_interrupt_info *inti;

	struct kvm_vcpu *dst_vcpu = NULL;



	if (cpu_addr >= KVM_MAX_VCPUS)

	if (cpu_addr < KVM_MAX_VCPUS)

		dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_addr);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;



	inti = kzalloc(sizeof(*inti), GFP_KERNEL);
@@ -68,9 +70,6 @@ static int __sigp_emergency(struct kvm_vcpu *vcpu, u16 cpu_addr) 
	inti->type = KVM_S390_INT_EMERGENCY;

	inti->emerg.code = vcpu->vcpu_id;



	dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_addr);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;

	li = &dst_vcpu->arch.local_int;

	spin_lock_bh(&li->lock);

	list_add_tail(&inti->list, &li->list);
@@ -121,7 +120,9 @@ static int __sigp_external_call(struct kvm_vcpu *vcpu, u16 cpu_addr) 
	struct kvm_s390_interrupt_info *inti;

	struct kvm_vcpu *dst_vcpu = NULL;



	if (cpu_addr >= KVM_MAX_VCPUS)

	if (cpu_addr < KVM_MAX_VCPUS)

		dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_addr);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;



	inti = kzalloc(sizeof(*inti), GFP_KERNEL);
@@ -131,9 +132,6 @@ static int __sigp_external_call(struct kvm_vcpu *vcpu, u16 cpu_addr) 
	inti->type = KVM_S390_INT_EXTERNAL_CALL;

	inti->extcall.code = vcpu->vcpu_id;



	dst_vcpu = kvm_get_vcpu(vcpu->kvm, cpu_addr);

	if (!dst_vcpu)

		return SIGP_CC_NOT_OPERATIONAL;

	li = &dst_vcpu->arch.local_int;

	spin_lock_bh(&li->lock);

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