linux-kernel - RE: [EXTERNAL] [PATCH v3] 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-prev] [day] [month] [year] [list]

Message-ID:
 <SJ4PPFEA6F74CA26702153052BF3AD03B9AA6842@SJ4PPFEA6F74CA2.namprd18.prod.outlook.com>
Date: Fri, 25 Apr 2025 11:23:23 +0000
From: Vamsi Krishna Attunuru <vattunuru@...vell.com>
To: Philipp Stanner <phasta@...nel.org>, Srujana Challa <schalla@...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>,
        Satha Koteswara Rao Kottidi
	<skoteshwar@...vell.com>
CC: "virtualization@...ts.linux.dev" <virtualization@...ts.linux.dev>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: RE: [EXTERNAL] [PATCH v3] vdpa/octeon_ep: Control PCI dev enabling
 manually



>-----Original Message-----
>From: Philipp Stanner <phasta@...nel.org>
>Sent: Thursday, April 24, 2025 5:19 PM
>To: Srujana Challa <schalla@...vell.com>; Vamsi Krishna Attunuru
><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 Koteswara Rao Kottidi
><skoteshwar@...vell.com>
>Cc: virtualization@...ts.linux.dev; linux-kernel@...r.kernel.org
>Subject: [EXTERNAL] [PATCH v3] 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 
>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() (for AF. PF uses
>manual management), but does so only to get automatic disablement. The
>driver wants to manage its PCI resources for AF 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>

Thanks, Philipp, for the patch. Patch looks good, minor nit AF --> VF
Acked-by: Vamsi Attunuru <vattunuru@...vell.com>

>---
>Changes in v3:
>  - Only call pci_disable_device() for the PF version. For AF it would
>    cause a WARN_ON because pcim_enable_device()'s callback will also
>    try to disable.
>---
> drivers/vdpa/octeon_ep/octep_vdpa_main.c | 17 ++++++++++++-----
> 1 file changed, 12 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..9b49efd24391 100644
>--- a/drivers/vdpa/octeon_ep/octep_vdpa_main.c
>+++ b/drivers/vdpa/octeon_ep/octep_vdpa_main.c
>@@ -454,6 +454,9 @@ static void octep_vdpa_remove_pf(struct pci_dev
>*pdev)
> 		octep_iounmap_region(pdev, octpf->base,
>OCTEP_HW_MBOX_BAR);
>
> 	octep_vdpa_pf_bar_expand(octpf);
>+
>+	/* The pf version does not use managed PCI. */
>+	pci_disable_device(pdev);
> }
>
> static void octep_vdpa_vf_bar_shrink(struct pci_dev *pdev) @@ -825,7
>+828,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 +837,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 +861,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