1 files changed, 11 insertions, 0 deletions

diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 5ddbbde6f65c..eeb1ac7d8fa4 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -112,6 +112,17 @@ static int handle_instruction(struct kvm_vcpu *vcpu)
 static int handle_prog(struct kvm_vcpu *vcpu)
 {
         vcpu->stat.exit_program_interruption++;
+
+        /* Restore ITDB to Program-Interruption TDB in guest memory */
+        if (IS_TE_ENABLED(vcpu) &&
+            !(current->thread.per_flags & PER_FLAG_NO_TE) &&
+            IS_ITDB_VALID(vcpu)) {
+                copy_to_guest(vcpu, TDB_ADDR, vcpu->arch.sie_block->itdba,
+                              sizeof(struct kvm_s390_itdb));
+                memset((void *) vcpu->arch.sie_block->itdba, 0,
+                       sizeof(struct kvm_s390_itdb));
+        }
+
         trace_kvm_s390_intercept_prog(vcpu, vcpu->arch.sie_block->iprcc);
         return kvm_s390_inject_program_int(vcpu, vcpu->arch.sie_block->iprcc);
 }