PCI: endpoint: pci-epf-{v}ntb: A couple of fixes
Subsystems (3)
cover PCI: endpoint: pci-epf-{v}ntb: A couple of fixes
Hi,
These two fixes are flagged by Sashiko during the review of doorbell series:
https://sashiko.dev/#/patchset/20260406155717.880246-1-den%40valinux.co.jp
Manivannan Sadhasivam (2):
PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0
drivers/pci/endpoint/functions/pci-epf-ntb.c | 15 +++++++++------ drivers/pci/endpoint/functions/pci-epf-vntb.c | 9 +++------ 2 files changed, 12 insertions(+), 12 deletions(-)
Signature · 1 line
2.51.0
PATCH 1/2 PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
From: Manivannan Sadhasivam <[email protected]>
epf_ntb::db_count value should be within 1 to MAX_DB_COUNT. Current code only checks for the upper bound, while the lower bound is unchecked. This can cause a lot of issues in the driver if the user passes 'db_count' as 0.
So add a check for 0 also. While at it, remove the redundant 'db_count' assignment.
--- drivers/pci/endpoint/functions/pci-epf-vntb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/pci/endpoint/functions/pci-epf-vntb.c +3 -6
@@ -483,7 +483,6 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) {const struct pci_epc_features *epc_features;struct device *dev; -u32 db_count;int ret; dev = &ntb->epf->dev;
@@ -495,14 +494,12 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb)return -EINVAL ; } - db_count = ntb->db_count; -if (db_count >MAX_DB_COUNT ) { -dev_err (dev,"DB count cannot be more than %d\n" ,MAX_DB_COUNT ); +if (!ntb->db_count || ntb->db_count >MAX_DB_COUNT ) { +dev_err (dev,"DB count %d out of range (1 - %d)\n" , + ntb->db_count,MAX_DB_COUNT );return -EINVAL ; } - ntb->db_count = db_count; -if (epc_features->msi_capable) { ret = pci_epc_set_msi(ntb->epf->epc, ntb->epf->func_no,
Signature · 1 line
2.51.0
Re: [PATCH 1/2] PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
Quoted 6 lines · Manivannan Sadhasivam
From: Manivannan Sadhasivam <[email protected]>
epf_ntb::db_countvalue should be within 1 toMAX_DB_COUNT. Current code only checks for the upper bound, while the lower bound is unchecked. This can cause a lot of issues in the driver if the user passes 'db_count' as 0.
Quoted 6 lines
So add a check for 0 also. While at it, remove the redundant '
db_count' assignment.Fixes e35f56bb0330 ("PCI: endpoint: Support NTB transfer between RC and EP")Signed-off-by Manivannan Sadhasivam <[email protected]>---
Quoted 36 lines
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/pci/endpoint/functions/pci-epf-vntb.c +3
-7@@ -483,7 +483,6 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) {const struct pci_epc_features *epc_features;struct device *dev; -u32 db_count;int ret; dev = &ntb->epf->dev;@@ -495,14 +494,12 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb)return -EINVAL ; } - db_count = ntb->db_count; -if (db_count >MAX_DB_COUNT ) { -dev_err (dev,"DB count cannot be more than %d\n" ,MAX_DB_COUNT ); +if (!ntb->db_count || ntb->db_count >MAX_DB_COUNT ) { +dev_err (dev,"DB count %d out of range (1 - %d)\n" , + ntb->db_count,MAX_DB_COUNT );return -EINVAL ; } - ntb->db_count = db_count; -if (epc_features->msi_capable) { ret = pci_epc_set_msi(ntb->epf->epc, ntb->epf->func_no, --2.51.0
Re: [PATCH 1/2] PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
In reply to Manivannan SadhasivamQuoted 6 lines · Manivannan Sadhasivam
From: Manivannan Sadhasivam <[email protected]>
epf_ntb::db_countvalue should be within 1 toMAX_DB_COUNT. Current code only checks for the upper bound, while the lower bound is unchecked. This can cause a lot of issues in the driver if the user passes 'db_count' as 0.
Quoted 6 lines
So add a check for 0 also. While at it, remove the redundant '
db_count' assignment.Fixes e35f56bb0330 ("PCI: endpoint: Support NTB transfer between RC and EP")Signed-off-by Manivannan Sadhasivam <[email protected]>---
I noticed this one is still floating around. In case one more R-b helps:
P.S. For pci-epf-vntb, I think ntb->db_count needs to be at least 3 in practice for doorbells to be useful, because of the link event slot (#0) and a historically skipped slot (#1). Still, as a standalone fix, this patch looks good to me.
Quoted 36 lines
drivers/pci/endpoint/functions/pci-epf-vntb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/pci/endpoint/functions/pci-epf-vntb.c +3
-6@@ -483,7 +483,6 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb) {const struct pci_epc_features *epc_features;struct device *dev; -u32 db_count;int ret; dev = &ntb->epf->dev;@@ -495,14 +494,12 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb)return -EINVAL ; } - db_count = ntb->db_count; -if (db_count >MAX_DB_COUNT ) { -dev_err (dev,"DB count cannot be more than %d\n" ,MAX_DB_COUNT ); +if (!ntb->db_count || ntb->db_count >MAX_DB_COUNT ) { +dev_err (dev,"DB count %d out of range (1 - %d)\n" , + ntb->db_count,MAX_DB_COUNT );return -EINVAL ; } - ntb->db_count = db_count; -if (epc_features->msi_capable) { ret = pci_epc_set_msi(ntb->epf->epc, ntb->epf->func_no,Signature · 1 line
2.51.0
PATCH 2/2 PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0
In reply to Manivannan SadhasivamFrom: Manivannan Sadhasivam <[email protected]>
epf_ntb::db_count value should be within 1 to MAX_DB_COUNT. Current code only checks for the upper bound, while the lower bound is unchecked. This can cause a lot of issues in the driver if the user passes 'db_count' as 0.
So add a check for 0 also. While at it, remove the redundant 'db_count' assignment.
--- drivers/pci/endpoint/functions/pci-epf-ntb.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/pci/endpoint/functions/pci-epf-ntb.c +9 -6
@@ -559,12 +559,15 @@ static int epf_ntb_configure_db(struct epf_ntb *ntb,struct pci_epc *epc;int ret; -if (db_count >MAX_DB_COUNT ) -return -EINVAL ; - ntb_epc = ntb->epc[type]; epc = ntb_epc->epc; +if (!db_count || db_count >MAX_DB_COUNT ) { +dev_err (&epc->dev,"DB count %d out of range (1 - %d)\n" , + db_count,MAX_DB_COUNT ); +return -EINVAL ; + } +if (msix) ret =epf_ntb_configure_msix (ntb, type, db_count);else
@@ -1297,12 +1300,12 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb, vfunc_no = ntb_epc->vfunc_no; db_count = ntb->db_count; -if (db_count >MAX_DB_COUNT ) { -dev_err (dev,"DB count cannot be more than %d\n" ,MAX_DB_COUNT ); +if (!db_count || db_count >MAX_DB_COUNT ) { +dev_err (dev,"DB count %d out of range (1 - %d)\n" , + db_count,MAX_DB_COUNT );return -EINVAL ; } - ntb->db_count = db_count; epc = ntb_epc->epc;if (msi_capable) {
Signature · 1 line
2.51.0
Krzysztof Wilczyński
maintainerRe: [PATCH 2/2] PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0
Hello,
drivers/pci/endpoint/functions/pci-epf-ntb.c static int epf_ntb_configure_interrupt(struct epf_ntb *ntb, · line 1307
Quoted 11 lines
drivers/pci/endpoint/functions/pci-epf-ntb.c +3
-2@@ -1297,12 +1300,12 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb, vfunc_no = ntb_epc->vfunc_no; db_count = ntb->db_count; -if (db_count >MAX_DB_COUNT ) { -dev_err (dev,"DB count cannot be more than %d\n" ,MAX_DB_COUNT ); +if (!db_count || db_count >MAX_DB_COUNT ) { +dev_err (dev,"DB count %d out of range (1 - %d)\n" , + db_count,MAX_DB_COUNT );return -EINVAL ; }
Something that I was wondering about here: would it make sense to also remove this variable from here, too? Even though it's referenced below here (which is why I think you left it here). Thoughts?
Thank you!
Krzysztof
Manivannan Sadhasivam
maintainerRe: [PATCH 2/2] PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0
Quoted 5 lines · Krzysztof Wilczyński
Hello,
Quoted 3 lines
drivers/pci/endpoint/functions/pci-epf-ntb.c +0
-0@@ -1297,12 +1300,12 @@ static int epf_ntb_configure_interrupt(struct epf_ntb *ntb, vfunc_no = ntb_epc->vfunc_no;
Quoted 13 lines
drivers/pci/endpoint/functions/pci-epf-ntb.c static int epf_ntb_configure_interrupt(struct epf_ntb *ntb, · line 1307
Quoted 8 lines
drivers/pci/endpoint/functions/pci-epf-ntb.c +3
-2db_count = ntb->db_count; -if (db_count >MAX_DB_COUNT ) { -dev_err (dev,"DB count cannot be more than %d\n" ,MAX_DB_COUNT ); +if (!db_count || db_count >MAX_DB_COUNT ) { +dev_err (dev,"DB count %d out of range (1 - %d)\n" , + db_count,MAX_DB_COUNT );return -EINVAL ; }Something that I was wondering about here: would it make sense to also remove this variable from here, too? Even though it's referenced below here (which is why I think you left it here). Thoughts?
Makes sense. I removed 'db_count' variable while applying, thanks for spotting!
- Mani
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Krzysztof Wilczyński
maintainerHello,
Quoted 10 lines
These two fixes are flagged by Sashiko during the review of doorbell series:
https://sashiko.dev/#/patchset/20260406155717.880246-1-den%40valinux.co.jpManivannan Sadhasivam (2):
PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0drivers/pci/endpoint/functions/pci-epf-ntb.c | 15 +++++++++------ drivers/pci/endpoint/functions/pci-epf-vntb.c | 9 +++------ 2 files changed, 12 insertions(+), 12 deletions(-)
Might be out of scope, but since we removed one redundant "db_count" variable already, perhaps we could also drop this one, too. Just to add a small clean-up since we are touching this code already... Thoughts?
Looking at epf_ntb_db_mw_bar_init():
(...)
db_count = ntb->db_count;
for (bar = BAR_DB_MW1, i = 0; i < num_mws; bar++, i++) {
if (bar == BAR_DB_MW1) {
align = align ? align : 4;
size = db_count * align;
size = ALIGN(size, ntb->mws_size[i]);
ctrl = ntb_epc->reg;
ctrl->mw1_offset = size;
size += ntb->mws_size[i];
} else {
size = ntb->mws_size[i];
}(...)
}
Thank you!
Krzysztof
Manivannan Sadhasivam
maintainerQuoted 9 lines · Krzysztof Wilczyński
Hello,
Quoted 7 lines
These two fixes are flagged by Sashiko during the review of doorbell series:
https://sashiko.dev/#/patchset/20260406155717.880246-1-den%40valinux.co.jpManivannan Sadhasivam (2):
PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0
Quoted 8 lines
Quoted 3 lines
drivers/pci/endpoint/functions/pci-epf-ntb.c | 15 +++++++++------ drivers/pci/endpoint/functions/pci-epf-vntb.c | 9 +++------ 2 files changed, 12 insertions(+), 12 deletions(-)Might be out of scope, but since we removed one redundant "
db_count" variable already, perhaps we could also drop this one, too. Just to add a small clean-up since we are touching this code already... Thoughts?
Why not? Please send a patch :)
- Mani
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Manivannan Sadhasivam
AppliedQuoted 8 lines · Manivannan Sadhasivam
These two fixes are flagged by Sashiko during the review of doorbell series:
https://sashiko.dev/#/patchset/20260406155717.880246-1-den%40valinux.co.jpManivannan Sadhasivam (2):
PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0[...]
Applied, thanks!
[1/2] PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
commit: dfd986796037ce31af73d8be416d98944ec84551
[2/2] PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0
commit: d2942f5fc787c5e327ede76e0aea2cf41949e500Best regards,
Signature · 1 line
Manivannan Sadhasivam <[email protected]>
Hello,
Quoted 6 lines
These two fixes are flagged by Sashiko during the review of doorbell series:
https://sashiko.dev/#/patchset/20260406155717.880246-1-den%40valinux.co.jpManivannan Sadhasivam (2):
PCI: endpoint: pci-epf-vntb: Add check to detect 'db_count' value of 0
PCI: endpoint: pci-epf-ntb: Add check to detect 'db_count' value of 0
Looks good! Nice clean-up.
For the entire series:
Also, apologies for being late here...
Thank you!
Krzysztof