There are three reasons for doing this:
1. The lifetime of the interception handler function coincides with the
lifetime of the vfio_ap module, so it makes little sense to tie it to
the mediated device and complete sense to tie it to the module in which
the function resides.
Well, the handler lives in the vfio_ap module so this is a given anyway.
I guess we are talking here about the callback which is registered by the
vfio_ap module, in the old design with a specific kvm instance (guest).
2. The setting/clearing of the function pointer is protected by a mutex
lock. This increases the number of locks taken during
VFIO_GROUP_NOTIFY_SET_KVM notification and increases the complexity of
ensuring locking integrity and avoiding circular lock dependencies.
3. The lock will only be taken for writing twice: When the vfio_ap module
is loaded; and, when the vfio_ap module is removed. As it stands now,
the lock is taken for writing whenever a guest is started or terminated.
What you do is basically get rid of the
crypto_hook *pqap_hook;
pointer and add the
void *data;
pointer instead.
It is obvious why you need to add that pointer: we need a pointer to the
matrix_mdev, and we used to obtain it via the pqap_hook pointer.
But isn't the access to *data racy now? I mean you sill have concurrent
access to a pointer that is just called differently. Yes, instead of
accessing vcpu->kvm->arch.crypto.pqap_hook twice, we access the global
pqap_hook in the kvm module once, and then data once, but the access to
data does not seem to be synchronized at all. And you do not care to
explain why that is supposed to be OK.
Signed-off-by: Tony Krowiak <akrowiak@xxxxxxxxxxxxx>
---
arch/s390/include/asm/kvm_host.h | 10 ++++--
arch/s390/kvm/kvm-s390.c | 1 -
arch/s390/kvm/priv.c | 45 ++++++++++++++++++++++-----
drivers/s390/crypto/vfio_ap_ops.c | 27 ++++++++--------
drivers/s390/crypto/vfio_ap_private.h | 1 -
5 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index a604d51acfc8..05569d077d7f 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -799,16 +799,17 @@ struct kvm_s390_cpu_model {
unsigned short ibc;
};
-typedef int (*crypto_hook)(struct kvm_vcpu *vcpu);
+struct kvm_s390_crypto_hook {
+ int (*fcn)(struct kvm_vcpu *vcpu);
+};
I guess you do this for type safety, or?
struct kvm_s390_crypto {
struct kvm_s390_crypto_cb *crycb;
- struct rw_semaphore pqap_hook_rwsem;
- crypto_hook *pqap_hook;
One pointer set by the driver gone...
__u32 crycbd;
__u8 aes_kw;
__u8 dea_kw;
__u8 apie;
+ void *data;
... but another one added!
};
#define APCB0_MASK_SIZE 1
@@ -998,6 +999,9 @@ extern char sie_exit;
extern int kvm_s390_gisc_register(struct kvm *kvm, u32 gisc);
extern int kvm_s390_gisc_unregister(struct kvm *kvm, u32 gisc);
+extern int kvm_s390_pqap_hook_register(struct kvm_s390_crypto_hook *hook);
+extern int kvm_s390_pqap_hook_unregister(struct kvm_s390_crypto_hook *hook);
+
static inline void kvm_arch_hardware_disable(void) {}
static inline void kvm_arch_sync_events(struct kvm *kvm) {}
static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {}
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 6a6dd5e1daf6..c91981599328 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -2649,7 +2649,6 @@ static void kvm_s390_crypto_init(struct kvm *kvm)
{
kvm->arch.crypto.crycb = &kvm->arch.sie_page2->crycb;
kvm_s390_set_crycb_format(kvm);
- init_rwsem(&kvm->arch.crypto.pqap_hook_rwsem);
if (!test_kvm_facility(kvm, 76))
return;
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 53da4ceb16a3..3d91ff934c0c 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -31,6 +31,39 @@
#include "kvm-s390.h"
#include "trace.h"
+DEFINE_MUTEX(pqap_hook_lock);
+static struct kvm_s390_crypto_hook *pqap_hook;
This is the kvm global variable for the hook.
+
+int kvm_s390_pqap_hook_register(struct kvm_s390_crypto_hook *hook)
+{
+ int ret = 0;
+
+ mutex_lock(&pqap_hook_lock);
+ if (pqap_hook)
+ ret = -EACCES;
+ else
+ pqap_hook = hook;
+ mutex_unlock(&pqap_hook_lock);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(kvm_s390_pqap_hook_register);
+
+int kvm_s390_pqap_hook_unregister(struct kvm_s390_crypto_hook *hook)
+{
+ int ret = 0;
+
+ mutex_lock(&pqap_hook_lock);
+ if (hook != pqap_hook)
+ ret = -EACCES;
+ else
+ pqap_hook = NULL;
+ mutex_unlock(&pqap_hook_lock);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(kvm_s390_pqap_hook_unregister);
+
static int handle_ri(struct kvm_vcpu *vcpu)
{
vcpu->stat.instruction_ri++;
@@ -610,7 +643,6 @@ static int handle_io_inst(struct kvm_vcpu *vcpu)
static int handle_pqap(struct kvm_vcpu *vcpu)
{
struct ap_queue_status status = {};
- crypto_hook pqap_hook;
unsigned long reg0;
int ret;
uint8_t fc;
@@ -659,16 +691,15 @@ static int handle_pqap(struct kvm_vcpu *vcpu)
* hook function pointer in the kvm_s390_crypto structure. Lock the
* owner, retrieve the hook function pointer and call the hook.
*/
- down_read(&vcpu->kvm->arch.crypto.pqap_hook_rwsem);
This used to protect any reads of vcpu->kvm->arch.crypto.pqap_hook ...
- if (vcpu->kvm->arch.crypto.pqap_hook) {
- pqap_hook = *vcpu->kvm->arch.crypto.pqap_hook;
- ret = pqap_hook(vcpu);
... while we are executing the hook. Instead in the hook we are supposed
to read *vcpu->kvm->arch.crypto.data but we don't care to synchronize
that access because that one ain't protected by the new pqap_hook_lock
mutex.
+ mutex_lock(&pqap_hook_lock);
+ if (pqap_hook) {
+ ret = pqap_hook->fcn(vcpu);
if (!ret && vcpu->run->s.regs.gprs[1] & 0x00ff0000)
kvm_s390_set_psw_cc(vcpu, 3);
- up_read(&vcpu->kvm->arch.crypto.pqap_hook_rwsem);
+ mutex_unlock(&pqap_hook_lock);
return ret;
}
- up_read(&vcpu->kvm->arch.crypto.pqap_hook_rwsem);
+ mutex_unlock(&pqap_hook_lock);
/*
* A vfio_driver must register a hook.
* No hook means no driver to enable the SIE CRYCB and no queues.
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index 94c1c9bd58ad..02275d246b39 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -293,13 +293,10 @@ static int handle_pqap(struct kvm_vcpu *vcpu)
apqn = vcpu->run->s.regs.gprs[0] & 0xffff;
mutex_lock(&matrix_dev->lock);
- if (!vcpu->kvm->arch.crypto.pqap_hook)
- goto out_unlock;
- matrix_mdev = container_of(vcpu->kvm->arch.crypto.pqap_hook,
- struct ap_matrix_mdev, pqap_hook);
+ matrix_mdev = vcpu->kvm->arch.crypto.data;
Here is the access I'm talking about above. [1]
/* If the there is no guest using the mdev, there is nothing to do */
- if (!matrix_mdev->kvm)
+ if (!matrix_mdev || !matrix_mdev->kvm)
goto out_unlock;
q = vfio_ap_get_queue(matrix_mdev, apqn);
@@ -348,7 +345,6 @@ static int vfio_ap_mdev_probe(struct mdev_device *mdev)
matrix_mdev->mdev = mdev;
vfio_ap_matrix_init(&matrix_dev->info, &matrix_mdev->matrix);
- matrix_mdev->pqap_hook = handle_pqap;
mutex_lock(&matrix_dev->lock);
list_add(&matrix_mdev->node, &matrix_dev->mdev_list);
mutex_unlock(&matrix_dev->lock);
@@ -1078,10 +1074,6 @@ static int vfio_ap_mdev_set_kvm(struct ap_matrix_mdev *matrix_mdev,
struct ap_matrix_mdev *m;
if (kvm->arch.crypto.crycbd) {
- down_write(&kvm->arch.crypto.pqap_hook_rwsem);
- kvm->arch.crypto.pqap_hook = &matrix_mdev->pqap_hook;
We used to set our old pointer in a synchronized manner...
- up_write(&kvm->arch.crypto.pqap_hook_rwsem);
-
mutex_lock(&kvm->lock);
mutex_lock(&matrix_dev->lock);
@@ -1095,6 +1087,7 @@ static int vfio_ap_mdev_set_kvm(struct ap_matrix_mdev *matrix_mdev,
kvm_get_kvm(kvm);
matrix_mdev->kvm = kvm;
+ kvm->arch.crypto.data = matrix_mdev;
... but not any more!
kvm_arch_crypto_set_masks(kvm,
matrix_mdev->matrix.apm,
matrix_mdev->matrix.aqm,
@@ -1155,16 +1148,13 @@ static void vfio_ap_mdev_unset_kvm(struct ap_matrix_mdev *matrix_mdev,
struct kvm *kvm)
{
if (kvm && kvm->arch.crypto.crycbd) {
- down_write(&kvm->arch.crypto.pqap_hook_rwsem);
- kvm->arch.crypto.pqap_hook = NULL;
- up_write(&kvm->arch.crypto.pqap_hook_rwsem);
-
Same here!
mutex_lock(&kvm->lock);
mutex_lock(&matrix_dev->lock);
kvm_arch_crypto_clear_masks(kvm);
vfio_ap_mdev_reset_queues(matrix_mdev);
kvm_put_kvm(kvm);
+ kvm->arch.crypto.data = NULL;
And same here. So at [1] we aren't guaranteed to see this write, right?
That does not look right to me.
matrix_mdev->kvm = NULL;
mutex_unlock(&kvm->lock);
@@ -1391,12 +1381,20 @@ static const struct mdev_parent_ops vfio_ap_matrix_ops = {
.supported_type_groups = vfio_ap_mdev_type_groups,
};
+static struct kvm_s390_crypto_hook pqap_hook = {
+ .fcn = handle_pqap,
+};
+
int vfio_ap_mdev_register(void)
{
int ret;
atomic_set(&matrix_dev->available_instances, MAX_ZDEV_ENTRIES_EXT);
+ ret = kvm_s390_pqap_hook_register(&pqap_hook);
+ if (ret)
+ return ret;
+
ret = mdev_register_driver(&vfio_ap_matrix_driver);
if (ret)
return ret;
@@ -1413,6 +1411,7 @@ int vfio_ap_mdev_register(void)
void vfio_ap_mdev_unregister(void)
{
+ WARN_ON(kvm_s390_pqap_hook_unregister(&pqap_hook));
mdev_unregister_device(&matrix_dev->device);
mdev_unregister_driver(&vfio_ap_matrix_driver);
}
diff --git a/drivers/s390/crypto/vfio_ap_private.h b/drivers/s390/crypto/vfio_ap_private.h
index 648fcaf8104a..907f41160de7 100644
--- a/drivers/s390/crypto/vfio_ap_private.h
+++ b/drivers/s390/crypto/vfio_ap_private.h
@@ -97,7 +97,6 @@ struct ap_matrix_mdev {
struct notifier_block group_notifier;
struct notifier_block iommu_notifier;
struct kvm *kvm;
- crypto_hook pqap_hook;
struct mdev_device *mdev;
};
