netdev - Re: [PATCH 4/9] block: mtip32xx: Replace deprecated PCI functions

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

Message-ID: <267a021781f59d6efe798dbca63f29dd25359f2d.camel@redhat.com>
Date: Tue, 20 Aug 2024 09:22:00 +0200
From: Philipp Stanner <pstanner@...hat.com>
To: onathan Corbet <corbet@....net>, Jens Axboe <axboe@...nel.dk>, Wu Hao
 <hao.wu@...el.com>, Tom Rix <trix@...hat.com>, Moritz Fischer
 <mdf@...nel.org>,  Xu Yilun <yilun.xu@...el.com>, Andy Shevchenko
 <andy@...nel.org>, Linus Walleij <linus.walleij@...aro.org>, Bartosz
 Golaszewski <brgl@...ev.pl>, "David S. Miller" <davem@...emloft.net>, Eric
 Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,  Paolo
 Abeni <pabeni@...hat.com>, Alexandre Torgue <alexandre.torgue@...s.st.com>,
 Jose Abreu <joabreu@...opsys.com>, Maxime Coquelin
 <mcoquelin.stm32@...il.com>, Bjorn Helgaas <bhelgaas@...gle.com>, Alvaro
 Karsz <alvaro.karsz@...id-run.com>, "Michael S. Tsirkin" <mst@...hat.com>,
 Jason Wang <jasowang@...hat.com>, Xuan Zhuo <xuanzhuo@...ux.alibaba.com>,
 Eugenio Pérez <eperezma@...hat.com>, Richard Cochran
 <richardcochran@...il.com>, Mark Brown <broonie@...nel.org>, David Lechner
 <dlechner@...libre.com>, Uwe Kleine-König
 <u.kleine-koenig@...gutronix.de>, Jonathan Cameron
 <Jonathan.Cameron@...wei.com>,  Hannes Reinecke <hare@...e.de>, Damien Le
 Moal <dlemoal@...nel.org>, Chaitanya Kulkarni <kch@...dia.com>, "Martin K.
 Petersen" <martin.petersen@...cle.com>
Cc: linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org, 
 linux-block@...r.kernel.org, linux-fpga@...r.kernel.org, 
 linux-gpio@...r.kernel.org, netdev@...r.kernel.org, 
 linux-stm32@...md-mailman.stormreply.com,
 linux-arm-kernel@...ts.infradead.org,  linux-pci@...r.kernel.org,
 virtualization@...ts.linux.dev
Subject: Re: [PATCH 4/9] block: mtip32xx: Replace deprecated PCI functions

On Mon, 2024-08-19 at 18:51 +0200, Philipp Stanner wrote:
> pcim_iomap_regions() and pcim_iomap_table() have been deprecated by
> the
> PCI subsystem in commit e354bb84a4c1 ("PCI: Deprecate
> pcim_iomap_table(), pcim_iomap_regions_request_all()").
> 
> In mtip32xx, these functions can easily be replaced by their
> respective
> successors, pcim_request_region() and pcim_iomap(). Moreover, the
> driver's call to pcim_iounmap_regions() is not necessary, because
> it's
> invoked in the remove() function. Cleanup can, hence, be performed by
> PCI devres automatically.
> 
> Replace pcim_iomap_regions() and pcim_iomap_table().
> 
> Remove the call to pcim_iounmap_regions().
> 
> Signed-off-by: Philipp Stanner <pstanner@...hat.com>
> ---
>  drivers/block/mtip32xx/mtip32xx.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/block/mtip32xx/mtip32xx.c
> b/drivers/block/mtip32xx/mtip32xx.c
> index c6ef0546ffc9..c7da6090954e 100644
> --- a/drivers/block/mtip32xx/mtip32xx.c
> +++ b/drivers/block/mtip32xx/mtip32xx.c
> @@ -2716,7 +2716,9 @@ static int mtip_hw_init(struct driver_data *dd)
>  	int rv;
>  	unsigned long timeout, timetaken;
>  
> -	dd->mmio = pcim_iomap_table(dd->pdev)[MTIP_ABAR];
> +	dd->mmio = pcim_iomap(dd->pdev, MTIP_ABAR, 0);
> +	if (!dd->mmio)
> +		return -ENOMEM;
>  
>  	mtip_detect_product(dd);
>  	if (dd->product_type == MTIP_PRODUCT_UNKNOWN) {
> @@ -3726,9 +3728,9 @@ static int mtip_pci_probe(struct pci_dev *pdev,
>  	}
>  
>  	/* Map BAR5 to memory. */
> -	rv = pcim_iomap_regions(pdev, 1 << MTIP_ABAR,
> MTIP_DRV_NAME);
> +	rv = pcim_request_region(pdev, 1, MTIP_DRV_NAME);

That's a bug here, btw.
Should be MTIP_ABAR instead of 1.

Will fix in v2.

P.

>  	if (rv < 0) {
> -		dev_err(&pdev->dev, "Unable to map regions\n");
> +		dev_err(&pdev->dev, "Unable to request regions\n");
>  		goto iomap_err;
>  	}
>  
> @@ -3849,7 +3851,7 @@ static int mtip_pci_probe(struct pci_dev *pdev,
>  		drop_cpu(dd->work[2].cpu_binding);
>  	}
>  setmask_err:
> -	pcim_iounmap_regions(pdev, 1 << MTIP_ABAR);
> +	pcim_release_region(pdev, MTIP_ABAR);
>  
>  iomap_err:
>  	kfree(dd);
> @@ -3925,7 +3927,6 @@ static void mtip_pci_remove(struct pci_dev
> *pdev)
>  
>  	pci_disable_msi(pdev);
>  
> -	pcim_iounmap_regions(pdev, 1 << MTIP_ABAR);
>  	pci_set_drvdata(pdev, NULL);
>  
>  	put_disk(dd->disk);