From: Thomas Huth <thuth@redhat.com> To: Matthew Rosato <mjrosato@linux.ibm.com>, qemu-s390x@nongnu.org Cc: alex.williamson@redhat.com, schnelle@linux.ibm.com, cohuck@redhat.com, farman@linux.ibm.com, pmorel@linux.ibm.com, richard.henderson@linaro.org, david@redhat.com, pasic@linux.ibm.com, borntraeger@linux.ibm.com, mst@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: Re: [PATCH v2 4/9] s390x/pci: enable for load/store intepretation Date: Mon, 17 Jan 2022 15:51:55 +0100 [thread overview] Message-ID: <27a1db36-5664-6c90-ec39-aa6da5c23c31@redhat.com> (raw) In-Reply-To: <20220114203849.243657-5-mjrosato@linux.ibm.com> On 14/01/2022 21.38, Matthew Rosato wrote: > Use the associated vfio feature ioctl to enable interpretation for devices > when requested. As part of this process, we must use the host function > handle rather than a QEMU-generated one -- this is provided as part of the > ioctl payload. > > Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com> > --- > hw/s390x/s390-pci-bus.c | 70 +++++++++++++++++++++++++++++++- > hw/s390x/s390-pci-inst.c | 63 +++++++++++++++++++++++++++- > hw/s390x/s390-pci-vfio.c | 52 ++++++++++++++++++++++++ > include/hw/s390x/s390-pci-bus.h | 1 + > include/hw/s390x/s390-pci-vfio.h | 15 +++++++ > 5 files changed, 199 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 01b58ebc70..a39ccfee05 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -971,12 +971,58 @@ static void s390_pci_update_subordinate(PCIDevice *dev, uint32_t nr) > } > } > > +static int s390_pci_interp_plug(S390pciState *s, S390PCIBusDevice *pbdev) > +{ > + uint32_t idx; > + int rc; > + > + rc = s390_pci_probe_interp(pbdev); > + if (rc) { > + return rc; > + } > + > + rc = s390_pci_update_passthrough_fh(pbdev); > + if (rc) { > + return rc; > + } > + > + /* > + * The host device is already in an enabled state, but we always present > + * the initial device state to the guest as disabled (ZPCI_FS_DISABLED). > + * Therefore, mask off the enable bit from the passthrough handle until > + * the guest issues a CLP SET PCI FN later to enable the device. > + */ > + pbdev->fh &= ~FH_MASK_ENABLE; > + > + /* Next, see if the idx is already in-use */ > + idx = pbdev->fh & FH_MASK_INDEX; > + if (pbdev->idx != idx) { > + if (s390_pci_find_dev_by_idx(s, idx)) { > + return -EINVAL; > + } > + /* > + * Update the idx entry with the passed through idx > + * If the relinquished idx is lower than next_idx, use it > + * to replace next_idx > + */ > + g_hash_table_remove(s->zpci_table, &pbdev->idx); > + if (idx < s->next_idx) { > + s->next_idx = idx; > + } > + pbdev->idx = idx; > + g_hash_table_insert(s->zpci_table, &pbdev->idx, pbdev); > + } > + > + return 0; > +} > + > static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > Error **errp) > { > S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev); > PCIDevice *pdev = NULL; > S390PCIBusDevice *pbdev = NULL; > + int rc; > > if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) { > PCIBridge *pb = PCI_BRIDGE(dev); > @@ -1022,12 +1068,33 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > set_pbdev_info(pbdev); > > if (object_dynamic_cast(OBJECT(dev), "vfio-pci")) { > - pbdev->fh |= FH_SHM_VFIO; > + /* > + * By default, interpretation is always requested; if the available > + * facilities indicate it is not available, fallback to the > + * intercept model. > + */ > + if (pbdev->interp && !s390_has_feat(S390_FEAT_ZPCI_INTERP)) { > + DPRINTF("zPCI interpretation facilities missing.\n"); > + pbdev->interp = false; > + } Wrong indentation in the above three lines. > + if (pbdev->interp) { > + rc = s390_pci_interp_plug(s, pbdev); > + if (rc) { > + error_setg(errp, "zpci interp plug failed: %d", rc); The error message is a little bit scarce for something that might be presented to the user - maybe write at least "interpretation" instead of "interp" ? > + return; > + } > + } > pbdev->iommu->dma_limit = s390_pci_start_dma_count(s, pbdev); > /* Fill in CLP information passed via the vfio region */ > s390_pci_get_clp_info(pbdev); > + if (!pbdev->interp) { > + /* Do vfio passthrough but intercept for I/O */ > + pbdev->fh |= FH_SHM_VFIO; > + } > } else { > pbdev->fh |= FH_SHM_EMUL; > + /* Always intercept emulated devices */ > + pbdev->interp = false; > } Thomas
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Huth <thuth@redhat.com> To: Matthew Rosato <mjrosato@linux.ibm.com>, qemu-s390x@nongnu.org Cc: farman@linux.ibm.com, kvm@vger.kernel.org, pmorel@linux.ibm.com, schnelle@linux.ibm.com, cohuck@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, pasic@linux.ibm.com, alex.williamson@redhat.com, mst@redhat.com, pbonzini@redhat.com, david@redhat.com, borntraeger@linux.ibm.com Subject: Re: [PATCH v2 4/9] s390x/pci: enable for load/store intepretation Date: Mon, 17 Jan 2022 15:51:55 +0100 [thread overview] Message-ID: <27a1db36-5664-6c90-ec39-aa6da5c23c31@redhat.com> (raw) In-Reply-To: <20220114203849.243657-5-mjrosato@linux.ibm.com> On 14/01/2022 21.38, Matthew Rosato wrote: > Use the associated vfio feature ioctl to enable interpretation for devices > when requested. As part of this process, we must use the host function > handle rather than a QEMU-generated one -- this is provided as part of the > ioctl payload. > > Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com> > --- > hw/s390x/s390-pci-bus.c | 70 +++++++++++++++++++++++++++++++- > hw/s390x/s390-pci-inst.c | 63 +++++++++++++++++++++++++++- > hw/s390x/s390-pci-vfio.c | 52 ++++++++++++++++++++++++ > include/hw/s390x/s390-pci-bus.h | 1 + > include/hw/s390x/s390-pci-vfio.h | 15 +++++++ > 5 files changed, 199 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 01b58ebc70..a39ccfee05 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -971,12 +971,58 @@ static void s390_pci_update_subordinate(PCIDevice *dev, uint32_t nr) > } > } > > +static int s390_pci_interp_plug(S390pciState *s, S390PCIBusDevice *pbdev) > +{ > + uint32_t idx; > + int rc; > + > + rc = s390_pci_probe_interp(pbdev); > + if (rc) { > + return rc; > + } > + > + rc = s390_pci_update_passthrough_fh(pbdev); > + if (rc) { > + return rc; > + } > + > + /* > + * The host device is already in an enabled state, but we always present > + * the initial device state to the guest as disabled (ZPCI_FS_DISABLED). > + * Therefore, mask off the enable bit from the passthrough handle until > + * the guest issues a CLP SET PCI FN later to enable the device. > + */ > + pbdev->fh &= ~FH_MASK_ENABLE; > + > + /* Next, see if the idx is already in-use */ > + idx = pbdev->fh & FH_MASK_INDEX; > + if (pbdev->idx != idx) { > + if (s390_pci_find_dev_by_idx(s, idx)) { > + return -EINVAL; > + } > + /* > + * Update the idx entry with the passed through idx > + * If the relinquished idx is lower than next_idx, use it > + * to replace next_idx > + */ > + g_hash_table_remove(s->zpci_table, &pbdev->idx); > + if (idx < s->next_idx) { > + s->next_idx = idx; > + } > + pbdev->idx = idx; > + g_hash_table_insert(s->zpci_table, &pbdev->idx, pbdev); > + } > + > + return 0; > +} > + > static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > Error **errp) > { > S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev); > PCIDevice *pdev = NULL; > S390PCIBusDevice *pbdev = NULL; > + int rc; > > if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) { > PCIBridge *pb = PCI_BRIDGE(dev); > @@ -1022,12 +1068,33 @@ static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev, > set_pbdev_info(pbdev); > > if (object_dynamic_cast(OBJECT(dev), "vfio-pci")) { > - pbdev->fh |= FH_SHM_VFIO; > + /* > + * By default, interpretation is always requested; if the available > + * facilities indicate it is not available, fallback to the > + * intercept model. > + */ > + if (pbdev->interp && !s390_has_feat(S390_FEAT_ZPCI_INTERP)) { > + DPRINTF("zPCI interpretation facilities missing.\n"); > + pbdev->interp = false; > + } Wrong indentation in the above three lines. > + if (pbdev->interp) { > + rc = s390_pci_interp_plug(s, pbdev); > + if (rc) { > + error_setg(errp, "zpci interp plug failed: %d", rc); The error message is a little bit scarce for something that might be presented to the user - maybe write at least "interpretation" instead of "interp" ? > + return; > + } > + } > pbdev->iommu->dma_limit = s390_pci_start_dma_count(s, pbdev); > /* Fill in CLP information passed via the vfio region */ > s390_pci_get_clp_info(pbdev); > + if (!pbdev->interp) { > + /* Do vfio passthrough but intercept for I/O */ > + pbdev->fh |= FH_SHM_VFIO; > + } > } else { > pbdev->fh |= FH_SHM_EMUL; > + /* Always intercept emulated devices */ > + pbdev->interp = false; > } Thomas
next prev parent reply other threads:[~2022-01-17 14:52 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-14 20:38 [PATCH v2 0/9] s390x/pci: zPCI interpretation support Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 1/9] Update linux headers Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 2/9] target/s390x: add zpci-interp to cpu models Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 3/9] fixup: force interp off for QEMU machine 6.2 and older Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-14 21:04 ` Matthew Rosato 2022-01-14 21:04 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 4/9] s390x/pci: enable for load/store intepretation Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-17 14:51 ` Thomas Huth [this message] 2022-01-17 14:51 ` Thomas Huth 2022-01-18 18:08 ` Matthew Rosato 2022-01-18 18:08 ` Matthew Rosato 2022-01-17 15:38 ` Thomas Huth 2022-01-17 15:38 ` Thomas Huth 2022-01-18 18:14 ` Matthew Rosato 2022-01-18 18:14 ` Matthew Rosato 2022-01-31 9:37 ` Pierre Morel 2022-01-31 9:37 ` Pierre Morel 2022-01-31 14:46 ` Pierre Morel 2022-01-31 17:11 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 5/9] s390x/pci: don't fence interpreted devices without MSI-X Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 6/9] s390x/pci: enable adapter event notification for interpreted devices Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-31 15:10 ` Pierre Morel 2022-01-31 15:10 ` Pierre Morel 2022-01-31 17:08 ` Matthew Rosato 2022-01-31 17:08 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 7/9] s390x/pci: use I/O Address Translation assist when interpreting Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 8/9] s390x/pci: use dtsm provided from vfio capabilities for interpreted devices Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-14 20:38 ` [PATCH v2 9/9] s390x/pci: let intercept devices have separate PCI groups Matthew Rosato 2022-01-14 20:38 ` Matthew Rosato 2022-01-17 15:23 ` [PATCH v2 0/9] s390x/pci: zPCI interpretation support Thomas Huth 2022-01-17 15:23 ` Thomas Huth 2022-01-18 18:32 ` Matthew Rosato 2022-01-18 18:32 ` Matthew Rosato 2022-02-04 12:39 ` Michael S. Tsirkin 2022-02-04 12:39 ` Michael S. Tsirkin
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=27a1db36-5664-6c90-ec39-aa6da5c23c31@redhat.com \ --to=thuth@redhat.com \ --cc=alex.williamson@redhat.com \ --cc=borntraeger@linux.ibm.com \ --cc=cohuck@redhat.com \ --cc=david@redhat.com \ --cc=farman@linux.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=mjrosato@linux.ibm.com \ --cc=mst@redhat.com \ --cc=pasic@linux.ibm.com \ --cc=pbonzini@redhat.com \ --cc=pmorel@linux.ibm.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=richard.henderson@linaro.org \ --cc=schnelle@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.