From: Halil Pasic <pasic@linux.ibm.com>
To: Tony Krowiak <akrowiak@linux.ibm.com>
Cc: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, borntraeger@de.ibm.com, cohuck@redhat.com,
alex.williamson@redhat.com, kwankhede@nvidia.com,
david@redhat.com
Subject: Re: [PATCH] s390/vfio-ap: Clean up vfio_ap resources when KVM pointer invalidated
Date: Tue, 8 Dec 2020 01:40:18 +0100 [thread overview]
Message-ID: <20201208014018.3f89527f.pasic@linux.ibm.com> (raw)
In-Reply-To: <ab3f1948-bb23-c0d0-7205-f46cd6dbe99d@linux.ibm.com>
On Mon, 7 Dec 2020 14:05:55 -0500
Tony Krowiak <akrowiak@linux.ibm.com> wrote:
>
>
> On 12/2/20 6:41 PM, Tony Krowiak wrote:
> > The vfio_ap device driver registers a group notifier with VFIO when the
> > file descriptor for a VFIO mediated device for a KVM guest is opened to
> > receive notification that the KVM pointer is set (VFIO_GROUP_NOTIFY_SET_KVM
> > event). When the KVM pointer is set, the vfio_ap driver stashes the pointer
> > and calls the kvm_get_kvm() function to increment its reference counter.
> > When the notifier is called to make notification that the KVM pointer has
> > been set to NULL, the driver should clean up any resources associated with
> > the KVM pointer and decrement its reference counter. The current
> > implementation does not take care of this clean up.
> >
> > Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
> > ---
> > drivers/s390/crypto/vfio_ap_ops.c | 21 +++++++++++++--------
> > 1 file changed, 13 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
> > index e0bde8518745..eeb9c9130756 100644
> > --- a/drivers/s390/crypto/vfio_ap_ops.c
> > +++ b/drivers/s390/crypto/vfio_ap_ops.c
> > @@ -1083,6 +1083,17 @@ static int vfio_ap_mdev_iommu_notifier(struct notifier_block *nb,
> > return NOTIFY_DONE;
> > }
> >
> > +static void vfio_ap_mdev_put_kvm(struct ap_matrix_mdev *matrix_mdev)
> > +{
> > + if (matrix_mdev->kvm) {
> > + kvm_arch_crypto_clear_masks(matrix_mdev->kvm);
> > + matrix_mdev->kvm->arch.crypto.pqap_hook = NULL;
> > + vfio_ap_mdev_reset_queues(matrix_mdev->mdev);
>
> This reset probably does not belong here since there is no
> reason to reset the queues in the group notifier (see below).
What about kvm_s390_gisc_unregister()? That needs a valid kvm
pointer, or? Or is it OK to not pair a kvm_s390_gisc_register()
with an kvm_s390_gisc_unregister()?
Regards,
Halil
> The reset should be done in the release callback only regardless
> of whether the KVM pointer exists or not.
>
> > + kvm_put_kvm(matrix_mdev->kvm);
> > + matrix_mdev->kvm = NULL;
> > + }
> > +}
> > +
> > static int vfio_ap_mdev_group_notifier(struct notifier_block *nb,
> > unsigned long action, void *data)
> > {
> > @@ -1095,7 +1106,7 @@ static int vfio_ap_mdev_group_notifier(struct notifier_block *nb,
> > matrix_mdev = container_of(nb, struct ap_matrix_mdev, group_notifier);
> >
> > if (!data) {
> > - matrix_mdev->kvm = NULL;
> > + vfio_ap_mdev_put_kvm(matrix_mdev);
> > return NOTIFY_OK;
> > }
> >
> > @@ -1222,13 +1233,7 @@ 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);
> > - if (matrix_mdev->kvm) {
> > - kvm_arch_crypto_clear_masks(matrix_mdev->kvm);
> > - matrix_mdev->kvm->arch.crypto.pqap_hook = NULL;
> > - vfio_ap_mdev_reset_queues(mdev);
>
> This release should be moved outside of the block and
> performed regardless of whether the KVM pointer exists or
> not.
>
> > - kvm_put_kvm(matrix_mdev->kvm);
> > - matrix_mdev->kvm = NULL;
> > - }
> > + vfio_ap_mdev_put_kvm(matrix_mdev);
> > mutex_unlock(&matrix_dev->lock);
> >
> > vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,
>
next prev parent reply other threads:[~2020-12-08 0:41 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 23:41 [PATCH] s390/vfio-ap: Clean up vfio_ap resources when KVM pointer invalidated Tony Krowiak
2020-12-03 10:19 ` Cornelia Huck
2020-12-03 17:01 ` Halil Pasic
2020-12-03 19:14 ` Tony Krowiak
2020-12-03 17:55 ` Halil Pasic
2020-12-04 14:43 ` Tony Krowiak
2020-12-04 19:05 ` Halil Pasic
2020-12-04 19:46 ` Tony Krowiak
2020-12-04 21:54 ` Halil Pasic
2020-12-07 18:50 ` Tony Krowiak
2020-12-08 0:01 ` Halil Pasic
[not found] ` <e196b743-74d8-398b-4b3e-4a64002d9bfc@linux.ibm.com>
2020-12-13 22:57 ` Halil Pasic
2020-12-04 16:48 ` Tony Krowiak
2020-12-04 16:57 ` Cornelia Huck
2020-12-04 19:47 ` Tony Krowiak
2020-12-07 15:24 ` Halil Pasic
2020-12-07 15:42 ` Christian Borntraeger
2020-12-07 19:05 ` Tony Krowiak
2020-12-08 0:40 ` Halil Pasic [this message]
2020-12-11 21:08 ` Tony Krowiak
2020-12-13 23:13 ` Halil Pasic
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=20201208014018.3f89527f.pasic@linux.ibm.com \
--to=pasic@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=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
/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).