misc: pci_endpoint_test: Handle BAR sizes larger than INT_MAX
Subsystems (3)
PATCH v2 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 v1:
-Add reason for why division was changed to addition in commit log.
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 10 lines · Niklas Cassel
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, 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.
Quoted 8 lines
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.Co-developed-by Hans Zhang <[email protected]>Signed-off-by Hans Zhang <[email protected]>Signed-off-by Niklas Cassel <[email protected]>
Quoted 57 lines
---
Changes since v1:(quoted diff) +0
-1-Add reason for why division was changed to addition in commit log. 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 62 lines · Niklas Cassel
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, 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.Co-developed-by Hans Zhang <[email protected]>Signed-off-by Hans Zhang <[email protected]>Signed-off-by Niklas Cassel <[email protected]>---
Changes since v1:(quoted diff) +0
-1-Add reason for why division was changed to addition in commit log. drivers/misc/pci_endpoint_test.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)drivers/misc/pci_endpoint_test.c +5
-7@@ -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,
drivers/misc/pci_endpoint_test.c static int pci_endpoint_test_bar(struct pci_endpoint_test *test, · line 326
Quoted 10 lines
drivers/misc/pci_endpoint_test.c +5
-1- 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 ; }
This builds fine for me! I have ran through our testsuite and so ...
Jon
Signature · 1 line
nvpublic
Quoted 7 lines · Niklas Cassel
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, thebar_sizeof the integer type will overflow.
Quoted 8 lines
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 tag?
Quoted 3 lines
Co-developed-by Hans Zhang <[email protected]>Signed-off-by Hans Zhang <[email protected]>Signed-off-by Niklas Cassel <[email protected]>
Quoted 3 lines
---
Changes since v1:
-Add reason for why division was changed to addition in commit log.
You removed the history of this patch that was present in v1. Since there is no link to v1, you could've kept it here for the sake of completeness.
- Mani
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Quoted 11 lines · Manivannan Sadhasivam
Quoted 10 lines · Niklas Cassel
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, 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.
Quoted 7 lines
Quoted 5 lines
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 tag?
size has been of type int since:2c156ac71c6b ("misc: Add host side PCI driver for PCI test function device")
But I think a better SHA1 to use as the Fixes tag would be:cda370ec6d1f ("misc: pci_endpoint_test: Avoid using hard-coded BAR sizes")
Which has the one that started using pci_resource_len() (while still keeping size as type int).
Perhaps this can be amended while applying?
Quoted 5 lines
Quoted 4 lines
Co-developed-by Hans Zhang <[email protected]>Signed-off-by Hans Zhang <[email protected]>Signed-off-by Niklas Cassel <[email protected]>
Quoted 8 lines
Reviewed-by Manivannan Sadhasivam <[email protected]>Quoted 3 lines
---
Changes since v1:
-Add reason for why division was changed to addition in commit log.You removed the history of this patch that was present in v1. Since there is no link to v1, you could've kept it here for the sake of completeness.
Yes, because I made the commit log way more verbose, as requested by Frank, so it now includes references to div_u64() even though we are not using it.
Kind regards,
Niklas
Quoted 23 lines · Niklas Cassel
Quoted 11 lines · Manivannan Sadhasivam
Quoted 10 lines · Niklas Cassel
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, 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.Quoted 7 lines
Quoted 5 lines
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 tag?
size has been of type int since:
2c156ac71c6b("misc: Add host side PCI driver for PCI test function device")
Quoted 8 lines
But I think a better SHA1 to use as the Fixes tag would be:
cda370ec6d1f("misc:pci_endpoint_test: Avoid using hard-coded BAR sizes")Which has the one that started using
pci_resource_len()(while still keeping size as type int).Perhaps this can be amended while applying?
Sure.
- Mani
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Quoted 10 lines · Niklas Cassel
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, 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.
Quoted 8 lines
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.Co-developed-by Hans Zhang <[email protected]>Signed-off-by Hans Zhang <[email protected]>Signed-off-by Niklas Cassel <[email protected]>
Added fixes tag and applied to pci/endpoint!
- Mani
Quoted 58 lines
---
Changes since v1:(quoted diff) +0
-1-Add reason for why division was changed to addition in commit log. 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
Signature · 1 line
மணிவண்ணன் சதாசிவம்