The current code returns -ENOMEM if test->bar[barno] is NULL.
There can be two reasons why test->bar[barno] is NULL: 1) The pci_ioremap_bar() call in pci_endpoint_test_probe() failed. 2) The BAR was skipped, because it is disabled by the endpoint.
Many PCI endpoint controller drivers will disable all BARs in their init function. A disabled BAR will have a size of 0.
A PCI endpoint function driver will be able to enable any BAR that is not marked as BAR_RESERVED (which means that the BAR should not be touched by the EPF driver).
Thus, perform check if the size is 0, before checking if test->bar[barno] is NULL, such that we can return different errors.
This will allow the selftests to return SKIP instead of FAIL for disabled BARs.
Signed-off-by: Niklas Cassel cassel@kernel.org --- Hello PCI maintainers. This patch might give a trivial conflict with: https://lore.kernel.org/linux-pci/20250123095906.3578241-2-cassel@kernel.org... because the context lines (lines that haven't been changed) might be different. If there is a conflict, simply look at this patch by itself, and resolution should be trivial.
drivers/misc/pci_endpoint_test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index d5ac71a49386..b95980b29eb9 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -292,11 +292,13 @@ static int pci_endpoint_test_bar(struct pci_endpoint_test *test, void *read_buf __free(kfree) = NULL; struct pci_dev *pdev = test->pdev;
+ bar_size = pci_resource_len(pdev, barno); + if (!bar_size) + return -ENODATA; + if (!test->bar[barno]) return -ENOMEM;
- bar_size = pci_resource_len(pdev, barno); - if (barno == test->test_reg_bar) bar_size = 0x4;
Currently BARs that have been disabled by the endpoint controller driver will result in a test FAIL.
Returning FAIL for a BAR that is disabled seems overly pessimistic.
There are EPC that disables one or more BARs intentionally.
One reason for this is that there are certain EPCs that are hardwired to expose internal PCIe controller registers over a certain BAR, so the EPC driver disables such a BAR, such that the host will not overwrite random registers during testing.
Such a BAR will be disabled by the EPC driver's init function, and the BAR will be marked as BAR_RESERVED, such that it will be unavailable to endpoint function drivers.
Let's return FAIL only for BARs that are actually enabled and failed the test, and let's return skip for BARs that are not even enabled.
Signed-off-by: Niklas Cassel cassel@kernel.org --- tools/testing/selftests/pci_endpoint/pci_endpoint_test.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c b/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c index c267b822c108..576c590b277b 100644 --- a/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c +++ b/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c @@ -65,6 +65,8 @@ TEST_F(pci_ep_bar, BAR_TEST) int ret;
pci_ep_ioctl(PCITEST_BAR, variant->barno); + if (ret == -ENODATA) + SKIP(return, "BAR is disabled"); EXPECT_FALSE(ret) TH_LOG("Test failed for BAR%d", variant->barno); }
On Thu, Jan 23, 2025 at 01:01:49PM +0100, Niklas Cassel wrote:
Currently BARs that have been disabled by the endpoint controller driver will result in a test FAIL.
Returning FAIL for a BAR that is disabled seems overly pessimistic.
There are EPC that disables one or more BARs intentionally.
One reason for this is that there are certain EPCs that are hardwired to expose internal PCIe controller registers over a certain BAR, so the EPC driver disables such a BAR, such that the host will not overwrite random registers during testing.
Such a BAR will be disabled by the EPC driver's init function, and the BAR will be marked as BAR_RESERVED, such that it will be unavailable to endpoint function drivers.
Let's return FAIL only for BARs that are actually enabled and failed the test, and let's return skip for BARs that are not even enabled.
Signed-off-by: Niklas Cassel cassel@kernel.org
Reviewed-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
I was thinking about doing something similar since some of the BAR tests are failing on my Qcom setup. And you beat me to it :)
- Mani
tools/testing/selftests/pci_endpoint/pci_endpoint_test.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c b/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c index c267b822c108..576c590b277b 100644 --- a/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c +++ b/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c @@ -65,6 +65,8 @@ TEST_F(pci_ep_bar, BAR_TEST) int ret; pci_ep_ioctl(PCITEST_BAR, variant->barno);
- if (ret == -ENODATA)
SKIP(return, "BAR is disabled");} -- 2.48.1
On Thu, Jan 23, 2025 at 01:01:48PM +0100, Niklas Cassel wrote:
Hello PCI maintainers. This patch might give a trivial conflict with: https://lore.kernel.org/linux-pci/20250123095906.3578241-2-cassel@kernel.org... because the context lines (lines that haven't been changed) might be different. If there is a conflict, simply look at this patch by itself, and resolution should be trivial.
Note to PCI maintainers:
As mentioned in the comment section of this patch, this patch has a trivial conflict with: https://lore.kernel.org/linux-pci/20250123095906.3578241-2-cassel@kernel.org...
I noticed that git still manages to apply this patch correctly if applying this patch using: $ git am -3
Kind regards, Niklas
On Thu, Jan 23, 2025 at 01:01:48PM +0100, Niklas Cassel wrote:
The current code returns -ENOMEM if test->bar[barno] is NULL.
There can be two reasons why test->bar[barno] is NULL:
- The pci_ioremap_bar() call in pci_endpoint_test_probe() failed.
- The BAR was skipped, because it is disabled by the endpoint.
Many PCI endpoint controller drivers will disable all BARs in their init function. A disabled BAR will have a size of 0.
A PCI endpoint function driver will be able to enable any BAR that is not marked as BAR_RESERVED (which means that the BAR should not be touched by the EPF driver).
Thus, perform check if the size is 0, before checking if test->bar[barno] is NULL, such that we can return different errors.
This will allow the selftests to return SKIP instead of FAIL for disabled BARs.
Signed-off-by: Niklas Cassel cassel@kernel.org
Reviewed-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
- Mani
Hello PCI maintainers. This patch might give a trivial conflict with: https://lore.kernel.org/linux-pci/20250123095906.3578241-2-cassel@kernel.org... because the context lines (lines that haven't been changed) might be different. If there is a conflict, simply look at this patch by itself, and resolution should be trivial.
drivers/misc/pci_endpoint_test.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c index d5ac71a49386..b95980b29eb9 100644 --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -292,11 +292,13 @@ static int pci_endpoint_test_bar(struct pci_endpoint_test *test, void *read_buf __free(kfree) = NULL; struct pci_dev *pdev = test->pdev;
- bar_size = pci_resource_len(pdev, barno);
- if (!bar_size)
return -ENODATA;- if (!test->bar[barno]) return -ENOMEM;
- bar_size = pci_resource_len(pdev, barno);
- if (barno == test->test_reg_bar) bar_size = 0x4;
2.48.1
linux-kselftest-mirror@lists.linaro.org
-
Manivannan Sadhasivam -
Niklas Cassel