From: Jason Gunthorpe <jgg@nvidia.com>
To: Matthew Rosato <mjrosato@linux.ibm.com>
Cc: linux-s390@vger.kernel.org, alex.williamson@redhat.com,
cohuck@redhat.com, schnelle@linux.ibm.com, farman@linux.ibm.com,
pmorel@linux.ibm.com, borntraeger@linux.ibm.com,
hca@linux.ibm.com, gor@linux.ibm.com,
gerald.schaefer@linux.ibm.com, agordeev@linux.ibm.com,
svens@linux.ibm.com, frankja@linux.ibm.com, david@redhat.com,
imbrenda@linux.ibm.com, vneethv@linux.ibm.com,
oberpar@linux.ibm.com, freude@linux.ibm.com, thuth@redhat.com,
pasic@linux.ibm.com, pbonzini@redhat.com, corbet@lwn.net,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-doc@vger.kernel.org
Subject: Re: [PATCH v8 17/22] vfio-pci/zdev: add open/close device hooks
Date: Tue, 24 May 2022 18:08:15 -0300 [thread overview]
Message-ID: <20220524210815.GB1343366@nvidia.com> (raw)
In-Reply-To: <20220524185907.140285-18-mjrosato@linux.ibm.com>
On Tue, May 24, 2022 at 02:59:02PM -0400, Matthew Rosato wrote:
> During vfio-pci open_device, pass the KVM associated with the vfio group
> (if one exists). This is needed in order to pass a special indicator
> (GISA) to firmware to allow zPCI interpretation facilities to be used
> for only the specific KVM associated with the vfio-pci device. During
> vfio-pci close_device, unregister the notifier.
>
> Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
> arch/s390/include/asm/pci.h | 2 ++
> drivers/vfio/pci/vfio_pci_core.c | 11 ++++++++++-
> drivers/vfio/pci/vfio_pci_zdev.c | 27 +++++++++++++++++++++++++++
> include/linux/vfio_pci_core.h | 12 ++++++++++++
> 4 files changed, 51 insertions(+), 1 deletion(-)
>
> diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
> index 85eb0ef9d4c3..67fbce1ea0c9 100644
> +++ b/arch/s390/include/asm/pci.h
> @@ -5,6 +5,7 @@
> #include <linux/pci.h>
> #include <linux/mutex.h>
> #include <linux/iommu.h>
> +#include <linux/notifier.h>
> #include <linux/pci_hotplug.h>
> #include <asm-generic/pci.h>
> #include <asm/pci_clp.h>
> @@ -195,6 +196,7 @@ struct zpci_dev {
> struct s390_domain *s390_domain; /* s390 IOMMU domain data */
> struct kvm_zdev *kzdev;
> struct mutex kzdev_lock;
> + struct notifier_block nb; /* vfio notifications */
This is obsolete now right? Same for the #include ?
> @@ -418,6 +424,9 @@ void vfio_pci_core_disable(struct vfio_pci_core_device *vdev)
>
> vdev->needs_reset = true;
>
> + if (vfio_pci_zdev_release(vdev))
> + pci_info(pdev, "%s: Couldn't restore zPCI state\n", __func__);
> +
> /*
> * If we have saved state, restore it. If we can reset the device,
> * even better. Resetting with current state seems better than
> diff --git a/drivers/vfio/pci/vfio_pci_zdev.c b/drivers/vfio/pci/vfio_pci_zdev.c
> index ea4c0d2b0663..d0df85c8b204 100644
> +++ b/drivers/vfio/pci/vfio_pci_zdev.c
> @@ -11,6 +11,7 @@
> #include <linux/uaccess.h>
> #include <linux/vfio.h>
> #include <linux/vfio_zdev.h>
> +#include <linux/kvm_host.h>
> #include <asm/pci_clp.h>
> #include <asm/pci_io.h>
>
> @@ -136,3 +137,29 @@ int vfio_pci_info_zdev_add_caps(struct vfio_pci_core_device *vdev,
>
> return ret;
> }
> +
> +int vfio_pci_zdev_open(struct vfio_pci_core_device *vdev)
> +{
> + struct zpci_dev *zdev = to_zpci(vdev->pdev);
> +
> + if (!zdev)
> + return -ENODEV;
> +
> + if (!vdev->vdev.kvm)
> + return 0;
> +
> + return kvm_s390_pci_register_kvm(zdev, vdev->vdev.kvm);
> +}
> +
> +int vfio_pci_zdev_release(struct vfio_pci_core_device *vdev)
> +{
> + struct zpci_dev *zdev = to_zpci(vdev->pdev);
Keeping these functions named open_device/close_device wouuld probably
be clearer
> + if (!zdev)
> + return -ENODEV;
> +
> + if (!vdev->vdev.kvm)
> + return 0;
> +
> + return kvm_s390_pci_unregister_kvm(zdev);
> +}
Again this cannot fail, you should make it return void, not ignore the
failure - or at least push the ignoring the failure down to the place
that is causing this.
Otherwise it looks fine to me, thanks
Jason
next prev parent reply other threads:[~2022-05-24 21:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-24 18:58 [PATCH v8 00/22] KVM: s390: enable zPCI for interpretive execution Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 01/22] s390/sclp: detect the zPCI load/store interpretation facility Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 02/22] s390/sclp: detect the AISII facility Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 03/22] s390/sclp: detect the AENI facility Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 04/22] s390/sclp: detect the AISI facility Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 05/22] s390/airq: pass more TPI info to airq handlers Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 06/22] s390/airq: allow for airq structure that uses an input vector Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 07/22] s390/pci: externalize the SIC operation controls and routine Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 08/22] s390/pci: stash associated GISA designation Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 09/22] s390/pci: stash dtsm and maxstbl Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 10/22] vfio/pci: introduce CONFIG_VFIO_PCI_ZDEV_KVM Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 11/22] KVM: s390: pci: add basic kvm_zdev structure Matthew Rosato
2022-05-24 22:50 ` Alex Williamson
2022-05-25 13:19 ` Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 12/22] KVM: s390: pci: do initial setup for AEN interpretation Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 13/22] KVM: s390: pci: enable host forwarding of Adapter Event Notifications Matthew Rosato
2022-05-24 18:58 ` [PATCH v8 14/22] KVM: s390: mechanism to enable guest zPCI Interpretation Matthew Rosato
2022-05-24 18:59 ` [PATCH v8 15/22] KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding Matthew Rosato
2022-05-24 18:59 ` [PATCH v8 16/22] KVM: s390: pci: add routines to start/stop interpretive execution Matthew Rosato
2022-05-24 18:59 ` [PATCH v8 17/22] vfio-pci/zdev: add open/close device hooks Matthew Rosato
2022-05-24 21:08 ` Jason Gunthorpe [this message]
2022-05-25 13:23 ` Matthew Rosato
2022-05-24 18:59 ` [PATCH v8 18/22] vfio-pci/zdev: add function handle to clp base capability Matthew Rosato
2022-05-24 18:59 ` [PATCH v8 19/22] vfio-pci/zdev: different maxstbl for interpreted devices Matthew Rosato
2022-05-24 18:59 ` [PATCH v8 20/22] KVM: s390: add KVM_S390_ZPCI_OP to manage guest zPCI devices Matthew Rosato
2022-05-24 18:59 ` [PATCH v8 21/22] KVM: s390: introduce CPU feature for zPCI Interpretation Matthew Rosato
2022-05-24 18:59 ` [PATCH v8 22/22] MAINTAINERS: additional files related kvm s390 pci passthrough Matthew Rosato
2022-05-24 19:06 ` [PATCH v8 00/22] KVM: s390: enable zPCI for interpretive execution Matthew Rosato
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=20220524210815.GB1343366@nvidia.com \
--to=jgg@nvidia.com \
--cc=agordeev@linux.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=corbet@lwn.net \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=freude@linux.ibm.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=oberpar@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=pmorel@linux.ibm.com \
--cc=schnelle@linux.ibm.com \
--cc=svens@linux.ibm.com \
--cc=thuth@redhat.com \
--cc=vneethv@linux.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).