From: Jiantao Zhang <water.zhangjiantao@huawei.com>
To: <robh@kernel.org>, Bjorn Helgaas <helgaas@kernel.org>,
"jingoohan1@gmail.com" <jingoohan1@gmail.com>,
"gustavo.pimentel@synopsys.com" <gustavo.pimentel@synopsys.com>,
"lorenzo.pieralisi@arm.com" <lorenzo.pieralisi@arm.com>,
"kw@linux.com" <kw@linux.com>,
"linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"zhangjianrong (E)" <zhangjianrong5@huawei.com>
Cc: caiyadong <caiyadong@huawei.com>,
"xuetao (kirin)" <xuetao09@huawei.com>,
xuhaiyang <xuhaiyang5@hisilicon.com>, <songxiaowei@hisilicon.com>,
<guhengsheng@hisilicon.com>
Subject: [PATCH v2] PCI: dwc: Fix setting error return on MSI DMA mapping failure
Date: Wed, 9 Mar 2022 20:01:04 +0800 [thread overview]
Message-ID: <30170911-0e2f-98ce-9266-70465b9073e5@huawei.com> (raw)
In-Reply-To: <CAL_JsqJNMGobo1iaBjqSQJXNy9arXGU+et20dMueCK44seGnQw@mail.gmail.com>
When dma_mapping_error() returns error because of no enough memory,
but dw_pcie_host_init() returns success, which will mislead the callers.
Fixes: 07940c369a6b ("PCI: dwc: Fix MSI page leakage in suspend/resume")
Signed-off-by: Jianrong Zhang <zhangjianrong5@huawei.com>
Signed-off-by: Jiantao Zhang <water.zhangjiantao@huawei.com>
---
drivers/pci/controller/dwc/pcie-designware-host.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index f4755f3a03be..9dcb51728dd1 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -390,7 +390,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
sizeof(pp->msi_msg),
DMA_FROM_DEVICE,
DMA_ATTR_SKIP_CPU_SYNC);
- if (dma_mapping_error(pci->dev, pp->msi_data)) {
+ ret = dma_mapping_error(pci->dev, pp->msi_data);
+ if (ret) {
dev_err(pci->dev, "Failed to map MSI data\n");
pp->msi_data = 0;
goto err_free_msi;
--
2.17.1
Jiantao Zhang
On Tue, Mar 8, 2022 at 9:45 AM Zhangjiantao(Kirin,Nanjing)
<water.zhangjiantao@huawei.com> wrote:
> When dma_mapping_error() returns error because of no enough memory available, dw_pcie_host_init() will return success, which will mislead the callers.
Again, wrap long lines. And please reword the subject as I previously
suggested.
It should be 'PATCH v2', not 'PATCH2' in the subject. 'git send-email
-v2' does that for you.
> Fixes: 07940c369a6b ("PCI: dwc: Fix MSI page leakage in suspend/resume")
>
Drop the blank line here.
> Signed-off-by: Jiantao Zhang <water.zhangjiantao@huawei.com>
As you are sending the patch, your S-o-b goes last. And the author
name still doesn't match here: 'Jiantao Zhang' vs.
'Zhangjiantao(Kirin,Nanjing)'
> Signed-off-by: Jianrong Zhang <zhangjianrong5@huawei.com>
> ---
> drivers/pci/controller/dwc/pcie-designware-host.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c
> b/drivers/pci/controller/dwc/pcie-designware-host.c
> index f4755f3a03be..9dcb51728dd1 100644
> --- a/drivers/pci/controller/dwc/pcie-designware-host.c
> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
> @@ -390,7 +390,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
> sizeof(pp->msi_msg),
> DMA_FROM_DEVICE,
> DMA_ATTR_SKIP_CPU_SYNC);
> - if (dma_mapping_error(pci->dev, pp->msi_data)) {
> + ret = dma_mapping_error(pci->dev, pp->msi_data);
> + if (ret) {
> dev_err(pci->dev, "Failed to map MSI data\n");
> pp->msi_data = 0;
> goto err_free_msi;
> --
> 2.17.1
>
> Jiantao Zhang
>
> On 2022/3/5 5:39, Bjorn Helgaas wrote:
>> On Fri, Mar 04, 2022 at 12:06:10PM +0000, Zhangjiantao(Kirin,Nanjing) wrote:
All this should not be in new versions of patches.
>>> When dma_mapping_error returns error because of no enough memory available, dw_pcie_host_init will return success, which will mislead the callers.
>> Wrap to fit in 75 columns, add "()" after function names.
>>> Signed-off-by: zhangjianrong <zhangjianrong5@huawei.com>
>>> Signed-off-by: zhangjiantao <water.zhangjiantao@huawei.com>
>>>
>>> ---
>>> drivers/pci/controller/dwc/pcie-designware-host.c | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c
>>> b/drivers/pci/controller/dwc/pcie-designware-host.c
>>> index f4755f3a03be..ac691d733848 100644
>>> --- a/drivers/pci/controller/dwc/pcie-designware-host.c
>>> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
>>> @@ -393,6 +393,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
>>> if (dma_mapping_error(pci->dev, pp->msi_data)) {
>>> dev_err(pci->dev, "Failed to map MSI data\n");
>>> pp->msi_data = 0;
>>> + ret = -1;
>> We should save the return value from dma_mapping_error() and return
>> *that*, not -1.
>>
>> Whitespace error (indent with tabs, same as the surrounding code).
>>
>>> goto err_free_msi;
>>> }
>>> }
>>> --
>>> 2.17.1
>>>
>> .
next prev parent reply other threads:[~2022-03-09 12:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 15:45 [PATCH2] PCI: dwc: solve returning success but actually failed Zhangjiantao(Kirin,Nanjing)
2022-03-08 17:03 ` Rob Herring
2022-03-09 12:01 ` Jiantao Zhang [this message]
2022-03-24 21:04 ` [PATCH v2] PCI: dwc: Fix setting error return on MSI DMA mapping failure Rob Herring
2022-04-08 14:43 ` Lorenzo Pieralisi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30170911-0e2f-98ce-9266-70465b9073e5@huawei.com \
--to=water.zhangjiantao@huawei.com \
--cc=caiyadong@huawei.com \
--cc=guhengsheng@hisilicon.com \
--cc=gustavo.pimentel@synopsys.com \
--cc=helgaas@kernel.org \
--cc=jingoohan1@gmail.com \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=robh@kernel.org \
--cc=songxiaowei@hisilicon.com \
--cc=xuetao09@huawei.com \
--cc=xuhaiyang5@hisilicon.com \
--cc=zhangjianrong5@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.