From: Ani Sinha <anisinha@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: Ani Sinha <anisinha@redhat.com>,
jusual@redhat.com, imammedo@redhat.com, qemu-devel@nongnu.org
Subject: [PATCH v4] hw/pci: enforce use of slot only slot 0 when devices have an upstream PCIE port
Date: Tue, 20 Jun 2023 12:48:05 +0530 [thread overview]
Message-ID: <20230620071805.4400-1-anisinha@redhat.com> (raw)
When a device has an upstream PCIE port, we can only use slot 0. Non-zero slots
are invalid. This change ensures that we throw an error if the user
tries to hotplug a device with an upstream PCIE port to a non-zero slot.
CC: jusual@redhat.com
CC: imammedo@redhat.com
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2128929
Signed-off-by: Ani Sinha <anisinha@redhat.com>
---
hw/pci/pci.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
changelog:
v2: addressed issue with multifunction pcie root ports. Should allow
hotplug on functions other than function 0.
v3: improved commit message.
v4: improve commit message and code comments further. Some more
improvements might come in v5. No claims made here that this is
the final one :-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index bf38905b7d..30ce6a78cb 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -64,6 +64,7 @@ bool pci_available = true;
static char *pcibus_get_dev_path(DeviceState *dev);
static char *pcibus_get_fw_dev_path(DeviceState *dev);
static void pcibus_reset(BusState *qbus);
+static bool pcie_has_upstream_port(PCIDevice *dev);
static Property pci_props[] = {
DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
@@ -1182,6 +1183,11 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev,
} else if (dev->hotplugged &&
!pci_is_vf(pci_dev) &&
pci_get_function_0(pci_dev)) {
+ /*
+ * populating function 0 triggers a bus scan from the guest that
+ * exposes other non-zero functions. Hence we need to ensure that
+ * function 0 wasn't added yet.
+ */
error_setg(errp, "PCI: slot %d function 0 already occupied by %s,"
" new func %s cannot be exposed to guest.",
PCI_SLOT(pci_get_function_0(pci_dev)->devfn),
@@ -1189,6 +1195,18 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev,
name);
return NULL;
+ } else if (dev->hotplugged &&
+ !pci_is_vf(pci_dev) &&
+ pcie_has_upstream_port(pci_dev) && PCI_SLOT(devfn)) {
+ /*
+ * If the device has an upstream PCIE port, like a pcie root port,
+ * we only support functions on slot 0.
+ */
+ error_setg(errp, "PCI: slot %d is not valid for %s,"
+ " only functions on slot 0 is supported for devices"
+ " with an upstream PCIE port.",
+ PCI_SLOT(devfn), name);
+ return NULL;
}
pci_dev->devfn = devfn;
--
2.39.1
next reply other threads:[~2023-06-20 7:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 7:18 Ani Sinha [this message]
2023-06-20 8:59 ` [PATCH v4] hw/pci: enforce use of slot only slot 0 when devices have an upstream PCIE port Igor Mammedov
2023-06-20 12:14 ` Michael S. Tsirkin
2023-06-20 10:43 ` Michael S. Tsirkin
2023-06-21 2:39 ` Ani Sinha
2023-06-21 5:07 ` Michael S. Tsirkin
2023-06-21 11:06 ` Ani Sinha
2023-06-21 11:25 ` Ani Sinha
2023-06-21 11:50 ` Ani Sinha
2023-06-22 10:37 ` Ani Sinha
2023-06-20 10:44 ` 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=20230620071805.4400-1-anisinha@redhat.com \
--to=anisinha@redhat.com \
--cc=imammedo@redhat.com \
--cc=jusual@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.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).