misc: pci_endpoint_test: Handle BAR sizes larger than INT_MAX
Subsystems (3)
PATCH v3 1/1 misc: pci_endpoint_test: Handle BAR sizes larger than INT_MAX
Running 'pcitest -b 0' fails with "TEST FAILED" when the BAR0 size is e.g. 8 GB.
The return value of the pci_resource_len() macro can be larger than that of a signed integer type. Thus, when using 'pcitest' with an 8 GB BAR, the bar_size of the integer type will overflow.
Change bar_size from integer to resource_size_t to prevent integer overflow for large BAR sizes with 32-bit compilers.
In order to handle 64-bit resource_type_t on 32-bit platforms, we would have needed to use a function like div_u64() or similar. Instead, change the code to use addition instead of division. This avoids the need for div_u64() or similar, while also simplifying the code.
---
Changes since v2:
-Add Fixes: tag.
drivers/misc/pci_endpoint_test.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/misc/pci_endpoint_test.c +10 -8
@@ -272,9 +272,9 @@ static const u32 bar_test_pattern[] = { };static int pci_endpoint_test_bar_memcmp (struct pci_endpoint_test *test, -enum pci_barno barno,int offset, -void *write_buf,void *read_buf, -int size) +enum pci_barno barno, +resource_size_t offset,void *write_buf, +void *read_buf,int size) {memset (write_buf, bar_test_pattern[barno], size);memcpy_toio (test->bar[barno] + offset, write_buf, size);
@@ -287,10 +287,11 @@ static int pci_endpoint_test_bar_memcmp(struct pci_endpoint_test *test,static int pci_endpoint_test_bar (struct pci_endpoint_test *test,enum pci_barno barno) { -int j, bar_size, buf_size, iters; +resource_size_t bar_size, offset =0 ; void *write_buf __free(kfree) = NULL; void *read_buf __free(kfree) = NULL;struct pci_dev *pdev = test->pdev; +int buf_size;if (!test->bar[barno])return -ENOMEM ;
@@ -314,11 +315,12 @@ static int pci_endpoint_test_bar(struct pci_endpoint_test *test,if (!read_buf)return -ENOMEM ; - iters = bar_size / buf_size; -for (j =0 ; j < iters; j++) -if (pci_endpoint_test_bar_memcmp (test, barno, buf_size * j, - write_buf, read_buf, buf_size)) +while (offset < bar_size) { +if (pci_endpoint_test_bar_memcmp (test, barno, offset, write_buf, + read_buf, buf_size))return -EIO ; + offset += buf_size; + }return 0 ; }
Signature · 1 line
2.48.1
Quoted 2 lines · Niklas Cassel
Running 'pcitest -b 0' fails with "TEST FAILED" when the BAR0 size is e.g. 8 GB.
pcitest is not exist now. Does it need update to pci_endpoint_test?
Frank
Quoted 77 lines
The return value of the
pci_resource_len()macro can be larger than that of a signed integer type. Thus, when using 'pcitest' with an 8 GB BAR, thebar_sizeof the integer type will overflow.Change
bar_sizefrom integer toresource_size_tto prevent integer overflow for large BAR sizes with 32-bit compilers.In order to handle 64-bit
resource_type_ton 32-bit platforms, we would have needed to use a function likediv_u64()or similar. Instead, change the code to use addition instead of division. This avoids the need fordiv_u64()or similar, while also simplifying the code.Fixes cda370ec6d1f ("misc: pci_endpoint_test: Avoid using hard-coded BAR sizes")Co-developed-by Hans Zhang <[email protected]>Signed-off-by Hans Zhang <[email protected]>Reviewed-by Frank Li <[email protected]>Tested-by Jon Hunter <[email protected]>Reviewed-by Manivannan Sadhasivam <[email protected]>Signed-off-by Niklas Cassel <[email protected]>---
Changes since v2:(quoted diff) +0
-1-Add Fixes: tag. drivers/misc/pci_endpoint_test.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)drivers/misc/pci_endpoint_test.c +10
-9@@ -272,9 +272,9 @@ static const u32 bar_test_pattern[] = { };static int pci_endpoint_test_bar_memcmp (struct pci_endpoint_test *test, -enum pci_barno barno,int offset, -void *write_buf,void *read_buf, -int size) +enum pci_barno barno, +resource_size_t offset,void *write_buf, +void *read_buf,int size) {memset (write_buf, bar_test_pattern[barno], size);memcpy_toio (test->bar[barno] + offset, write_buf, size);@@ -287,10 +287,11 @@ static int pci_endpoint_test_bar_memcmp(struct pci_endpoint_test *test,static int pci_endpoint_test_bar (struct pci_endpoint_test *test,enum pci_barno barno) { -int j, bar_size, buf_size, iters; +resource_size_t bar_size, offset =0 ; void *write_buf __free(kfree) = NULL; void *read_buf __free(kfree) = NULL;struct pci_dev *pdev = test->pdev; +int buf_size;if (!test->bar[barno])return -ENOMEM ;@@ -314,11 +315,12 @@ static int pci_endpoint_test_bar(struct pci_endpoint_test *test,if (!read_buf)return -ENOMEM ; - iters = bar_size / buf_size; -for (j =0 ; j < iters; j++) -if (pci_endpoint_test_bar_memcmp (test, barno, buf_size * j, - write_buf, read_buf, buf_size)) +while (offset < bar_size) { +if (pci_endpoint_test_bar_memcmp (test, barno, offset, write_buf, + read_buf, buf_size))return -EIO ; + offset += buf_size; + }return 0 ; } --2.48.1
Quoted 6 lines · Frank Li
Quoted 2 lines · Niklas Cassel
Running 'pcitest -b 0' fails with "TEST FAILED" when the BAR0 size is e.g. 8 GB.
pcitest is not exist now. Does it need update to
pci_endpoint_test?
Hi Frank,
Mani has modified the entire pci_endpoint_test test framework, BAR test is still required. So Niklas may need to modify the commit message.
392188bb0f6e ("selftests: pci_endpoint: Migrate to Kselftest framework") e19bde2269ca ("selftests: Move PCI Endpoint tests from tools/pci to Kselftests")
Best regards
Hans