[PATCH v2 0/2] PCI: vmd: Fix two issues in VMD reported by Smatch

[PATCH v2 0/2] PCI: vmd: Fix two issues in VMD reported by Smatch

[korantwork]

From: Xinghui Li <korantli@tencent.com>

Fix two issues when building kernel with Smatch check.

v1->v2:
According to Damien's suggestion, I split it from 1 patch to 2 different
patches. Change 'inconsistent indenting' patch's title from 'fix' to
'clean up'.

Xinghui Li (2):
  PCI: vmd: Fix one uninitialized symbol error reported by Smatch
  PCI: vmd: Clean up one inconsistent indenting warn reported by Smatch

 drivers/pci/controller/vmd.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

-- 
2.31.1

[PATCH v2 1/2] PCI: vmd: Fix one uninitialized symbol error reported by Smatch

[korantwork]

From: Xinghui Li <korantli@tencent.com>

There is one uninitialized symbol error reported by smatch:
"drivers/pci/controller/vmd.c:931 vmd_enable_domain()
error: uninitialized symbol 'ret'."

Fix it by assigning ret with pci_reset_bus return.

Fixes: 0a584655ef89 ("PCI: vmd: Fix secondary bus reset for Intel bridges")
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Xinghui Li <korantli@tencent.com>
---
 drivers/pci/controller/vmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index 990630ec57c6..1a36e9a52b93 100644
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -927,7 +927,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 		if (!list_empty(&child->devices)) {
 			dev = list_first_entry(&child->devices,
 					       struct pci_dev, bus_list);
-			if (pci_reset_bus(dev))
+			ret = pci_reset_bus(dev);
+			if (ret)
 				pci_warn(dev, "can't reset device: %d\n", ret);
 
 			break;
-- 
2.31.1

Re: [PATCH v2 1/2] PCI: vmd: Fix one uninitialized symbol error reported by Smatch

[Patel, Nirmal]

On 4/20/2023 2:43 AM, korantwork@gmail.com wrote:
> From: Xinghui Li <korantli@tencent.com>
>
> There is one uninitialized symbol error reported by smatch:
> "drivers/pci/controller/vmd.c:931 vmd_enable_domain()
> error: uninitialized symbol 'ret'."
>
> Fix it by assigning ret with pci_reset_bus return.
>
> Fixes: 0a584655ef89 ("PCI: vmd: Fix secondary bus reset for Intel bridges")
> Reported-by: Dan Carpenter <error27@gmail.com>
> Signed-off-by: Xinghui Li <korantli@tencent.com>
> ---
>  drivers/pci/controller/vmd.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
> index 990630ec57c6..1a36e9a52b93 100644
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@ -927,7 +927,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
>  		if (!list_empty(&child->devices)) {
>  			dev = list_first_entry(&child->devices,
>  					       struct pci_dev, bus_list);
> -			if (pci_reset_bus(dev))
> +			ret = pci_reset_bus(dev);
> +			if (ret)
>  				pci_warn(dev, "can't reset device: %d\n", ret);
>  
>  			break;

Reviewed-by: Nirmal Patel <nirmal.patel@linux.intel.com>

[PATCH v2 2/2] PCI: vmd: Clean up one inconsistent indenting warn reported by Smatch

[korantwork]

From: Xinghui Li <korantli@tencent.com>

There is one inconsistent indenting warning:
"drivers/pci/controller/vmd.c:1058 vmd_resume()
warn: inconsistent indenting"

Fix it by formating its indenting.

Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Xinghui Li <korantli@tencent.com>
---
 drivers/pci/controller/vmd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index 1a36e9a52b93..1b68fa606bff 100644
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -1056,10 +1056,10 @@ static int vmd_resume(struct device *dev)
 	struct vmd_dev *vmd = pci_get_drvdata(pdev);
 	int err, i;
 
-       if (vmd->irq_domain)
-               vmd_set_msi_remapping(vmd, true);
-       else
-               vmd_set_msi_remapping(vmd, false);
+	if (vmd->irq_domain)
+		vmd_set_msi_remapping(vmd, true);
+	else
+		vmd_set_msi_remapping(vmd, false);
 
 	for (i = 0; i < vmd->msix_count; i++) {
 		err = devm_request_irq(dev, vmd->irqs[i].virq,
-- 
2.31.1

Re: [PATCH v2 2/2] PCI: vmd: Clean up one inconsistent indenting warn reported by Smatch

[Patel, Nirmal]

On 4/20/2023 2:43 AM, korantwork@gmail.com wrote:
> From: Xinghui Li <korantli@tencent.com>
>
> There is one inconsistent indenting warning:
> "drivers/pci/controller/vmd.c:1058 vmd_resume()
> warn: inconsistent indenting"
>
> Fix it by formating its indenting.
>
> Reported-by: Dan Carpenter <error27@gmail.com>
> Signed-off-by: Xinghui Li <korantli@tencent.com>
> ---
>  drivers/pci/controller/vmd.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
> index 1a36e9a52b93..1b68fa606bff 100644
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@ -1056,10 +1056,10 @@ static int vmd_resume(struct device *dev)
>  	struct vmd_dev *vmd = pci_get_drvdata(pdev);
>  	int err, i;
>  
> -       if (vmd->irq_domain)
> -               vmd_set_msi_remapping(vmd, true);
> -       else
> -               vmd_set_msi_remapping(vmd, false);
> +	if (vmd->irq_domain)
> +		vmd_set_msi_remapping(vmd, true);
> +	else
> +		vmd_set_msi_remapping(vmd, false);
>  
>  	for (i = 0; i < vmd->msix_count; i++) {
>  		err = devm_request_irq(dev, vmd->irqs[i].virq,

Reviewed-by: Nirmal Patel <nirmal.patel@linux.intel.com>

Re: [PATCH v2 0/2] PCI: vmd: Fix two issues in VMD reported by Smatch

[Krzysztof Wilczyński]

[+CC Christoph]

Hello,

> Fix two issues when building kernel with Smatch check.
> 
> v1->v2:
> According to Damien's suggestion, I split it from 1 patch to 2 different
> patches. Change 'inconsistent indenting' patch's title from 'fix' to
> 'clean up'.
> 
> Xinghui Li (2):
>   PCI: vmd: Fix one uninitialized symbol error reported by Smatch

Applied to controller/vmd, thank you!

[1/1] PCI: vmd: Fix uninitialized variable usage in vmd_enable_domain()
      https://git.kernel.org/pci/pci/c/0c0206dc4f5b

>   PCI: vmd: Clean up one inconsistent indenting warn reported by Smatch

Even though this is a very nice clean-up, I did not take this patch at this
time, as there has been a similar patch posted in the past, and Christoph
Hellwig suggested, as part of his review, an alternative approach worth
considering.

Have a look at the following and let me know what you think:

  https://patchwork.kernel.org/project/linux-pci/patch/20221115054847.77829-1-jiapeng.chong@linux.alibaba.com/

	Krzysztof

Re: [PATCH v2 0/2] PCI: vmd: Fix two issues in VMD reported by Smatch

[Xinghui Li]

On Sun, Jun 25, 2023 at 12:33 AM Krzysztof Wilczyński <kw@linux.com> wrote:
>
> [1/1] PCI: vmd: Fix uninitialized variable usage in vmd_enable_domain()
>       https://git.kernel.org/pci/pci/c/0c0206dc4f5b
>
> >   PCI: vmd: Clean up one inconsistent indenting warn reported by Smatch
>
> Even though this is a very nice clean-up, I did not take this patch at this
> time, as there has been a similar patch posted in the past, and Christoph
> Hellwig suggested, as part of his review, an alternative approach worth
> considering.
>
> Have a look at the following and let me know what you think:
>
>   https://patchwork.kernel.org/project/linux-pci/patch/20221115054847.77829-1-jiapeng.chong@linux.alibaba.com/

I think Christoph Hellwig's suggestion is indeed better.
So, should I submit a new patch to address this issue?

Thanks～

Re: [PATCH v2 0/2] PCI: vmd: Fix two issues in VMD reported by Smatch

[Krzysztof Wilczyński]

Hello,

> > >   PCI: vmd: Clean up one inconsistent indenting warn reported by Smatch
> >
> > Even though this is a very nice clean-up, I did not take this patch at this
> > time, as there has been a similar patch posted in the past, and Christoph
> > Hellwig suggested, as part of his review, an alternative approach worth
> > considering.
> >
> > Have a look at the following and let me know what you think:
> >
> >   https://patchwork.kernel.org/project/linux-pci/patch/20221115054847.77829-1-jiapeng.chong@linux.alibaba.com/
> 
> I think Christoph Hellwig's suggestion is indeed better.
> So, should I submit a new patch to address this issue?

Please.  A single new patch would suffice.

Make sure to explain as part of the commit log why this specific change
that started as a Smatch complaint about an incorrect indentation.

Thank you!

	Krzysztof