From: Yao Hongbo <yaohongbo@linux.alibaba.com>
To: mst@redhat.com, gregkh@linuxfoundation.org
Cc: yaohongbo@linux.alibaba.com,
alikernel-developer@linux.alibaba.com, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] uio/uio_pci_generic: Introduce refcnt on open/release
Date: Wed, 13 Apr 2022 15:01:42 +0800 [thread overview]
Message-ID: <1649833302-27299-1-git-send-email-yaohongbo@linux.alibaba.com> (raw)
If two userspace programs both open the PCI UIO fd, when one
of the program exits uncleanly, the other will cause IO hang
due to bus-mastering disabled.
It's a common usage for spdk/dpdk to use UIO. So, introduce refcnt
to avoid such problems.
Fixes: 865a11f987ab("uio/uio_pci_generic: Disable bus-mastering on release")
Reported-by: Xiu Yang <yangxiu.yx@alibaba-inc.com>
Signed-off-by: Yao Hongbo <yaohongbo@linux.alibaba.com>
---
Changes for v2:
Use refcount_t instead of atomic_t to catch overflow/underflows.
---
drivers/uio/uio_pci_generic.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/uio/uio_pci_generic.c b/drivers/uio/uio_pci_generic.c
index e03f9b5..1a5e1fd 100644
--- a/drivers/uio/uio_pci_generic.c
+++ b/drivers/uio/uio_pci_generic.c
@@ -31,6 +31,7 @@
struct uio_pci_generic_dev {
struct uio_info info;
struct pci_dev *pdev;
+ refcount_t refcnt;
};
static inline struct uio_pci_generic_dev *
@@ -39,6 +40,14 @@ struct uio_pci_generic_dev {
return container_of(info, struct uio_pci_generic_dev, info);
}
+static int open(struct uio_info *info, struct inode *inode)
+{
+ struct uio_pci_generic_dev *gdev = to_uio_pci_generic_dev(info);
+
+ refcount_inc(&gdev->refcnt);
+ return 0;
+}
+
static int release(struct uio_info *info, struct inode *inode)
{
struct uio_pci_generic_dev *gdev = to_uio_pci_generic_dev(info);
@@ -51,7 +60,9 @@ static int release(struct uio_info *info, struct inode *inode)
* Note that there's a non-zero chance doing this will wedge the device
* at least until reset.
*/
- pci_clear_master(gdev->pdev);
+ if (refcount_dec_and_test(&gdev->refcnt))
+ pci_clear_master(gdev->pdev);
+
return 0;
}
@@ -92,8 +103,11 @@ static int probe(struct pci_dev *pdev,
gdev->info.name = "uio_pci_generic";
gdev->info.version = DRIVER_VERSION;
+ gdev->info.open = open;
gdev->info.release = release;
gdev->pdev = pdev;
+ refcount_set(&gdev->refcnt, 0);
+
if (pdev->irq && (pdev->irq != IRQ_NOTCONNECTED)) {
gdev->info.irq = pdev->irq;
gdev->info.irq_flags = IRQF_SHARED;
--
1.8.3.1
next reply other threads:[~2022-04-13 7:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 7:01 Yao Hongbo [this message]
2022-04-13 7:33 ` [PATCH v2] uio/uio_pci_generic: Introduce refcnt on open/release Greg KH
2022-04-13 8:51 ` Michael S. Tsirkin
2022-04-13 9:25 ` Yao Hongbo
2022-04-13 9:43 ` Greg KH
2022-04-13 11:09 ` Yao Hongbo
2022-04-13 11:20 ` Greg KH
2022-04-15 6:47 ` Christoph Hellwig
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=1649833302-27299-1-git-send-email-yaohongbo@linux.alibaba.com \
--to=yaohongbo@linux.alibaba.com \
--cc=alikernel-developer@linux.alibaba.com \
--cc=gregkh@linuxfoundation.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.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