linux-kernel - [PATCH v2] vdpa/octeon_ep: Control PCI dev enabling manually

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-next>] [day] [month] [year] [list]

Message-ID: <20250423103909.59063-2-phasta@kernel.org>
Date: Wed, 23 Apr 2025 12:39:10 +0200
From: Philipp Stanner <phasta@...nel.org>
To: schalla@...vell.com,
	vattunuru@...vell.com,
	"Michael S. Tsirkin" <mst@...hat.com>,
	Jason Wang <jasowang@...hat.com>,
	Xuan Zhuo <xuanzhuo@...ux.alibaba.com>,
	Eugenio Pérez <eperezma@...hat.com>,
	Shijith Thotton <sthotton@...vell.com>,
	Dan Carpenter <dan.carpenter@...aro.org>,
	Philipp Stanner <phasta@...nel.org>,
	Satha Rao <skoteshwar@...vell.com>
Cc: virtualization@...ts.linux.dev,
	linux-kernel@...r.kernel.org
Subject: [PATCH v2] vdpa/octeon_ep: Control PCI dev enabling manually

PCI region request functions such as pci_request_region() currently have
the problem of becoming sometimes managed functions, if
pcim_enable_device() instead of pci_enable_device() was called. The PCI
subsystem wants to remove this deprecated behavior from its interfaces.

octeopn_ep enables its device with pcim_enable_device(), but does so
only to get automatic disablement. The driver wants to manage its PCI
resources manually, without devres.

The easiest way not to use automatic resource management at all is by
also handling device enable- and disablement manually.

Replace pcim_enable_device() with pci_enable_device(). Add the necessary
calls to pci_disable_device().

Signed-off-by: Philipp Stanner <phasta@...nel.org>
---
Was formerly called "Use non-hybrid PCI devres API"

Changes in v2:
  - Don't replace the request functions. Enable / disable manually
    instead. (Vamsi)
---
 drivers/vdpa/octeon_ep/octep_vdpa_main.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/vdpa/octeon_ep/octep_vdpa_main.c b/drivers/vdpa/octeon_ep/octep_vdpa_main.c
index f3d4dda4e04c..0a282f9186f4 100644
--- a/drivers/vdpa/octeon_ep/octep_vdpa_main.c
+++ b/drivers/vdpa/octeon_ep/octep_vdpa_main.c
@@ -492,6 +492,8 @@ static void octep_vdpa_remove(struct pci_dev *pdev)
 		octep_vdpa_remove_vf(pdev);
 	else
 		octep_vdpa_remove_pf(pdev);
+
+	pci_disable_device(pdev);
 }
 
 static int octep_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,
@@ -825,7 +827,7 @@ static int octep_vdpa_probe_pf(struct pci_dev *pdev)
 	struct octep_pf *octpf;
 	int ret;
 
-	ret = pcim_enable_device(pdev);
+	ret = pci_enable_device(pdev);
 	if (ret) {
 		dev_err(dev, "Failed to enable device\n");
 		return ret;
@@ -834,15 +836,17 @@ static int octep_vdpa_probe_pf(struct pci_dev *pdev)
 	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
 	if (ret) {
 		dev_err(dev, "No usable DMA configuration\n");
-		return ret;
+		goto disable_pci;
 	}
 	octpf = devm_kzalloc(dev, sizeof(*octpf), GFP_KERNEL);
-	if (!octpf)
-		return -ENOMEM;
+	if (!octpf) {
+		ret = -ENOMEM;
+		goto disable_pci;
+	}
 
 	ret = octep_iomap_region(pdev, octpf->base, OCTEP_HW_MBOX_BAR);
 	if (ret)
-		return ret;
+		goto disable_pci;
 
 	pci_set_master(pdev);
 	pci_set_drvdata(pdev, octpf);
@@ -856,6 +860,8 @@ static int octep_vdpa_probe_pf(struct pci_dev *pdev)
 
 unmap_region:
 	octep_iounmap_region(pdev, octpf->base, OCTEP_HW_MBOX_BAR);
+disable_pci:
+	pci_disable_device(pdev);
 	return ret;
 }
 
-- 
2.48.1