summaryrefslogtreecommitdiffstats
path: root/arch/s390/kvm
diff options
context:
space:
mode:
authorMichael Mueller <mimu@linux.vnet.ibm.com>2014-03-13 12:16:45 +0100
committerChristian Borntraeger <borntraeger@de.ibm.com>2014-04-22 13:24:54 +0200
commite325fe69aa37b485635521568651642791d6d140 (patch)
treeae3679e872a7786a8c4dff91c089d05df7262859 /arch/s390/kvm
parenta86dcc2482cf29ffcf6fbc174ce55e4f5f18cd8b (diff)
downloadlinux-stable-e325fe69aa37b485635521568651642791d6d140.tar.gz
linux-stable-e325fe69aa37b485635521568651642791d6d140.tar.bz2
linux-stable-e325fe69aa37b485635521568651642791d6d140.zip
KVM: s390: Factor out handle_itdb to handle TX aborts
Factor out the new function handle_itdb(), which copies the ITDB into guest lowcore to fully handle a TX abort. Signed-off-by: Michael Mueller <mimu@linux.vnet.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Diffstat (limited to 'arch/s390/kvm')
-rw-r--r--arch/s390/kvm/intercept.c38
1 files changed, 26 insertions, 12 deletions
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index f39160406efa..30e1c5eb726a 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -171,12 +171,33 @@ static void __extract_prog_irq(struct kvm_vcpu *vcpu,
}
}
+/*
+ * restore ITDB to program-interruption TDB in guest lowcore
+ * and set TX abort indication if required
+*/
+static int handle_itdb(struct kvm_vcpu *vcpu)
+{
+ struct kvm_s390_itdb *itdb;
+ int rc;
+
+ if (!IS_TE_ENABLED(vcpu) || !IS_ITDB_VALID(vcpu))
+ return 0;
+ if (current->thread.per_flags & PER_FLAG_NO_TE)
+ return 0;
+ itdb = (struct kvm_s390_itdb *)vcpu->arch.sie_block->itdba;
+ rc = write_guest_lc(vcpu, __LC_PGM_TDB, itdb, sizeof(*itdb));
+ if (rc)
+ return rc;
+ memset(itdb, 0, sizeof(*itdb));
+
+ return 0;
+}
+
#define per_event(vcpu) (vcpu->arch.sie_block->iprcc & PGM_PER)
static int handle_prog(struct kvm_vcpu *vcpu)
{
struct kvm_s390_pgm_info pgm_info;
- struct kvm_s390_itdb *itdb;
int rc;
vcpu->stat.exit_program_interruption++;
@@ -188,20 +209,13 @@ static int handle_prog(struct kvm_vcpu *vcpu)
return 0;
}
- /* Restore ITDB to Program-Interruption TDB in guest memory */
- if (!IS_TE_ENABLED(vcpu) || !IS_ITDB_VALID(vcpu))
- goto skip_itdb;
- if (current->thread.per_flags & PER_FLAG_NO_TE)
- goto skip_itdb;
- itdb = (struct kvm_s390_itdb *)vcpu->arch.sie_block->itdba;
- rc = write_guest_lc(vcpu, __LC_PGM_TDB, itdb, sizeof(*itdb));
+ trace_kvm_s390_intercept_prog(vcpu, vcpu->arch.sie_block->iprcc);
+
+ rc = handle_itdb(vcpu);
if (rc)
return rc;
- memset(itdb, 0, sizeof(*itdb));
-skip_itdb:
- trace_kvm_s390_intercept_prog(vcpu, vcpu->arch.sie_block->iprcc);
- __extract_prog_irq(vcpu, &pgm_info);
+ __extract_prog_irq(vcpu, &pgm_info);
return kvm_s390_inject_prog_irq(vcpu, &pgm_info);
}