From: Pierre Morel <pmorel@linux.ibm.com>
To: Halil Pasic <pasic@linux.ibm.com>
Cc: borntraeger@de.ibm.com, 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, david@redhat.com,
schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
freude@linux.ibm.com, mimu@linux.ibm.com
Subject: Re: [PATCH v5 4/7] s390: ap: setup relation betwen KVM and mediated device
Date: Tue, 19 Mar 2019 10:38:42 +0100 [thread overview]
Message-ID: <7c199329-0e82-ff61-46b7-78237a0f01ce@linux.ibm.com> (raw)
In-Reply-To: <20190315191557.6c8d7668@oc2783563651>
On 15/03/2019 19:15, Halil Pasic wrote:
> On Wed, 13 Mar 2019 17:05:01 +0100
> Pierre Morel <pmorel@linux.ibm.com> wrote:
>
>> When the mediated device is open we setup the relation with KVM unset it
>> when the mediated device is released.
>>
>> We ensure KVM is present on opening of the mediated device.
>>
>> We ensure that KVM survives the mediated device, and establish a direct
>
> survives?
what alternative do you prefer?
>
>> link from KVM to the mediated device to simplify the relationship.
>>
>> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com>
>> ---
...snip...
>> static int vfio_ap_mdev_group_notifier(struct notifier_block *nb,
>> unsigned long action, void *data)
>> {
>> - int ret;
>> struct ap_matrix_mdev *matrix_mdev;
>>
>> if (action != VFIO_GROUP_NOTIFY_SET_KVM)
>> return NOTIFY_OK;
>>
>> matrix_mdev = container_of(nb, struct ap_matrix_mdev, group_notifier);
>> -
>> - if (!data) {
>> - matrix_mdev->kvm = NULL;
>> - return NOTIFY_OK;
>> - }
>> -
>> - ret = vfio_ap_mdev_set_kvm(matrix_mdev, data);
>> - if (ret)
>> - return NOTIFY_DONE;
>> -
>> - /* If there is no CRYCB pointer, then we can't copy the masks */
>> - if (!matrix_mdev->kvm->arch.crypto.crycbd)
>> - return NOTIFY_DONE;
>> -
>> - kvm_arch_crypto_set_masks(matrix_mdev->kvm, matrix_mdev->matrix.apm,
>> - matrix_mdev->matrix.aqm,
>> - matrix_mdev->matrix.adm);
>> + matrix_mdev->kvm = data;
>>
>> return NOTIFY_OK;
>> }
>> @@ -888,6 +873,12 @@ static int vfio_ap_mdev_open(struct mdev_device *mdev)
>> if (ret)
>> goto err_group;
>>
>> + /* We do not support opening the mediated device without KVM */
>> + if (!matrix_mdev->kvm) {
>> + ret = -ENODEV;
>> + goto err_group;
>> + }
>> +
>> matrix_mdev->iommu_notifier.notifier_call = vfio_ap_mdev_iommu_notifier;
>> events = VFIO_IOMMU_NOTIFY_DMA_UNMAP;
>>
>> @@ -896,8 +887,15 @@ static int vfio_ap_mdev_open(struct mdev_device *mdev)
>> if (ret)
>> goto err_iommu;
>>
>> + ret = vfio_ap_mdev_set_kvm(matrix_mdev);
>
> At this point the matrix_mdev->kvm ain't guaranteed to be valid IMHO. Or
> am I wrong? If I'm right kvm_get_kvm(matrix_mdev->kvm) could be too late.
What about the if (!matrix_mdev->kvm) 10 lines above ?
>
>> + if (ret)
>> + goto err_kvm;
>> +
>> return 0;
>>
>> +err_kvm:
>> + vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,
>> + &matrix_mdev->iommu_notifier);
>> err_iommu:
>> vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY,
>> &matrix_mdev->group_notifier);
>> @@ -906,19 +904,33 @@ static int vfio_ap_mdev_open(struct mdev_device *mdev)
>> return ret;
>> }
>>
>> -static void vfio_ap_mdev_release(struct mdev_device *mdev)
>> +static int vfio_ap_mdev_unset_kvm(struct ap_matrix_mdev *matrix_mdev)
>> {
>> - struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev);
>> + struct kvm *kvm = matrix_mdev->kvm;
>>
>> if (matrix_mdev->kvm)
>> kvm_arch_crypto_clear_masks(matrix_mdev->kvm);
>
> This still conditional?
Yes, nothing to clear if there is no KVM.
>
>> -
>> + vfio_ap_mdev_reset_queues(matrix_mdev->mdev);
>
> I guess your intention was to move vfio_ap_mdev_reset_queues()
> here from vfio_ap_mdev_release(), but you still have a
> vfio_ap_mdev_reset_queues() call in vfio_ap_mdev_release().
>
>> + matrix_mdev->kvm->arch.crypto.pqap_hook = NULL;
>> matrix_mdev->kvm = NULL;
>> +
>> + kvm_put_kvm(kvm);
>> + return 0;
>> +}
>> +
>> +static void vfio_ap_mdev_release(struct mdev_device *mdev)
>> +{
>> + struct ap_matrix_mdev *matrix_mdev = mdev_get_drvdata(mdev);
>> +
>> + mutex_lock(&matrix_dev->lock);
>> +
>> vfio_ap_mdev_reset_queues(mdev);
right, this one will go away.
Thanks for reviewing.
Regards,
Pierre
--
Pierre Morel
Linux/KVM/QEMU in Böblingen - Germany
next prev parent reply other threads:[~2019-03-19 9:38 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-13 16:04 [PATCH v5 0/7] vfio: ap: AP Queue Interrupt Control Pierre Morel
2019-03-13 16:04 ` [PATCH v5 1/7] s390: ap: kvm: add PQAP interception for AQIC Pierre Morel
2019-03-15 10:20 ` Cornelia Huck
2019-03-15 13:26 ` Pierre Morel
2019-03-15 13:41 ` Cornelia Huck
2019-03-15 13:44 ` Pierre Morel
2019-03-15 14:10 ` Pierre Morel
2019-03-15 17:43 ` Halil Pasic
2019-03-19 9:55 ` Pierre Morel
2019-03-15 17:28 ` Halil Pasic
2019-03-19 10:01 ` Pierre Morel
2019-03-19 14:54 ` Halil Pasic
2019-03-19 17:07 ` Pierre Morel
2019-03-21 14:05 ` Pierre Morel
2019-03-13 16:04 ` [PATCH v5 2/7] s390: ap: new vfio_ap_queue structure Pierre Morel
2019-03-15 10:33 ` Cornelia Huck
2019-03-15 13:29 ` Pierre Morel
2019-03-13 16:05 ` [PATCH v5 3/7] vfio: ap: register IOMMU VFIO notifier Pierre Morel
2019-03-13 16:05 ` [PATCH v5 4/7] s390: ap: setup relation betwen KVM and mediated device Pierre Morel
2019-03-15 18:15 ` Halil Pasic
2019-03-19 9:38 ` Pierre Morel [this message]
2019-03-19 11:54 ` Halil Pasic
2019-03-19 14:23 ` Pierre Morel
2019-03-19 14:47 ` Pierre Morel
2019-03-19 15:27 ` Halil Pasic
2019-03-19 16:48 ` Pierre Morel
2019-03-13 16:05 ` [PATCH v5 5/7] s390: ap: implement PAPQ AQIC interception in kernel Pierre Morel
2019-03-13 16:05 ` [PATCH v5 6/7] s390: ap: Cleanup on removing the AP device Pierre Morel
2019-03-13 16:05 ` [PATCH v5 7/7] s390: ap: kvm: Enable PQAP/AQIC facility for the guest 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=7c199329-0e82-ff61-46b7-78237a0f01ce@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).