qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Ani Sinha <anisinha@redhat.com>
To: qemu-devel@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
	Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: Ani Sinha <anisinha@redhat.com>,
	jusual@redhat.com, imammedo@redhat.com, akihiko.odaki@daynix.com
Subject: [PATCH v6 5/5] hw/pci: ensure PCIE devices are plugged into only slot 0 of PCIE port
Date: Thu, 29 Jun 2023 09:37:07 +0530	[thread overview]
Message-ID: <20230629040707.115656-6-anisinha@redhat.com> (raw)
In-Reply-To: <20230629040707.115656-1-anisinha@redhat.com>

PCI Express ports only have one slot, so PCI Express devices can only be
plugged into slot 0 on a PCIE port. Enforce it.

The change has been tested to not break ARI by instantiating seven vfs on an
emulated igb device (the maximum number of vfs the linux igb driver supports).
The vfs are seen to have non-zero device/slot numbers in the conventional
PCI BDF representation.

CC: jusual@redhat.com
CC: imammedo@redhat.com
CC: akihiko.odaki@daynix.com

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2128929
Signed-off-by: Ani Sinha <anisinha@redhat.com>
Reviewed-by: Julia Suvorova <jusual@redhat.com>
---
 hw/pci/pci.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index e2eb4c3b4a..0320ac2bb3 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -65,6 +65,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),
@@ -1190,6 +1191,20 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev,
                    name);
 
        return NULL;
+    } /*
+       * With SRIOV and ARI, vfs can have non-zero slot in the conventional
+       * PCI interpretation as all five bits reserved for slot addresses are
+       * also used for function bits for the various vfs. Ignore that case.
+       * It is too early here to check for ARI capabilities in the PCI config
+       * space. Hence, we check for a vf device instead.
+       */
+    else if (!pci_is_vf(pci_dev) &&
+             pcie_has_upstream_port(pci_dev) &&
+             PCI_SLOT(devfn)) {
+        error_setg(errp, "PCI: slot %d is not valid for %s,"
+                   " parent device only allows plugging into slot 0.",
+                   PCI_SLOT(devfn), name);
+        return NULL;
     }
 
     pci_dev->devfn = devfn;
-- 
2.39.1



  parent reply	other threads:[~2023-06-29  4:09 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-29  4:07 [PATCH v6 0/5] test and QEMU fixes to ensure proper PCIE device usage Ani Sinha
2023-06-29  4:07 ` [PATCH v6 1/5] tests/acpi: allow changes in DSDT.noacpihp table blob Ani Sinha
2023-06-29  4:07 ` [PATCH v6 2/5] tests/acpi/bios-tables-test: use the correct slot on the pcie-root-port Ani Sinha
2023-06-29  4:07 ` [PATCH v6 3/5] tests/acpi/bios-tables-test: update acpi blob q35/DSDT.noacpihp Ani Sinha
2023-06-29  4:07 ` [PATCH v6 4/5] tests/qtest/hd-geo-test: fix incorrect pcie-root-port usage and simplify test Ani Sinha
2023-06-29  7:03   ` Thomas Huth
2023-06-30  9:09   ` Igor Mammedov
2023-06-29  4:07 ` Ani Sinha [this message]
2023-06-29  6:47   ` [PATCH v6 5/5] hw/pci: ensure PCIE devices are plugged into only slot 0 of PCIE port Akihiko Odaki
2023-06-29  8:05     ` Ani Sinha
2023-06-29  8:49       ` Akihiko Odaki
2023-06-29 14:18         ` Ani Sinha
2023-06-30  2:43           ` Akihiko Odaki
2023-06-30  6:02             ` Michael S. Tsirkin
2023-06-30  7:41             ` Ani Sinha
2023-06-30  8:32               ` Michael S. Tsirkin
2023-06-30  8:36                 ` Ani Sinha
2023-06-30  8:43                   ` Michael S. Tsirkin
2023-06-30  9:22                     ` Ani Sinha
2023-06-30 10:00                       ` Michael S. Tsirkin
2023-06-30 10:37                         ` Ani Sinha
2023-06-30 10:40                           ` Michael S. Tsirkin
2023-06-30 10:45                             ` Ani Sinha
2023-06-30 10:49                             ` Ani Sinha
2023-06-30 11:36                           ` Akihiko Odaki
2023-06-30 11:47                             ` Ani Sinha
2023-06-30 11:55                             ` Akihiko Odaki
2023-06-30 13:56                               ` Ani Sinha
2023-07-01  7:09                                 ` Akihiko Odaki
2023-07-02  4:59                                   ` Michael S. Tsirkin
2023-07-03  6:08                                     ` Ani Sinha
2023-07-04  5:01                                       ` Akihiko Odaki
2023-07-04  5:39                                         ` Ani Sinha
2023-07-04 10:33                                           ` Ani Sinha
2023-07-04 10:36                                             ` Michael S. Tsirkin
2023-07-04 11:10                                               ` Ani Sinha
2023-07-03 13:31                                     ` Ani Sinha
2023-06-30 15:29                             ` Michael S. Tsirkin
2023-07-01  7:28                               ` Akihiko Odaki
2023-07-04 11:38                                 ` Igor Mammedov
2023-07-04 11:50                                   ` Akihiko Odaki
2023-07-04 12:36                                     ` Igor Mammedov
2023-07-04 12:51                                       ` Akihiko Odaki
2023-07-04 14:03                                     ` Ani Sinha
2023-07-05  2:30                                       ` Akihiko Odaki
2023-06-30 10:25                       ` Michael S. Tsirkin
2023-06-29 14:24   ` Michael S. Tsirkin
2023-06-29 14:37     ` Ani Sinha
2023-06-29 15:32       ` Michael S. Tsirkin
2023-06-29 15:57         ` Ani Sinha
2023-06-29 16:45           ` Ani Sinha

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=20230629040707.115656-6-anisinha@redhat.com \
    --to=anisinha@redhat.com \
    --cc=akihiko.odaki@daynix.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).