[PATCH] samples: vfio-mdev: Fix missing pci_disable_device() in mdpy_fb_probe()

[PATCH] samples: vfio-mdev: Fix missing pci_disable_device() in mdpy_fb_probe()

[Shang XiaoJing]

Add missing pci_disable_device() in fail path of mdpy_fb_probe().

Fixes: cacade1946a4 ("sample: vfio mdev display - guest driver")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
---
 samples/vfio-mdev/mdpy-fb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/samples/vfio-mdev/mdpy-fb.c b/samples/vfio-mdev/mdpy-fb.c
index 9ec93d90e8a5..a7b3a30058e5 100644
--- a/samples/vfio-mdev/mdpy-fb.c
+++ b/samples/vfio-mdev/mdpy-fb.c
@@ -109,7 +109,7 @@ static int mdpy_fb_probe(struct pci_dev *pdev,
 
 	ret = pci_request_regions(pdev, "mdpy-fb");
 	if (ret < 0)
-		return ret;
+		goto err_disable_dev;
 
 	pci_read_config_dword(pdev, MDPY_FORMAT_OFFSET, &format);
 	pci_read_config_dword(pdev, MDPY_WIDTH_OFFSET,	&width);
@@ -191,6 +191,9 @@ static int mdpy_fb_probe(struct pci_dev *pdev,
 err_release_regions:
 	pci_release_regions(pdev);
 
+err_disable_dev:
+	pci_disable_device(pdev);
+
 	return ret;
 }
 
-- 
2.17.1

Re: [PATCH] samples: vfio-mdev: Fix missing pci_disable_device() in mdpy_fb_probe()

[Alex Williamson]

On Wed, 7 Dec 2022 15:21:28 +0800
Shang XiaoJing <shangxiaojing@huawei.com> wrote:

> Add missing pci_disable_device() in fail path of mdpy_fb_probe().
> 
> Fixes: cacade1946a4 ("sample: vfio mdev display - guest driver")
> Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
> ---
>  samples/vfio-mdev/mdpy-fb.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/samples/vfio-mdev/mdpy-fb.c b/samples/vfio-mdev/mdpy-fb.c
> index 9ec93d90e8a5..a7b3a30058e5 100644
> --- a/samples/vfio-mdev/mdpy-fb.c
> +++ b/samples/vfio-mdev/mdpy-fb.c
> @@ -109,7 +109,7 @@ static int mdpy_fb_probe(struct pci_dev *pdev,
>  
>  	ret = pci_request_regions(pdev, "mdpy-fb");
>  	if (ret < 0)
> -		return ret;
> +		goto err_disable_dev;
>  
>  	pci_read_config_dword(pdev, MDPY_FORMAT_OFFSET, &format);
>  	pci_read_config_dword(pdev, MDPY_WIDTH_OFFSET,	&width);
> @@ -191,6 +191,9 @@ static int mdpy_fb_probe(struct pci_dev *pdev,
>  err_release_regions:
>  	pci_release_regions(pdev);
>  
> +err_disable_dev:
> +	pci_disable_device(pdev);
> +
>  	return ret;
>  }
>  

What about the same in the .remove callback?  Seems that all but the
framebuffer unwind is missing in the remove path.  Thanks,

Alex

Re: [PATCH] samples: vfio-mdev: Fix missing pci_disable_device() in mdpy_fb_probe()

[shangxiaojing]

On 2022/12/8 6:18, Alex Williamson wrote:
> On Wed, 7 Dec 2022 15:21:28 +0800
> Shang XiaoJing <shangxiaojing@huawei.com> wrote:
> 
>> Add missing pci_disable_device() in fail path of mdpy_fb_probe().
>>
>> Fixes: cacade1946a4 ("sample: vfio mdev display - guest driver")
>> Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
>> ---
>>   samples/vfio-mdev/mdpy-fb.c | 5 ++++-
>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/samples/vfio-mdev/mdpy-fb.c b/samples/vfio-mdev/mdpy-fb.c
>> index 9ec93d90e8a5..a7b3a30058e5 100644
>> --- a/samples/vfio-mdev/mdpy-fb.c
>> +++ b/samples/vfio-mdev/mdpy-fb.c
>> @@ -109,7 +109,7 @@ static int mdpy_fb_probe(struct pci_dev *pdev,
>>   
>>   	ret = pci_request_regions(pdev, "mdpy-fb");
>>   	if (ret < 0)
>> -		return ret;
>> +		goto err_disable_dev;
>>   
>>   	pci_read_config_dword(pdev, MDPY_FORMAT_OFFSET, &format);
>>   	pci_read_config_dword(pdev, MDPY_WIDTH_OFFSET,	&width);
>> @@ -191,6 +191,9 @@ static int mdpy_fb_probe(struct pci_dev *pdev,
>>   err_release_regions:
>>   	pci_release_regions(pdev);
>>   
>> +err_disable_dev:
>> +	pci_disable_device(pdev);
>> +
>>   	return ret;
>>   }
>>   
> 
> What about the same in the .remove callback?  Seems that all but the
> framebuffer unwind is missing in the remove path.  Thanks,
> 

Right, will fix in v2.

Thanks for the review,
-- 
Shang XiaoJing