Run kselftest-tpm2 on grunt #1025
Conversation
| @@ -1939,6 +1945,7 @@ test_configs: | |||
| - kselftest-lkdtm | |||
| - kselftest-rtc | |||
| - kselftest-seccomp | |||
| - kselftest-tpm2 | |||
There was a problem hiding this comment.
How about running it on other devices? Does it require particular hardware only available on grunt?
There was a problem hiding this comment.
Yes, I intend to. I was having a few issues getting the test running on a few other devices, and grunt was the first one I got it working on. But there should be a few other devices in KernelCI where we can run this test on. By the end of next week I should probably be able to get at least one other device running this test.
nfraprado
force-pushed
the
kselftest-tpm2
branch
from
536cd59
to
482fe14
Compare
|
This is conflicting with #823 which is blocked on a new buildroot image to be produced. |
|
Oops, I totally missed that PR and ended up duplicating some of that work. In any case, that particular PR doesn't look blocked in any way (it's just adding configs). So I'll rebase this PR on top of that one, and then we can start by merging that one. I'll also comment on it to answer some questions and get it unblocked. |
nfraprado
force-pushed
the
kselftest-tpm2
branch
2 times, most recently
from
a06d9b8
to
c0fe1dc
Compare
nfraprado
force-pushed
the
kselftest-tpm2
branch
from
c0fe1dc
to
a420493
Compare
|
@nfraprado Please rebase one more time, I think this is conflicting with the |
The tpm2 kselftest requires python3 unittest. Add it to the rootfs so we can run the test. Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
As per grunt's SSDT1 ACPI table, the TPM device requires a GPIO IRQ to be configured, whose controller has HID AMD0030. The driver that matches it is pinctrl-amd. Enable the AMD pinctrl driver so the TPM probes in grunt and can be used in the tpm2 kselftest. Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Add the tpm2 collection to kselftest. It tests TPM devices that support the TPM 2.0 specification. Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
grunt has a cr50 TPM chip that is accessible through an i2c bus. By running this test, we're checking that the tpm_tis_i2c_cr50 driver interfaces correctly with the TPM chip. Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
nfraprado
force-pushed
the
kselftest-tpm2
branch
from
a420493
to
53520de
Compare
|
@gctucker OK, rebased. |
There was a problem hiding this comment.
Here's the resulting job, manually submitted with the build and rootfs image mentioned above:
https://lava.collabora.co.uk/scheduler/job/5772426
https://staging.kernelci.org/test/plan/id/6218b696bb88e681ca4b318a/
which still showed the same errors as the kernel build didn't have the required patch.
Then the same job resubmitted with @nfraprado's kernel binary:
https://lava.collabora.co.uk/scheduler/job/5772538
which also shows the errors.
Could you please take a look and confirm which kernel changes are required to make this pass? We could then apply them on top of linux-next on a staging build to check the changes in this PR work with that kernel fix in place.
| @@ -268,6 +268,7 @@ fragments: | |||
| - 'CONFIG_TCG_TIS_I2C_CR50=y' | |||
| - 'CONFIG_SPI=y' | |||
| - 'CONFIG_SPI_PXA2XX=y' | |||
| - 'CONFIG_PINCTRL_AMD=y' | |||
There was a problem hiding this comment.
Checked this has been included in the staging build:
https://storage.staging.kernelci.org/kernelci/staging-mainline/staging-mainline-20220224.0/x86_64/x86_64_defconfig+x86-chromebook+kselftest/gcc-10/config/kernelci.config
There was a problem hiding this comment.
# fragment from: x86-chromebook
CONFIG_SERIAL_8250_DW=y
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_MFD_INTEL_LPSS_PCI=y
CONFIG_USB_GADGET=y
CONFIG_USB_ETH=y
CONFIG_USB_RTL8152=y
CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PCI=y
CONFIG_MMC_SDHCI_ACPI=y
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=y
CONFIG_CHROMEOS_TBMC=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_LPC=y
CONFIG_CROS_EC_I2C=y
CONFIG_IIO=m
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
CONFIG_IIO_CROS_EC_SENSORS=m
CONFIG_MFD_CROS_EC_DEV=m
CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_TCG_TPM=y
CONFIG_TCG_TIS=y
CONFIG_TCG_TIS_SPI=y
CONFIG_TCG_TIS_SPI_CR50=y
CONFIG_TCG_TIS_I2C_CR50=y
CONFIG_SPI=y
CONFIG_SPI_PXA2XX=y
CONFIG_PINCTRL_AMD=y
| - python3-minimal | ||
| - python3-unittest2 |
There was a problem hiding this comment.
Checked this has been included in the rootfs build:
https://bot.staging.kernelci.org/job/rootfs-builder/337/console
./kci_rootfs build --rootfs-config bullseye-kselftest --arch amd64 --data-path config/rootfs/debos --output 20220225-gtucker
Running /debos --artifactdir /data/workspace/bot.staging.kernelci.org/kernel-builder/workspace/rootfs-builder/kernelci-core/20220225-gtucker/_install_ --template-var crush_image_options:"" --template-var debian_mirror:"" --template-var keyring_package:"" --template-var suite:"bullseye" --template-var basename:"bullseye-kselftest/amd64" --template-var extra_packages_remove:"" --template-var extra_files_remove:"" --template-var test_overlay:"" --template-var keyring_file:"" --template-var architecture:"amd64" --template-var extra_packages:"bc ca-certificates iproute2 jdim libatm1 libcap2-bin libelf1 libgdbm-compat4 libgdbm6 libhugetlbfs0 libmnl0 libnuma1 libpam-cap libpcre2-8-0 libperl5.32 libpsl5 libxtables12 netbase openssl perl perl-modules-5.32 procps publicsuffix python3-minimal python3-unittest2 wget xz-utils" --template-var extra_firmware:"" --template-var script:"" /data/workspace/bot.staging.kernelci.org/kernel-builder/workspace/rootfs-builder/kernelci-core/config/rootfs/debos/rootfs.yaml --internal-image
The tpm2 kselftest currently throws TPM_RC_LOCKOUT errors. A workaround for the issue is to patch the kselftest to run tpm2_clear before running the tests. tpm2_clear is part of the tpm2-tools, so install this package in order to be able to work around those errors. Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
|
@gctucker To get rid of the ERRORs, the commit I just pushed is needed in order to have tpm2-tools in the rootfs, and also the attached patch (renamed to a .txt extension since GitHub doesn't like .patch) needs to be applied to the kernel. Note that this patch is in kselftest, so it's the kselftest archive that will be affected rather than the kernel image. 0001-DONOTUPSTREAM-selftest-tpm-Clear-TPM-before-running-.txt But there's one other thing, it seems like some of the grunt devices have trouble running this test. The very same test you ran here on cbg-7 I re-ran explicitly on cbg-4, and as you can see, the errors I get are the |
|
Thanks for the update. We've just identified the issue with different grunt variants in the lab, they should be split as different device types. Meanwhile I'll get your patch applied on staging linux-next to confirm the rest is working with these changes in place. The kernel builds include the kselftest binaries, it's just part of the artifacts so that will all get tested together. I might also re-run some jobs on different grunt devices to compare the results. |
|
Also, starting another rootfs build with the extra patckage. |
|
Starting another amd64 bullseye-kselftest rootfs build on staging now as other things have moved since then, and we'll be able to test that on staging. |
|
Previously: Now, with the updated rootfs image: So the test results reported to KernelCI are still the same in terms of pass/fail/skip but at least the tests are actually being run now. I guess there could be test sets defined to include the details of each individual test case, then we would have Strangely, in the job you ran the errors occurred but the results reported to LAVA were all "ok": Out of interest, do you know what is causing the error here with Also, do you reckon the skiplist is masking too many tests and some should be run on grunt and maybe other platforms? |
|
Sorry for the delay in the feedback. It is indeed strange that my first run passed even with the tests failing, but re-running the tests, I couldn't reproduce that anymore. And no, I haven't looked further into the Also, I saw some timeouts happening during some more runs of the tests, but the run times were fluctuating so much (the smoke would take anything between 34s to 69s to run) that I think it might have been just some issue with the boards on the lab. With the test being merged now, we'll get much more runs, and if the timeouts keep happening then I can send a patch upstream setting the timeout configuration for the tpm selftest to a higher value (it's currently at the default 45s). By the way, is there a way to see which patches are currently being applied by KernelCI to run the tests? Even though I created an issue, kernelci/kernelci-project#101, to track the TPM_RC_LOCKOUT issue that we needed a patch to workaround, it would be even better if it was very clear which patch is being used in KernelCI to workaround the issue. I'm just worried we might forget about this patch even. And since it's not upstreamable, we should have it at hand when looking into a proper solution upstream at a later point. |
|
OK, if the test takes between 30 and 60s to run then the timeout should probably be like 120s anyway. The kernel patches applied on staging can be see on the git branches, here's staging-next for example: |
This PR gets kselftest-tpm2 running on grunt.
Lava log: https://lava.collabora.co.uk/scheduler/job/5608585
Basically the results are:
The errors are caused by
tpm2.ProtocolError: TPM_RC_LOCKOUT: cc=0x00000153, rc=0x00000921. There was a commit in the past fixing those, but it was later reverted. However the patch might make sense in KernelCI's usecase, where devices are there just for testing. That said, that patch requires thetpm2_cleartool, which is only available in bullseye.I ran the tests using the
bullseye-kselftestrootfs from #1024, with the addition of thetpm2-toolspackage, and that patch applied (although modified to clear before rather than after the tests are run), and the errors were gone:https://lava.collabora.co.uk/scheduler/job/5616044. A single FAIL remained from one of the tests.
So one option would be to, after #1024 is merged, add the
tpm2-toolspackage and carry a patch in KernelCI for kselftest. Ideally the change would be merged upstream, but given that it was reverted already, a different approach would be needed for upstream, and I'm not sure what that would be.