Skip to content

Commit 42400d9

Browse files
committed
KVM: s390: interrupt: use READ_ONCE() before cmpxchg()
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: Christian Borntraeger <[email protected]> Acked-by: Christian Borntraeger <[email protected]> Reviewed-by: Claudio Imbrenda <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Heiko Carstens <[email protected]>
1 parent e3f360d commit 42400d9

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

arch/s390/kvm/interrupt.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ static int sca_inject_ext_call(struct kvm_vcpu *vcpu, int src_id)
8383
struct esca_block *sca = vcpu->kvm->arch.sca;
8484
union esca_sigp_ctrl *sigp_ctrl =
8585
&(sca->cpu[vcpu->vcpu_id].sigp_ctrl);
86-
union esca_sigp_ctrl new_val = {0}, old_val = *sigp_ctrl;
86+
union esca_sigp_ctrl new_val = {0}, old_val;
8787

88+
old_val = READ_ONCE(*sigp_ctrl);
8889
new_val.scn = src_id;
8990
new_val.c = 1;
9091
old_val.c = 0;
@@ -95,8 +96,9 @@ static int sca_inject_ext_call(struct kvm_vcpu *vcpu, int src_id)
9596
struct bsca_block *sca = vcpu->kvm->arch.sca;
9697
union bsca_sigp_ctrl *sigp_ctrl =
9798
&(sca->cpu[vcpu->vcpu_id].sigp_ctrl);
98-
union bsca_sigp_ctrl new_val = {0}, old_val = *sigp_ctrl;
99+
union bsca_sigp_ctrl new_val = {0}, old_val;
99100

101+
old_val = READ_ONCE(*sigp_ctrl);
100102
new_val.scn = src_id;
101103
new_val.c = 1;
102104
old_val.c = 0;
@@ -126,16 +128,18 @@ static void sca_clear_ext_call(struct kvm_vcpu *vcpu)
126128
struct esca_block *sca = vcpu->kvm->arch.sca;
127129
union esca_sigp_ctrl *sigp_ctrl =
128130
&(sca->cpu[vcpu->vcpu_id].sigp_ctrl);
129-
union esca_sigp_ctrl old = *sigp_ctrl;
131+
union esca_sigp_ctrl old;
130132

133+
old = READ_ONCE(*sigp_ctrl);
131134
expect = old.value;
132135
rc = cmpxchg(&sigp_ctrl->value, old.value, 0);
133136
} else {
134137
struct bsca_block *sca = vcpu->kvm->arch.sca;
135138
union bsca_sigp_ctrl *sigp_ctrl =
136139
&(sca->cpu[vcpu->vcpu_id].sigp_ctrl);
137-
union bsca_sigp_ctrl old = *sigp_ctrl;
140+
union bsca_sigp_ctrl old;
138141

142+
old = READ_ONCE(*sigp_ctrl);
139143
expect = old.value;
140144
rc = cmpxchg(&sigp_ctrl->value, old.value, 0);
141145
}

0 commit comments

Comments
 (0)