From nobody Fri Jun 19 18:01:24 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3A44C433F5 for ; Thu, 31 Mar 2022 02:24:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231147AbiCaCZz (ORCPT ); Wed, 30 Mar 2022 22:25:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229759AbiCaCZv (ORCPT ); Wed, 30 Mar 2022 22:25:51 -0400 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2D6D6663B for ; Wed, 30 Mar 2022 19:24:03 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=yaohongbo@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0V8ghHu-_1648693432; Received: from localhost(mailfrom:yaohongbo@linux.alibaba.com fp:SMTPD_---0V8ghHu-_1648693432) by smtp.aliyun-inc.com(127.0.0.1); Thu, 31 Mar 2022 10:24:00 +0800 From: Yao Hongbo To: mst@redhat.com, gregkh@linuxfoundation.org Cc: yaohongbo@linux.alibaba.com, linux-kernel@vger.kernel.org, alikernel-developer@linux.alibaba.com Subject: [PATCH RESEND] uio/uio_pci_generic: Introduce refcnt on open/release Date: Thu, 31 Mar 2022 10:23:52 +0800 Message-Id: <1648693432-129409-1-git-send-email-yaohongbo@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: 865a11f("uio/uio_pci_generic: Disable bus-mastering on release") Reported-by: Xiu Yang Signed-off-by: Yao Hongbo --- 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..8add2cf 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; + atomic_t refcnt; }; =20 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); } =20 +static int open(struct uio_info *info, struct inode *inode) +{ + struct uio_pci_generic_dev *gdev =3D to_uio_pci_generic_dev(info); + + atomic_inc(&gdev->refcnt); + return 0; +} + static int release(struct uio_info *info, struct inode *inode) { struct uio_pci_generic_dev *gdev =3D to_uio_pci_generic_dev(info); @@ -51,7 +60,9 @@ static int release(struct uio_info *info, struct inode *i= node) =C2=A0* Note that there's a non-zero chance doing this will wedge the dev= ice =C2=A0* at least until reset. */ - pci_clear_master(gdev->pdev); + if (atomic_dec_and_test(&gdev->refcnt)) + pci_clear_master(gdev->pdev); + return 0; } =20 @@ -92,8 +103,11 @@ static int probe(struct pci_dev *pdev, =20 gdev->info.name =3D "uio_pci_generic"; gdev->info.version =3D DRIVER_VERSION; + gdev->info.open =3D open; gdev->info.release =3D release; gdev->pdev =3D pdev; + atomic_set(&gdev->refcnt, 0); + if (pdev->irq && (pdev->irq !=3D IRQ_NOTCONNECTED)) { gdev->info.irq =3D pdev->irq; gdev->info.irq_flags =3D IRQF_SHARED; --=20 1.8.3.1