Skip to contentSkip to conversation

NTB: perf: Fix an error code in perf_setup_inbuf()

PATCH Superseded Yang Li 3 participants 5 messages Jun 4, 2021 – Jun 7, 2021 NTB driver core

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/2 NTB: perf: Fix an error code in perf_setup_inbuf()

When the function IS_ALIGNED() returns false, the value of ret is 0. So, we set ret to -ENOMEM to indicate this error.

Clean up smatch warning:
drivers/ntb/test/ntb_perf.c:602 perf_setup_inbuf() warn: missing error code 'ret'.

---
 drivers/ntb/test/ntb_perf.c | 1 +
 1 file changed, 1 insertion(+)
drivers/ntb/test/ntb_perf.c +1 -0
index 89df135..c20b375 100644
@@ -598,6 +598,7 @@ static int perf_setup_inbuf(struct perf_peer *peer)
 		return -ENOMEM;
 	}
 	if (!IS_ALIGNED(peer->inbuf_xlat, xlat_align)) {
+		ret = -ENOMEM;
 		dev_err(&perf->ntb->dev, "Unaligned inbuf allocated\n");
 		goto err_free_inbuf;
 	}
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH 2/2 NTB: Fix an error code in ntb_msit_probe()

When the value of nm->isr_ctx is false, the value of ret is 0. So, we set ret to -ENOMEM to indicate this error.

Clean up smatch warning:
drivers/ntb/test/ntb_msi_test.c:373 ntb_msit_probe() warn: missing error code 'ret'.

---
 drivers/ntb/test/ntb_msi_test.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ntb/test/ntb_msi_test.c +3 -1
index 7095ecd..5f9e0be 100644
@@ -369,8 +369,10 @@ static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb)
 	if (ret)
 		goto remove_dbgfs;
 
-	if (!nm->isr_ctx)
+	if (!nm->isr_ctx) {
+		return -ENOMEM;
 		goto remove_dbgfs;
+	}
 
 	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);
 
Signature · 1 line
1.8.3.1
#2 lore raw

Re: [PATCH 2/2] NTB: Fix an error code in ntb_msit_probe()

Quoted 18 lines · Yang Li

When the value of nm->isr_ctx is false, the value of ret is 0. So, we set ret to -ENOMEM to indicate this error.

Clean up smatch warning:
drivers/ntb/test/ntb_msi_test.c:373 ntb_msit_probe() warn: missing error code 'ret'.

---
 drivers/ntb/test/ntb_msi_test.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ntb/test/ntb_msi_test.c +0 -0
index 7095ecd..5f9e0be 100644

drivers/ntb/test/ntb_msi_test.c static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb) · line 374

Quoted 7 lines
drivers/ntb/test/ntb_msi_test.c +2 -1
@@ -369,8 +369,10 @@ static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb)
 	if (ret)
 		goto remove_dbgfs;
 
-	if (!nm->isr_ctx)
+	if (!nm->isr_ctx) {
+		return -ENOMEM;
 		goto remove_dbgfs;

I think you made a typo here. You probably meant ret = -ENOMEM.

Thanks,

Logan

author
#3 lore raw

回复:[PATCH 2/2] NTB: Fix an error code in ntb_msit_probe()

Hi,
I have sent a V2 patch.

Thanks for your review.
------------------------------------------------------------------
发件人:Logan Gunthorpe <[email protected]>
发送时间:2021年6月5日(星期六) 00:21
收件人:Yang Li <[email protected]>; jdmason <[email protected]>
抄 送:dave.jiang <[email protected]>; allenbh <[email protected]>; linux-ntb <[email protected]>; linux-kernel <[email protected]> 主 题:Re: [PATCH 2/2] NTB: Fix an error code in ntb_msit_probe()

Quoted 18 lines · Yang Li

When the value of nm->isr_ctx is false, the value of ret is 0. So, we set ret to -ENOMEM to indicate this error.

Clean up smatch warning:
drivers/ntb/test/ntb_msi_test.c:373 ntb_msit_probe() warn: missing error code 'ret'.

---
 drivers/ntb/test/ntb_msi_test.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ntb/test/ntb_msi_test.c +0 -0
index 7095ecd..5f9e0be 100644

drivers/ntb/test/ntb_msi_test.c static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb) · line 374

Quoted 7 lines
drivers/ntb/test/ntb_msi_test.c +2 -1
@@ -369,8 +369,10 @@ static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb)
  if (ret)
   goto remove_dbgfs;
 
- if (!nm->isr_ctx)
+ if (!nm->isr_ctx) {
+  return -ENOMEM;
   goto remove_dbgfs;

I think you made a typo here. You probably meant ret = -ENOMEM.

Thanks,

Logan

Reviewed-by on v1 1/2
#4 lore raw
In reply to Yang Li

Hello Yang.

Quoted 6 lines · Yang Li

When the function IS_ALIGNED() returns false, the value of ret is 0. So, we set ret to -ENOMEM to indicate this error.

Clean up smatch warning:
drivers/ntb/test/ntb_perf.c:602 perf_setup_inbuf() warn: missing error code 'ret'.

Great catch! Thanks for posing the fix. Indeed ret would zero in case of unaligned buffer allocation. Though such situation is very improbable. A tiny nitpick below.

Quoted 12 lines
---
 drivers/ntb/test/ntb_perf.c | 1 +
 1 file changed, 1 insertion(+)
drivers/ntb/test/ntb_perf.c +0 -0
index 89df135..c20b375 100644

drivers/ntb/test/ntb_perf.c static int perf_setup_inbuf(struct perf_peer *peer) · line 602

Quoted 5 lines
drivers/ntb/test/ntb_perf.c +1 -0
@@ -598,6 +598,7 @@ static int perf_setup_inbuf(struct perf_peer *peer)
 		return -ENOMEM;
 	}
 	if (!IS_ALIGNED(peer->inbuf_xlat, xlat_align)) {
 
+		ret = -ENOMEM;

I'd set -EINVAL here. In this case we do have enough memory, but the base address is unaligned in a way the NTB hw requires. After fixing that feel free to add:

-Sergey

Quoted 10 lines
drivers/ntb/test/ntb_perf.c +0 -0
 		dev_err(&perf->ntb->dev, "Unaligned inbuf allocated\n");
 		goto err_free_inbuf;

}

Signature · 6 lines
1.8.3.1

-- 
You received this message because you are subscribed to the Google Groups "linux-ntb" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/linux-ntb/1622802051-43464-1-git-send-email-yang.lee%40linux.alibaba.com.