From: Matthew Rosato <mjrosato@linux.ibm.com>
To: linux-s390@vger.kernel.org
Cc: 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,
jgg@nvidia.com, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org
Subject: [PATCH v9 17/21] vfio-pci/zdev: add open/close device hooks
Date: Mon, 6 Jun 2022 16:33:21 -0400 [thread overview]
Message-ID: <20220606203325.110625-18-mjrosato@linux.ibm.com> (raw)
In-Reply-To: <20220606203325.110625-1-mjrosato@linux.ibm.com>
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>
---
drivers/vfio/pci/vfio_pci_core.c | 10 +++++++++-
drivers/vfio/pci/vfio_pci_zdev.c | 24 ++++++++++++++++++++++++
include/linux/vfio_pci_core.h | 10 ++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index a0d69ddaf90d..b1e5cfbadf38 100644
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -316,10 +316,14 @@ int vfio_pci_core_enable(struct vfio_pci_core_device *vdev)
pci_write_config_word(pdev, PCI_COMMAND, cmd);
}
- ret = vfio_config_init(vdev);
+ ret = vfio_pci_zdev_open_device(vdev);
if (ret)
goto out_free_state;
+ ret = vfio_config_init(vdev);
+ if (ret)
+ goto out_free_zdev;
+
msix_pos = pdev->msix_cap;
if (msix_pos) {
u16 flags;
@@ -340,6 +344,8 @@ int vfio_pci_core_enable(struct vfio_pci_core_device *vdev)
return 0;
+out_free_zdev:
+ vfio_pci_zdev_close_device(vdev);
out_free_state:
kfree(vdev->pci_saved_state);
vdev->pci_saved_state = NULL;
@@ -418,6 +424,8 @@ void vfio_pci_core_disable(struct vfio_pci_core_device *vdev)
vdev->needs_reset = true;
+ vfio_pci_zdev_close_device(vdev);
+
/*
* 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..686f2e75e392 100644
--- a/drivers/vfio/pci/vfio_pci_zdev.c
+++ 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,26 @@ int vfio_pci_info_zdev_add_caps(struct vfio_pci_core_device *vdev,
return ret;
}
+
+int vfio_pci_zdev_open_device(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);
+}
+
+void vfio_pci_zdev_close_device(struct vfio_pci_core_device *vdev)
+{
+ struct zpci_dev *zdev = to_zpci(vdev->pdev);
+
+ if (!zdev || !vdev->vdev.kvm)
+ return;
+
+ kvm_s390_pci_unregister_kvm(zdev);
+}
diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h
index 63af2897939c..d5d9e17f0156 100644
--- a/include/linux/vfio_pci_core.h
+++ b/include/linux/vfio_pci_core.h
@@ -209,12 +209,22 @@ static inline int vfio_pci_igd_init(struct vfio_pci_core_device *vdev)
#ifdef CONFIG_VFIO_PCI_ZDEV_KVM
extern int vfio_pci_info_zdev_add_caps(struct vfio_pci_core_device *vdev,
struct vfio_info_cap *caps);
+int vfio_pci_zdev_open_device(struct vfio_pci_core_device *vdev);
+void vfio_pci_zdev_close_device(struct vfio_pci_core_device *vdev);
#else
static inline int vfio_pci_info_zdev_add_caps(struct vfio_pci_core_device *vdev,
struct vfio_info_cap *caps)
{
return -ENODEV;
}
+
+static inline int vfio_pci_zdev_open_device(struct vfio_pci_core_device *vdev)
+{
+ return 0;
+}
+
+static inline void vfio_pci_zdev_close_device(struct vfio_pci_core_device *vdev)
+{}
#endif
/* Will be exported for vfio pci drivers usage */
--
2.27.0
next prev parent reply other threads:[~2022-06-06 20:37 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-06 20:33 [PATCH v9 00/21] KVM: s390: enable zPCI for interpretive execution Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 01/21] s390/sclp: detect the zPCI load/store interpretation facility Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 02/21] s390/sclp: detect the AISII facility Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 03/21] s390/sclp: detect the AENI facility Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 04/21] s390/sclp: detect the AISI facility Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 05/21] s390/airq: pass more TPI info to airq handlers Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 06/21] s390/airq: allow for airq structure that uses an input vector Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 07/21] s390/pci: externalize the SIC operation controls and routine Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 08/21] s390/pci: stash associated GISA designation Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 09/21] s390/pci: stash dtsm and maxstbl Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 10/21] vfio/pci: introduce CONFIG_VFIO_PCI_ZDEV_KVM Matthew Rosato
2022-06-08 6:19 ` Thomas Huth
2022-06-08 13:15 ` Matthew Rosato
2022-06-14 8:56 ` Pierre Morel
2022-06-17 16:15 ` Thomas Huth
2022-06-28 14:58 ` Alex Williamson
2022-06-06 20:33 ` [PATCH v9 11/21] KVM: s390: pci: add basic kvm_zdev structure Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 12/21] KVM: s390: pci: do initial setup for AEN interpretation Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 13/21] KVM: s390: pci: enable host forwarding of Adapter Event Notifications Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 14/21] KVM: s390: mechanism to enable guest zPCI Interpretation Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 15/21] KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding Matthew Rosato
2022-06-06 20:33 ` [PATCH v9 16/21] KVM: s390: pci: add routines to start/stop interpretive execution Matthew Rosato
2022-06-28 10:53 ` Pierre Morel
2022-06-28 13:27 ` Matthew Rosato
2022-06-06 20:33 ` Matthew Rosato [this message]
2022-06-28 11:22 ` [PATCH v9 17/21] vfio-pci/zdev: add open/close device hooks Pierre Morel
2022-06-28 14:59 ` Alex Williamson
2022-06-06 20:33 ` [PATCH v9 18/21] vfio-pci/zdev: add function handle to clp base capability Matthew Rosato
2022-06-28 14:59 ` Alex Williamson
2022-06-06 20:33 ` [PATCH v9 19/21] vfio-pci/zdev: different maxstbl for interpreted devices Matthew Rosato
2022-06-28 15:00 ` Alex Williamson
2022-06-06 20:33 ` [PATCH v9 20/21] KVM: s390: add KVM_S390_ZPCI_OP to manage guest zPCI devices Matthew Rosato
2022-06-08 6:00 ` Thomas Huth
2022-06-14 8:49 ` Pierre Morel
2022-06-06 20:33 ` [PATCH v9 21/21] MAINTAINERS: additional files related kvm s390 pci passthrough Matthew Rosato
2022-06-08 6:02 ` Thomas Huth
2022-06-06 20:42 ` [PATCH v9 00/21] KVM: s390: enable zPCI for interpretive execution Matthew Rosato
2022-06-27 20:57 ` Matthew Rosato
2022-06-28 12:35 ` Christian Borntraeger
2022-06-28 13:40 ` Matthew Rosato
2022-06-28 13:49 ` Jason Gunthorpe
2022-06-28 14:02 ` Christian Borntraeger
2022-07-08 11:33 ` Christian Borntraeger
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=20220606203325.110625-18-mjrosato@linux.ibm.com \
--to=mjrosato@linux.ibm.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=jgg@nvidia.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=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).