linux-kernel - [PATCH v2 2/2] vfio: use the new pci_dev_trylock() helper to simplify try lock

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 22 Jun 2021 19:28:24 -0700
From:   Luis Chamberlain <mcgrof@...nel.org>
To:     bhelgaas@...gle.com, alex.williamson@...hat.com, cohuck@...hat.com,
        jgg@...pe.ca, kevin.tian@...el.com, eric.auger@...hat.com,
        giovanni.cabiddu@...el.com, mjrosato@...ux.ibm.com,
        jannh@...gle.com, kvm@...r.kernel.org, linux-pci@...r.kernel.org,
        schnelle@...ux.ibm.com
Cc:     minchan@...nel.org, gregkh@...uxfoundation.org, rafael@...nel.org,
        jeyu@...nel.org, ngupta@...are.org,
        sergey.senozhatsky.work@...il.com, mcgrof@...nel.org,
        axboe@...nel.dk, mbenes@...e.com, jpoimboe@...hat.com,
        tglx@...utronix.de, keescook@...omium.org, jikos@...nel.org,
        rostedt@...dmis.org, peterz@...radead.org,
        linux-kernel@...r.kernel.org
Subject: [PATCH v2 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.

Signed-off-by: Luis Chamberlain <mcgrof@...nel.org>
---
 drivers/vfio/pci/vfio_pci.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index bd7c482c948a..02b05f7b9a91 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -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);
-- 
2.30.2