Received-SPF: pass (google.com: domain of linux-kernel+bounces-107498-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Mikhail Malyshev <mike.malyshev@gmail.com>
To: alex.williamson@redhat.com,
	jgg@ziepe.ca,
	yi.l.liu@intel.com,
	kevin.tian@intel.com,
	tglx@linutronix.de,
	reinette.chatre@intel.com,
	stefanha@redhat.com
Cc: abhsahu@nvidia.com,
	kvm@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Mikhail Malyshev <mike.malyshev@gmail.com>
Subject: [PATCH 1/1] vfio/pci: Reenable runtime PM for dynamically unbound devices
Date: Tue, 19 Mar 2024 12:04:10 +0000
Message-Id: <20240319120410.1477713-2-mike.malyshev@gmail.com>
In-Reply-To: <20240319120410.1477713-1-mike.malyshev@gmail.com>
References: <20240319120410.1477713-1-mike.malyshev@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

When a device is unbound from its driver it may call pm_runtime_disable()
in its ->remove() callback. When such device is bound to vfio-pci driver
VFIO framework should reenable runtime PM before calling pm_runtime_xxx
functions.

The problem was introduced by
commit 7ab5e10eda02 ("vfio/pci: Move the unused device into low power state
 with runtime PM")

Signed-off-by: Mikhail Malyshev <mike.malyshev@gmail.com>
---
 drivers/vfio/pci/vfio_pci_core.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c
index 1cbc990d42e0..05c25ee66ee1 100644
--- a/drivers/vfio/pci/vfio_pci_core.c
+++ b/drivers/vfio/pci/vfio_pci_core.c
@@ -2258,6 +2258,16 @@ int vfio_pci_core_register_device(struct vfio_pci_core_device *vdev)
 	vfio_pci_set_power_state(vdev, PCI_D0);
 
 	dev->driver->pm = &vfio_pci_core_pm_ops;
+
+	/*
+	 * If the device was previously associated with a driver, the
+	 * driver might have invoked pm_runtime_disable in its remove()
+	 * callback. We must re-enable runtime PM here to ensure the
+	 * device can be managed.
+	 */
+	if (!pm_runtime_enabled(dev))
+		pm_runtime_enable(dev);
+
 	pm_runtime_allow(dev);
 	if (!disable_idle_d3)
 		pm_runtime_put(dev);
-- 
2.34.1