From: Luis Chamberlain <mcgrof@kernel.org>
To: bhelgaas@google.com, alex.williamson@redhat.com,
cohuck@redhat.com, jgg@ziepe.ca, kevin.tian@intel.com,
eric.auger@redhat.com, giovanni.cabiddu@intel.com,
mjrosato@linux.ibm.com, jannh@google.com, kvm@vger.kernel.org,
linux-pci@vger.kernel.org
Cc: minchan@kernel.org, gregkh@linuxfoundation.org, jeyu@kernel.org,
ngupta@vflare.org, sergey.senozhatsky.work@gmail.com,
mcgrof@kernel.org, axboe@kernel.dk, mbenes@suse.com,
jpoimboe@redhat.com, tglx@linutronix.de, keescook@chromium.org,
jikos@kernel.org, rostedt@goodmis.org, peterz@infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] vfio: use the new pci_dev_trylock() helper to simplify try lock
Date: Mon, 21 Jun 2021 17:03:10 -0700 [thread overview]
Message-ID: <20210622000310.728294-2-mcgrof@kernel.org> (raw)
In-Reply-To: <20210622000310.728294-1-mcgrof@kernel.org>
Use the new pci_dev_trylock() helper to simplify our locking.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.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
next prev parent reply other threads:[~2021-06-22 0:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 0:03 [PATCH 1/2] pci: export pci_dev_unlock() and the respective unlock Luis Chamberlain
2021-06-22 0:03 ` Luis Chamberlain [this message]
2021-06-22 7:45 ` Niklas Schnelle
2021-06-22 14:57 ` Bjorn Helgaas
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=20210622000310.728294-2-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=alex.williamson@redhat.com \
--cc=axboe@kernel.dk \
--cc=bhelgaas@google.com \
--cc=cohuck@redhat.com \
--cc=eric.auger@redhat.com \
--cc=giovanni.cabiddu@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jannh@google.com \
--cc=jeyu@kernel.org \
--cc=jgg@ziepe.ca \
--cc=jikos@kernel.org \
--cc=jpoimboe@redhat.com \
--cc=keescook@chromium.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mbenes@suse.com \
--cc=minchan@kernel.org \
--cc=mjrosato@linux.ibm.com \
--cc=ngupta@vflare.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=tglx@linutronix.de \
/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).