pci: export pci_dev_unlock() and the respective unlock
Subsystems (3)
PATCH 1/2 pci: export pci_dev_unlock() and the respective unlock
Other places in the kernel use this form, and so just provide a common path for it.
--- drivers/pci/pci.c | 6 ++++-- include/linux/pci.h | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/pci/pci.c +4 -2
@@ -5027,7 +5027,7 @@ static void pci_dev_lock(struct pci_dev *dev) }/* Return 1 on successful lock, 0 on contention */ -static int pci_dev_trylock (struct pci_dev *dev) +int pci_dev_trylock (struct pci_dev *dev) {if (pci_cfg_access_trylock (dev)) {if (device_trylock (&dev->dev))
@@ -5037,12 +5037,14 @@ static int pci_dev_trylock(struct pci_dev *dev)return 0 ; } +EXPORT_SYMBOL_GPL (pci_dev_trylock); -static void pci_dev_unlock (struct pci_dev *dev) +void pci_dev_unlock (struct pci_dev *dev) {device_unlock (&dev->dev);pci_cfg_access_unlock (dev); } +EXPORT_SYMBOL_GPL (pci_dev_unlock);static void pci_dev_save_and_disable (struct pci_dev *dev) {
include/linux/pci.h +3 -0
@@ -1353,6 +1353,9 @@ int devm_request_pci_bus_resources(struct device *dev,/* Temporary until new and working PCI SBR API in place */ int pci_bridge_secondary_bus_reset (struct pci_dev *dev); +int pci_dev_trylock (struct pci_dev *dev); +void pci_dev_unlock (struct pci_dev *dev); +#define pci_bus_for_each_resource (bus, res, i) \ for (i = 0; \ (res = pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \
Signature · 1 line
2.30.2
PATCH 2/2 vfio: use the new pci_dev_trylock() helper to simplify try lock
Use the new pci_dev_trylock() helper to simplify our locking.
--- drivers/vfio/pci/vfio_pci.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/vfio/pci/vfio_pci.c +4 -7
@@ -477,13 +477,10 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev)* We can not use the "try" reset interface here, which will * overwrite the previously restored configuration information. */ -if (vdev->reset_works &&pci_cfg_access_trylock (pdev)) { -if (device_trylock (&pdev->dev)) { -if (!__pci_reset_function_locked (pdev)) - vdev->needs_reset = false; -device_unlock (&pdev->dev); - } -pci_cfg_access_unlock (pdev); +if (vdev->reset_works &&pci_dev_trylock (pdev)) { +if (!__pci_reset_function_locked (pdev)) + vdev->needs_reset = false; +pci_dev_unlock (pdev); }pci_restore_state (pdev);
Signature · 1 line
2.30.2
Hello Luis, Hello Bjorn,
Interesting timing, I currently have a very similar patch lying around though with also exporting pci_dev_lock(). I'm planning to use that for upcoming support of automatic PCI devices recovery on s390x following the Documentation/PCI/pci-error-recovery.rst recovery flow. There too exprting these functions would make the code simpler to grok in my opinion. So if Bjorn accepts this there could soon be another user, not sure if one would want to then already export pci_dev_lock() too or wait until my patches so it's not exported without users.
Best regards,
Niklas Schnelle
Please update the subject line to match the convention:
PCI: Export pci_dev_trylock() and pci_dev_unlock()
Quoted 4 lines · Luis Chamberlain
Other places in the kernel use this form, and so just provide a common path for it.
Signed-off-by Luis Chamberlain <[email protected]>
With tweaks mentioned here:
Quoted 39 lines
--- drivers/pci/pci.c | 6 ++++-- include/linux/pci.h | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-)drivers/pci/pci.c +4
-2@@ -5027,7 +5027,7 @@ static void pci_dev_lock(struct pci_dev *dev) }/* Return 1 on successful lock, 0 on contention */ -static int pci_dev_trylock (struct pci_dev *dev) +int pci_dev_trylock (struct pci_dev *dev) {if (pci_cfg_access_trylock (dev)) {if (device_trylock (&dev->dev))@@ -5037,12 +5037,14 @@ static int pci_dev_trylock(struct pci_dev *dev)return 0 ; } +EXPORT_SYMBOL_GPL (pci_dev_trylock); -static void pci_dev_unlock (struct pci_dev *dev) +void pci_dev_unlock (struct pci_dev *dev) {device_unlock (&dev->dev);pci_cfg_access_unlock (dev); } +EXPORT_SYMBOL_GPL (pci_dev_unlock);static void pci_dev_save_and_disable (struct pci_dev *dev) {include/linux/pci.h +0
-0
include/linux/pci.h int devm_request_pci_bus_resources(struct device *dev, · line 1357
Quoted 5 lines
include/linux/pci.h +2
-0@@ -1353,6 +1353,9 @@ int devm_request_pci_bus_resources(struct device *dev,/* Temporary until new and working PCI SBR API in place */ int pci_bridge_secondary_bus_reset (struct pci_dev *dev); +int pci_dev_trylock (struct pci_dev *dev); +void pci_dev_unlock (struct pci_dev *dev);
Move next to pci_cfg_access_lock(), which seems a little more related.
Quoted 6 lines
include/linux/pci.h +0
-0#define pci_bus_for_each_resource (bus, res, i) \ for (i = 0; \ (res = pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \Signature · 1 line
2.30.2