90 lines
3.4 KiB
Diff
90 lines
3.4 KiB
Diff
From 89c813343ab05381d7def3b67120a4480490add7 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Mon, 15 Oct 2018 10:19:28 +0100
|
|
Subject: [PATCH 3/6] s390x/kvm: enable AP instruction interpretation for guest
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
Message-id: <1539598771-16223-4-git-send-email-thuth@redhat.com>
|
|
Patchwork-id: 82697
|
|
O-Subject: [RHEL-8 qemu-kvm PATCH 3/6] s390x/kvm: enable AP instruction interpretation for guest
|
|
Bugzilla: 1508142
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
|
From: Tony Krowiak <akrowiak@linux.ibm.com>
|
|
|
|
Let's use the KVM_SET_DEVICE_ATTR ioctl to enable hardware
|
|
interpretation of AP instructions executed on the guest.
|
|
If the S390_FEAT_AP feature is switched on for the guest,
|
|
AP instructions must be interpreted by default; otherwise,
|
|
they will be intercepted.
|
|
|
|
This attribute setting may be overridden by a device. For example,
|
|
a device may want to provide AP instructions to the guest (i.e.,
|
|
S390_FEAT_AP turned on), but it may want to emulate them. In this
|
|
case, the AP instructions executed on the guest must be
|
|
intercepted; so when the device is realized, it must disable
|
|
interpretation.
|
|
|
|
Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
|
|
Tested-by: Pierre Morel <pmorel@linux.ibm.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Acked-by: Halil Pasic <pasic@linux.ibm.com>
|
|
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
Message-Id: <20181010170309.12045-4-akrowiak@linux.ibm.com>
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
(cherry picked from commit 1d7db85b61cb9888b8ed8c8923343b468405b7a0)
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
target/s390x/kvm.c | 19 +++++++++++++++++++
|
|
1 file changed, 19 insertions(+)
|
|
|
|
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
|
|
index 2a63499..4cb3499 100644
|
|
--- a/target/s390x/kvm.c
|
|
+++ b/target/s390x/kvm.c
|
|
@@ -2298,11 +2298,26 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp)
|
|
error_setg(errp, "KVM: host CPU model could not be identified");
|
|
return;
|
|
}
|
|
+ /* for now, we can only provide the AP feature with HW support */
|
|
+ if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO,
|
|
+ KVM_S390_VM_CRYPTO_ENABLE_APIE)) {
|
|
+ set_bit(S390_FEAT_AP, model->features);
|
|
+ }
|
|
/* strip of features that are not part of the maximum model */
|
|
bitmap_and(model->features, model->features, model->def->full_feat,
|
|
S390_FEAT_MAX);
|
|
}
|
|
|
|
+static void kvm_s390_configure_apie(bool interpret)
|
|
+{
|
|
+ uint64_t attr = interpret ? KVM_S390_VM_CRYPTO_ENABLE_APIE :
|
|
+ KVM_S390_VM_CRYPTO_DISABLE_APIE;
|
|
+
|
|
+ if (kvm_vm_check_attr(kvm_state, KVM_S390_VM_CRYPTO, attr)) {
|
|
+ kvm_s390_set_attr(attr);
|
|
+ }
|
|
+}
|
|
+
|
|
void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
|
|
{
|
|
struct kvm_s390_vm_cpu_processor prop = {
|
|
@@ -2360,6 +2375,10 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
|
|
if (test_bit(S390_FEAT_CMM, model->features)) {
|
|
kvm_s390_enable_cmma();
|
|
}
|
|
+
|
|
+ if (test_bit(S390_FEAT_AP, model->features)) {
|
|
+ kvm_s390_configure_apie(true);
|
|
+ }
|
|
}
|
|
|
|
void kvm_s390_restart_interrupt(S390CPU *cpu)
|
|
--
|
|
1.8.3.1
|
|
|