From: Pierre Morel <pmorel@linux.ibm.com>
To: borntraeger@de.ibm.com
Cc: alex.williamson@redhat.com, cohuck@redhat.com,
linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org,
kvm@vger.kernel.org, frankja@linux.ibm.com,
akrowiak@linux.ibm.com, pasic@linux.ibm.com, david@redhat.com,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
freude@linux.ibm.com, mimu@linux.ibm.com
Subject: [PATCH v3 2/9] s390: ap: kvm: setting a hook for PQAP instructions
Date: Thu, 14 Feb 2019 14:51:02 +0100 [thread overview]
Message-ID: <1550152269-6317-3-git-send-email-pmorel@linux.ibm.com> (raw)
In-Reply-To: <1550152269-6317-1-git-send-email-pmorel@linux.ibm.com>
This patch adds interception code for the PQAP instructions,
and a callback inside the KVM arch structure for s390.
If a VFIO-AP drivers needs to intercept PQAP/AQIC or PQAP/TAPQ
instructions, the driver will initialize the callback inside
the kvm_arch structure to be called when the interception of a
PQAP instruction occurs.
If the callback is not initialized, the code still returns
-EOPNOTSUPP to let userland handle the instruction as it used to.
Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: Tony Krowiak <akrowiak@linux.ibm.com>
---
arch/s390/include/asm/kvm_host.h | 1 +
arch/s390/kvm/priv.c | 50 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index c5f5156..49cc8b0 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -719,6 +719,7 @@ struct kvm_s390_cpu_model {
struct kvm_s390_crypto {
struct kvm_s390_crypto_cb *crycb;
+ int (*pqap_hook)(struct kvm_vcpu *vcpu);
__u32 crycbd;
__u8 aes_kw;
__u8 dea_kw;
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 8679bd7..72fdc21 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -27,6 +27,7 @@
#include <asm/io.h>
#include <asm/ptrace.h>
#include <asm/sclp.h>
+#include <asm/ap.h>
#include "gaccess.h"
#include "kvm-s390.h"
#include "trace.h"
@@ -592,6 +593,53 @@ static int handle_io_inst(struct kvm_vcpu *vcpu)
}
}
+/*
+ * handle_pqap: Handling pqap interception
+ * @vcpu: the vcpu having issue the pqap instruction
+ *
+ * This callback only handles PQAP/AQIC instruction and
+ * calls a dedicated callback for this instruction if
+ * a driver did register one in the CRYPTO satellite of the
+ * SIE block.
+ *
+ * Do not change the behavior if, return -EOPNOTSUPP if:
+ * - the hook is not used do not change the behavior.
+ * - AP instructions are not available or not available to the guest
+ * - the instruction is not PQAP with function code indicating
+ * AQIC do not change the previous behavior.
+ *
+ * For PQAP/AQIC instruction, verify privilege and specifications
+ *
+ * return the value returned by the callback.
+ */
+static int handle_pqap(struct kvm_vcpu *vcpu)
+{
+ uint8_t fc;
+
+ /* Verify that the hook callback is registered */
+ if (!vcpu->kvm->arch.crypto.pqap_hook)
+ return -EOPNOTSUPP;
+ /* Verify that the AP instruction are available */
+ if (!ap_instructions_available())
+ return -EOPNOTSUPP;
+ /* Verify that the guest is allowed to use AP instructions */
+ if (!(vcpu->arch.sie_block->eca & ECA_APIE))
+ return -EOPNOTSUPP;
+ /* Verify that the function code is AQIC */
+ fc = vcpu->run->s.regs.gprs[0] >> 24;
+ if (fc != 0x03)
+ return -EOPNOTSUPP;
+
+ /* PQAP instructions are allowed for guest kernel only */
+ if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
+ return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
+ /* AQIC instruction is allowed only if facility 65 is available */
+ if (!test_kvm_facility(vcpu->kvm, 65))
+ return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
+ /* All right, call the callback */
+ return vcpu->kvm->arch.crypto.pqap_hook(vcpu);
+}
+
static int handle_stfl(struct kvm_vcpu *vcpu)
{
int rc;
@@ -878,6 +926,8 @@ int kvm_s390_handle_b2(struct kvm_vcpu *vcpu)
return handle_sthyi(vcpu);
case 0x7d:
return handle_stsi(vcpu);
+ case 0xaf:
+ return handle_pqap(vcpu);
case 0xb1:
return handle_stfl(vcpu);
case 0xb2:
--
2.7.4
next prev parent reply other threads:[~2019-02-14 13:51 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 13:51 [PATCH v3 0/9] [RFC] vfio: ap: ioctl definitions for AP Queue Interrupt Control Pierre Morel
2019-02-14 13:51 ` [PATCH v3 1/9] s390: vfio_ap: link the vfio_ap devices to the vfio_ap bus subsystem Pierre Morel
2019-02-14 14:54 ` Cornelia Huck
2019-02-14 15:05 ` Christian Borntraeger
2019-02-14 15:40 ` Cornelia Huck
2019-02-14 17:12 ` Tony Krowiak
2019-02-14 17:35 ` Pierre Morel
2019-02-14 15:47 ` Pierre Morel
2019-02-14 16:57 ` Cornelia Huck
2019-02-14 17:36 ` Pierre Morel
2019-02-14 18:30 ` Tony Krowiak
2019-02-15 9:11 ` Cornelia Huck
2019-02-15 21:59 ` Tony Krowiak
2019-02-18 12:01 ` Cornelia Huck
2019-02-18 16:35 ` Tony Krowiak
2019-02-18 16:57 ` Cornelia Huck
2019-02-19 22:27 ` Tony Krowiak
2019-02-20 9:05 ` Cornelia Huck
2019-02-14 15:01 ` Christian Borntraeger
2019-02-14 15:09 ` Pierre Morel
2019-02-14 13:51 ` Pierre Morel [this message]
2019-02-14 15:54 ` [PATCH v3 2/9] s390: ap: kvm: setting a hook for PQAP instructions Cornelia Huck
2019-02-14 16:45 ` Pierre Morel
2019-02-15 9:26 ` Cornelia Huck
2019-02-15 9:55 ` Pierre Morel
2019-02-15 22:02 ` Tony Krowiak
2019-02-18 18:29 ` Pierre Morel
2019-02-18 22:42 ` Cornelia Huck
2019-02-19 19:50 ` Pierre Morel
2019-02-19 22:36 ` Tony Krowiak
2019-02-21 12:40 ` Pierre Morel
2019-02-19 22:50 ` Tony Krowiak
2019-02-14 13:51 ` [PATCH v3 3/9] s390: ap: new vfio_ap_queue structure Pierre Morel
2019-02-15 9:37 ` Cornelia Huck
2019-02-15 9:58 ` Pierre Morel
2019-02-14 13:51 ` [PATCH v3 4/9] s390: ap: tools to find a queue with a specific APQN Pierre Morel
2019-02-15 9:49 ` Cornelia Huck
2019-02-15 10:10 ` Pierre Morel
2019-02-15 10:24 ` Cornelia Huck
2019-02-15 22:13 ` Tony Krowiak
2019-02-18 12:21 ` Cornelia Huck
2019-02-18 18:32 ` Pierre Morel
2019-02-22 15:04 ` Tony Krowiak
2019-02-14 13:51 ` [PATCH v3 5/9] s390: ap: tools to associate a queue to a matrix Pierre Morel
2019-02-15 22:30 ` Tony Krowiak
2019-02-18 18:36 ` Pierre Morel
2019-02-14 13:51 ` [PATCH v3 6/9] vfio: ap: register IOMMU VFIO notifier Pierre Morel
2019-02-15 22:55 ` Tony Krowiak
2019-02-19 9:59 ` Halil Pasic
2019-02-19 19:04 ` Pierre Morel
2019-02-19 21:33 ` Tony Krowiak
2019-02-19 18:51 ` Pierre Morel
2019-02-14 13:51 ` [PATCH v3 7/9] s390: ap: implement PAPQ AQIC interception in kernel Pierre Morel
2019-02-15 23:11 ` Tony Krowiak
2019-02-19 19:16 ` Pierre Morel
2019-02-20 11:54 ` Halil Pasic
2019-02-21 12:50 ` Pierre Morel
2019-02-14 13:51 ` [PATCH v3 8/9] s390: ap: Cleanup on removing the AP device Pierre Morel
2019-02-15 23:29 ` Tony Krowiak
2019-02-19 19:29 ` Pierre Morel
2019-02-15 23:36 ` Tony Krowiak
2019-02-19 19:41 ` Pierre Morel
2019-02-14 13:51 ` [PATCH v3 9/9] s390: ap: kvm: add AP Queue Interruption Control facility Pierre Morel
2019-02-14 20:33 ` [PATCH v3 0/9] [RFC] vfio: ap: ioctl definitions for AP Queue Interrupt Control Tony Krowiak
2019-02-15 8:44 ` Pierre Morel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1550152269-6317-3-git-send-email-pmorel@linux.ibm.com \
--to=pmorel@linux.ibm.com \
--cc=akrowiak@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=freude@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mimu@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).