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

Commit 45b3fc9c authored by Heiko Carstens's avatar Heiko Carstens Committed by Greg Kroah-Hartman
Browse files

KVM: s390: interrupt: use READ_ONCE() before cmpxchg() 



[ Upstream commit 42400d99e9f0728c17240edb9645637ead40f6b9 ]

Use READ_ONCE() before cmpxchg() to prevent that the compiler generates
code that fetches the to be compared old value several times from memory.

Reviewed-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@linux.ibm.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Link: https://lore.kernel.org/r/20230109145456.2895385-1-hca@linux.ibm.com


Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent dc0867c4

arch/s390/kvm/interrupt.c

+8 −4
Original line number Diff line number Diff line
@@ -81,8 +81,9 @@ static int sca_inject_ext_call(struct kvm_vcpu *vcpu, int src_id) 
		struct esca_block *sca = vcpu->kvm->arch.sca;

		union esca_sigp_ctrl *sigp_ctrl =

			&(sca->cpu[vcpu->vcpu_id].sigp_ctrl);

		union esca_sigp_ctrl new_val = {0}, old_val = *sigp_ctrl;

		union esca_sigp_ctrl new_val = {0}, old_val;



		old_val = READ_ONCE(*sigp_ctrl);

		new_val.scn = src_id;

		new_val.c = 1;

		old_val.c = 0;
@@ -93,8 +94,9 @@ static int sca_inject_ext_call(struct kvm_vcpu *vcpu, int src_id) 
		struct bsca_block *sca = vcpu->kvm->arch.sca;

		union bsca_sigp_ctrl *sigp_ctrl =

			&(sca->cpu[vcpu->vcpu_id].sigp_ctrl);

		union bsca_sigp_ctrl new_val = {0}, old_val = *sigp_ctrl;

		union bsca_sigp_ctrl new_val = {0}, old_val;



		old_val = READ_ONCE(*sigp_ctrl);

		new_val.scn = src_id;

		new_val.c = 1;

		old_val.c = 0;
@@ -124,16 +126,18 @@ static void sca_clear_ext_call(struct kvm_vcpu *vcpu) 
		struct esca_block *sca = vcpu->kvm->arch.sca;

		union esca_sigp_ctrl *sigp_ctrl =

			&(sca->cpu[vcpu->vcpu_id].sigp_ctrl);

		union esca_sigp_ctrl old = *sigp_ctrl;

		union esca_sigp_ctrl old;



		old = READ_ONCE(*sigp_ctrl);

		expect = old.value;

		rc = cmpxchg(&sigp_ctrl->value, old.value, 0);

	} else {

		struct bsca_block *sca = vcpu->kvm->arch.sca;

		union bsca_sigp_ctrl *sigp_ctrl =

			&(sca->cpu[vcpu->vcpu_id].sigp_ctrl);

		union bsca_sigp_ctrl old = *sigp_ctrl;

		union bsca_sigp_ctrl old;



		old = READ_ONCE(*sigp_ctrl);

		expect = old.value;

		rc = cmpxchg(&sigp_ctrl->value, old.value, 0);

	}