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

Commit 60514510 authored by Eugene (jno) Dvurechenski's avatar Eugene (jno) Dvurechenski Committed by Christian Borntraeger
Browse files

KVM: s390: Generalize access to IPTE controls 



This patch generalizes access to the IPTE controls, which is a part of SCA.
This is to prepare for upcoming introduction of Extended SCA support.

Signed-off-by: default avatarEugene (jno) Dvurechenski <jno@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent f7ba1d34

arch/s390/kvm/gaccess.c

+5 −5
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ struct aste { 


int ipte_lock_held(struct kvm_vcpu *vcpu)

{

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

	union ipte_control *ic = kvm_s390_get_ipte_control(vcpu->kvm);



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

		return ic->kh != 0;
@@ -274,7 +274,7 @@ static void ipte_lock_simple(struct kvm_vcpu *vcpu) 
	vcpu->kvm->arch.ipte_lock_count++;

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

		goto out;

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

	ic = kvm_s390_get_ipte_control(vcpu->kvm);

	do {

		old = READ_ONCE(*ic);

		while (old.k) {
@@ -296,7 +296,7 @@ static void ipte_unlock_simple(struct kvm_vcpu *vcpu) 
	vcpu->kvm->arch.ipte_lock_count--;

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

		goto out;

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

	ic = kvm_s390_get_ipte_control(vcpu->kvm);

	do {

		old = READ_ONCE(*ic);

		new = old;
@@ -311,7 +311,7 @@ static void ipte_lock_siif(struct kvm_vcpu *vcpu) 
{

	union ipte_control old, new, *ic;



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

	ic = kvm_s390_get_ipte_control(vcpu->kvm);

	do {

		old = READ_ONCE(*ic);

		while (old.kg) {
@@ -328,7 +328,7 @@ static void ipte_unlock_siif(struct kvm_vcpu *vcpu) 
{

	union ipte_control old, new, *ic;



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

	ic = kvm_s390_get_ipte_control(vcpu->kvm);

	do {

		old = READ_ONCE(*ic);

		new = old;

arch/s390/kvm/kvm-s390.h

+5 −0
Original line number Diff line number Diff line
@@ -340,4 +340,9 @@ void kvm_s390_clear_bp_data(struct kvm_vcpu *vcpu); 
void kvm_s390_prepare_debug_exit(struct kvm_vcpu *vcpu);

void kvm_s390_handle_per_event(struct kvm_vcpu *vcpu);



/* support for Basic/Extended SCA handling */

static inline union ipte_control *kvm_s390_get_ipte_control(struct kvm *kvm)

{

	return &kvm->arch.sca->ipte_control;

}

#endif