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

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

Merge tag 'kvm-s390-next-20141028' of... 

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

KVM: s390: Fixes and cleanups

1. A small fix regarding program check handling (cc stable as it
   overwrites the wrong guest memory)
2. Improve the ipte interlock scalability for older hardware
3. current->mm to mm cleanup (currently a no-op)
4. several SIGP rework patches (more to come)
parents 41e7ed64 a6cc3108

arch/s390/include/asm/kvm_host.h

+9 −0
Original line number Diff line number Diff line
@@ -226,10 +226,17 @@ struct kvm_vcpu_stat { 
	u32 instruction_sigp_sense_running;

	u32 instruction_sigp_external_call;

	u32 instruction_sigp_emergency;

	u32 instruction_sigp_cond_emergency;

	u32 instruction_sigp_start;

	u32 instruction_sigp_stop;

	u32 instruction_sigp_stop_store_status;

	u32 instruction_sigp_store_status;

	u32 instruction_sigp_arch;

	u32 instruction_sigp_prefix;

	u32 instruction_sigp_restart;

	u32 instruction_sigp_init_cpu_reset;

	u32 instruction_sigp_cpu_reset;

	u32 instruction_sigp_unknown;

	u32 diagnose_10;

	u32 diagnose_44;

	u32 diagnose_9c;
@@ -434,6 +441,8 @@ struct kvm_arch{ 
	int user_cpu_state_ctrl;

	struct s390_io_adapter *adapters[MAX_S390_IO_ADAPTERS];

	wait_queue_head_t ipte_wq;

	int ipte_lock_count;

	struct mutex ipte_mutex;

	spinlock_t start_stop_lock;

	struct kvm_s390_crypto crypto;

};

arch/s390/include/asm/sigp.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define SIGP_RESTART		      6

#define SIGP_STOP_AND_STORE_STATUS    9

#define SIGP_INITIAL_CPU_RESET	     11

#define SIGP_CPU_RESET		     12

#define SIGP_SET_PREFIX		     13

#define SIGP_STORE_STATUS_AT_ADDRESS 14

#define SIGP_SET_ARCHITECTURE	     18

arch/s390/kvm/gaccess.c

+9 −11
Original line number Diff line number Diff line
@@ -207,8 +207,6 @@ union raddress { 
	unsigned long pfra : 52; /* Page-Frame Real Address */

};



static int ipte_lock_count;

static DEFINE_MUTEX(ipte_mutex);



int ipte_lock_held(struct kvm_vcpu *vcpu)

{
@@ -216,16 +214,16 @@ int ipte_lock_held(struct kvm_vcpu *vcpu) 


	if (vcpu->arch.sie_block->eca & 1)

		return ic->kh != 0;

	return ipte_lock_count != 0;

	return vcpu->kvm->arch.ipte_lock_count != 0;

}



static void ipte_lock_simple(struct kvm_vcpu *vcpu)

{

	union ipte_control old, new, *ic;



	mutex_lock(&ipte_mutex);

	ipte_lock_count++;

	if (ipte_lock_count > 1)

	mutex_lock(&vcpu->kvm->arch.ipte_mutex);

	vcpu->kvm->arch.ipte_lock_count++;

	if (vcpu->kvm->arch.ipte_lock_count > 1)

		goto out;

	ic = &vcpu->kvm->arch.sca->ipte_control;

	do {
@@ -238,16 +236,16 @@ static void ipte_lock_simple(struct kvm_vcpu *vcpu) 
		new.k = 1;

	} while (cmpxchg(&ic->val, old.val, new.val) != old.val);

out:

	mutex_unlock(&ipte_mutex);

	mutex_unlock(&vcpu->kvm->arch.ipte_mutex);

}



static void ipte_unlock_simple(struct kvm_vcpu *vcpu)

{

	union ipte_control old, new, *ic;



	mutex_lock(&ipte_mutex);

	ipte_lock_count--;

	if (ipte_lock_count)

	mutex_lock(&vcpu->kvm->arch.ipte_mutex);

	vcpu->kvm->arch.ipte_lock_count--;

	if (vcpu->kvm->arch.ipte_lock_count)

		goto out;

	ic = &vcpu->kvm->arch.sca->ipte_control;

	do {
@@ -256,7 +254,7 @@ static void ipte_unlock_simple(struct kvm_vcpu *vcpu) 
	} while (cmpxchg(&ic->val, old.val, new.val) != old.val);

	wake_up(&vcpu->kvm->arch.ipte_wq);

out:

	mutex_unlock(&ipte_mutex);

	mutex_unlock(&vcpu->kvm->arch.ipte_mutex);

}



static void ipte_lock_siif(struct kvm_vcpu *vcpu)

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static int __must_check __deliver_prog_irq(struct kvm_vcpu *vcpu, 
		break;

	case PGM_MONITOR:

		rc = put_guest_lc(vcpu, pgm_info->mon_class_nr,

				  (u64 *)__LC_MON_CLASS_NR);

				  (u16 *)__LC_MON_CLASS_NR);

		rc |= put_guest_lc(vcpu, pgm_info->mon_code,

				   (u64 *)__LC_MON_CODE);

		break;

arch/s390/kvm/kvm-s390.c

+8 −0
Original line number Diff line number Diff line
@@ -81,10 +81,17 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 
	{ "instruction_sigp_sense_running", VCPU_STAT(instruction_sigp_sense_running) },

	{ "instruction_sigp_external_call", VCPU_STAT(instruction_sigp_external_call) },

	{ "instruction_sigp_emergency", VCPU_STAT(instruction_sigp_emergency) },

	{ "instruction_sigp_cond_emergency", VCPU_STAT(instruction_sigp_cond_emergency) },

	{ "instruction_sigp_start", VCPU_STAT(instruction_sigp_start) },

	{ "instruction_sigp_stop", VCPU_STAT(instruction_sigp_stop) },

	{ "instruction_sigp_stop_store_status", VCPU_STAT(instruction_sigp_stop_store_status) },

	{ "instruction_sigp_store_status", VCPU_STAT(instruction_sigp_store_status) },

	{ "instruction_sigp_set_arch", VCPU_STAT(instruction_sigp_arch) },

	{ "instruction_sigp_set_prefix", VCPU_STAT(instruction_sigp_prefix) },

	{ "instruction_sigp_restart", VCPU_STAT(instruction_sigp_restart) },

	{ "instruction_sigp_cpu_reset", VCPU_STAT(instruction_sigp_cpu_reset) },

	{ "instruction_sigp_init_cpu_reset", VCPU_STAT(instruction_sigp_init_cpu_reset) },

	{ "instruction_sigp_unknown", VCPU_STAT(instruction_sigp_unknown) },

	{ "diagnose_10", VCPU_STAT(diagnose_10) },

	{ "diagnose_44", VCPU_STAT(diagnose_44) },

	{ "diagnose_9c", VCPU_STAT(diagnose_9c) },
@@ -453,6 +460,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	spin_lock_init(&kvm->arch.float_int.lock);

	INIT_LIST_HEAD(&kvm->arch.float_int.list);

	init_waitqueue_head(&kvm->arch.ipte_wq);

	mutex_init(&kvm->arch.ipte_mutex);



	debug_register_view(kvm->arch.dbf, &debug_sprintf_view);

	VM_EVENT(kvm, 3, "%s", "vm created");