linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Li <chrisl@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
	 Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	 "Rafael J. Wysocki" <rafael@kernel.org>,
	Danilo Krummrich <dakr@kernel.org>,  Len Brown <lenb@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
	 linux-acpi@vger.kernel.org, David Matlack <dmatlack@google.com>,
	 Pasha Tatashin <tatashin@google.com>,
	Jason Miu <jasonmiu@google.com>,
	 Vipin Sharma <vipinsh@google.com>,
	Saeed Mahameed <saeedm@nvidia.com>,
	 Adithya Jayachandran <ajayachandra@nvidia.com>,
	 Parav Pandit <parav@nvidia.com>, William Tu <witu@nvidia.com>,
	 Mike Rapoport <rppt@kernel.org>, Chris Li <chrisl@kernel.org>,
	 Jason Gunthorpe <jgg@ziepe.ca>,
	Leon Romanovsky <leon@kernel.org>
Subject: [PATCH RFC 24/25] PCI: pci-lu-pf-stub: Add a PF stub driver for Live Update testing
Date: Mon, 28 Jul 2025 01:24:54 -0700	[thread overview]
Message-ID: <20250728-luo-pci-v1-24-955b078dd653@kernel.org> (raw)
In-Reply-To: <20250728-luo-pci-v1-0-955b078dd653@kernel.org>

The pci-lu-stub driver will always request device in probe(). However if
the PF driver might be add the liveupdate device list due to "depended" bit
rather than "requested" bit.

Create the pci-lu-stub-pf driver base on the pci-lu-stuf driver, it will
not request the device at probe().

For PF device, also restore the number of VFs at probe().

Signed-off-by: Chris Li <chrisl@kernel.org>
---
 drivers/pci/pci-lu-stub.c | 85 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 81 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/pci-lu-stub.c b/drivers/pci/pci-lu-stub.c
index ea8142dcb250d31cbf817df957157bc4ec3a876d..ff6230102b83ff3ad646c23b79d4e1b6de58b43f 100644
--- a/drivers/pci/pci-lu-stub.c
+++ b/drivers/pci/pci-lu-stub.c
@@ -5,6 +5,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 
+#include "pci.h"
+
 struct pci_lu_stub_ser {
 	u16 dev_id;
 } __packed;
@@ -32,15 +34,47 @@ static int validate_folio(struct pci_dev *dev, struct folio *folio)
 	return 0;
 }
 
-static int pci_lu_stub_probe(struct pci_dev *dev, const struct pci_device_id *id)
+static bool is_pf_driver(struct pci_dev *dev)
+{
+	return pci_get_drvdata(dev);
+}
+
+static int check_lu_flags(struct pci_dev *dev, bool is_pf)
+{
+	struct dev_liveupdate *lu = &dev->dev.lu;
+	bool expect_requested = !is_pf;
+	bool expect_depended = is_pf;
+
+	if (lu->requested != expect_requested) {
+		pci_err(dev, "Device requested bit %d not match expected %d\n",
+			lu->requested, expect_requested);
+		return -EINVAL;
+	}
+
+	if (lu->depended != expect_depended) {
+		pci_err(dev, "Device requested bit %d not match expected %d\n",
+			lu->depended, expect_depended);
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static int __pci_lu_stub_probe(struct pci_dev *dev, const struct pci_device_id *id,
+			       bool is_pf)
 {
 	struct folio *folio;
 	u64 data;
 	int ret;
+	int vfs;
+	struct dev_liveupdate *lu = &dev->dev.lu;
+	struct pci_dev_ser *s;
 
+	pci_set_drvdata(dev, (void *)(intptr_t) is_pf);
 	if (liveupdate_state_normal()) {
-		pci_info(dev, "Marking device as liveupdate requested\n");
-		dev->dev.lu.requested = 1;
+		if (!is_pf) {
+			pci_info(dev, "Marking device as liveupdate requested\n");
+			lu->requested = 1;
+		}
 		return 0;
 	}
 
@@ -49,6 +83,10 @@ static int pci_lu_stub_probe(struct pci_dev *dev, const struct pci_device_id *id
 		return -EOPNOTSUPP;
 	}
 
+	ret = check_lu_flags(dev, is_pf);
+	if (ret)
+		return ret;
+
 	ret = pci_liveupdate_get_driver_data(dev, &data);
 	if (ret) {
 		pci_err(dev, "Failed to get driver data for device (%d)\n", ret);
@@ -63,7 +101,31 @@ static int pci_lu_stub_probe(struct pci_dev *dev, const struct pci_device_id *id
 		return -ENOENT;
 	}
 
-	return validate_folio(dev, folio);
+	ret = validate_folio(dev, folio);
+	if (ret)
+		return ret;
+
+	s = lu->dev_state;
+	vfs = s->num_vfs;
+	if (dev->is_physfn && vfs) {
+		ret = pci_sriov_configure_simple(dev, vfs);
+		if (vfs != ret) {
+			pci_err(dev, "Failed to restore num VFs %d got %d\n",
+				vfs, ret);
+			return (ret < 0) ? ret : -EAGAIN;
+		}
+	}
+	return  0;
+}
+
+static int pci_lu_stub_probe(struct pci_dev *dev, const struct pci_device_id *id)
+{
+	return __pci_lu_stub_probe(dev, id, false);
+}
+
+static int pci_lu_stub_pf_probe(struct pci_dev *dev, const struct pci_device_id *id)
+{
+	return __pci_lu_stub_probe(dev, id, true);
 }
 
 static void pci_lu_stub_remove(struct pci_dev *dev)
@@ -74,10 +136,15 @@ static void pci_lu_stub_remove(struct pci_dev *dev)
 
 static int pci_lu_stub_prepare(struct device *dev, u64 *data)
 {
+	struct pci_dev *pdev = to_pci_dev(dev);
 	struct pci_lu_stub_ser *ser;
 	struct folio *folio;
 	int ret;
 
+	ret = check_lu_flags(pdev, is_pf_driver(pdev));
+	if (ret)
+		return ret;
+
 	folio = folio_alloc(GFP_KERNEL | __GFP_ZERO, get_order(sizeof(*ser)));
 	if (!folio)
 		return -ENOMEM;
@@ -135,5 +202,15 @@ static struct pci_driver pci_lu_stub_driver = {
 	.driver.lu	= &liveupdate_ops,
 };
 
+static struct pci_driver pci_lu_stub_pf_driver = {
+	.name		= "pci-lu-stub-pf",
+	.id_table	= pci_lu_stub_id_table,
+	.probe		= pci_lu_stub_pf_probe,
+	.remove		= pci_lu_stub_remove,
+	.sriov_configure = pci_sriov_configure_simple,
+	.driver.lu	= &liveupdate_ops,
+};
+
 module_pci_driver(pci_lu_stub_driver);
+module_pci_driver(pci_lu_stub_pf_driver);
 MODULE_LICENSE("GPL");

-- 
2.50.1.487.gc89ff58d15-goog


  parent reply	other threads:[~2025-07-28  8:25 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-28  8:24 [RFC PATCH 00/25] Live Update Orchestrator: PCI subsystem Chris Li
2025-07-28  8:24 ` [PATCH RFC 01/25] PCI/LUO: Register with Liveupdate Orchestrator Chris Li
2025-07-28  8:24 ` [PATCH RFC 02/25] PCI/LUO: Add struct dev_liveupdate Chris Li
2025-07-28  8:24 ` [PATCH RFC 03/25] PCI/LUO: Create requested liveupdate device list Chris Li
2025-07-28  8:24 ` [PATCH RFC 04/25] PCI/LUO: Forward prepare()/freeze()/cancel() callbacks to driver Chris Li
2025-07-28  8:24 ` [PATCH RFC 05/25] PCI/LUO: Restore state at PCI enumeration Chris Li
2025-07-28  8:24 ` [PATCH RFC 06/25] PCI/LUO: Forward finish callbacks to drivers Chris Li
2025-07-28  8:24 ` [PATCH RFC 07/25] PCI/LUO: Save and restore driver name Chris Li
2025-07-28  8:24 ` [PATCH RFC 08/25] PCI/LUO: Add liveupdate to pcieport driver Chris Li
2025-07-28  8:24 ` [PATCH RFC 09/25] PCI/LUO: Save SR-IOV number of VF Chris Li
2025-07-28  8:24 ` [PATCH RFC 10/25] PCI/LUO: Add pci_liveupdate_get_driver_data() Chris Li
2025-07-28  8:24 ` [PATCH RFC 11/25] PCI: pci-lu-stub: Add a stub driver for Live Update testing Chris Li
2025-07-28  8:24 ` [PATCH RFC 12/25] PCI/LUO: Save struct pci_dev info during prepare phase chrisl
2025-07-28  8:24 ` [PATCH RFC 13/25] PCI/LUO: Check the device function numbers in restoration chrisl
2025-07-28  8:24 ` [PATCH RFC 14/25] PCI/LUO: Restore power state of a PCI device chrisl
2025-07-28  8:24 ` [PATCH RFC 15/25] PCI/LUO: Restore PM related fields chrisl
2025-07-28  8:24 ` [PATCH RFC 16/25] PCI/LUO: Restore the pme_poll flag chrisl
2025-07-28  8:24 ` [PATCH RFC 17/25] PCI/LUO: Restore the no_d3cold flag chrisl
2025-07-28  8:24 ` [PATCH RFC 18/25] PCI/LUO: Restore pci_dev fields during probe chrisl
2025-07-28  8:24 ` [PATCH RFC 19/25] PCI/LUO: Track liveupdate buses Chris Li
2025-07-28  8:24 ` [PATCH RFC 20/25] PCI/LUO: Avoid write to liveupdate devices at boot Chris Li
2025-07-28 17:23   ` Thomas Gleixner
2025-07-28 23:50     ` Jason Gunthorpe
2025-07-30  4:13       ` Chris Li
2025-07-30  1:51     ` Chris Li
2025-07-31 15:01       ` Jason Gunthorpe
2025-08-01 23:04         ` Chris Li
2025-08-02 13:50           ` Jason Gunthorpe
2025-08-07  0:50             ` Chris Li
2025-07-28  8:24 ` [PATCH RFC 21/25] PCI/LUO: Save and restore the PCI resource chrisl
2025-07-28  8:24 ` [PATCH RFC 22/25] PCI/LUO: Save PCI bus and host bridge states chrisl
2025-07-28  8:24 ` [PATCH RFC 23/25] PCI/LUO: Check the PCI bus state after restoration chrisl
2025-07-28  8:24 ` Chris Li [this message]
2025-07-28  8:24 ` [PATCH RFC 25/25] PCI/LUO: Clean up PCI_SER_GET() chrisl

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=20250728-luo-pci-v1-24-955b078dd653@kernel.org \
    --to=chrisl@kernel.org \
    --cc=ajayachandra@nvidia.com \
    --cc=bhelgaas@google.com \
    --cc=dakr@kernel.org \
    --cc=dmatlack@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jasonmiu@google.com \
    --cc=jgg@ziepe.ca \
    --cc=lenb@kernel.org \
    --cc=leon@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=parav@nvidia.com \
    --cc=rafael@kernel.org \
    --cc=rppt@kernel.org \
    --cc=saeedm@nvidia.com \
    --cc=tatashin@google.com \
    --cc=vipinsh@google.com \
    --cc=witu@nvidia.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).