Skip to content

Run kselftest-tpm2 on grunt #1025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gctucker merged 5 commits into from
Mar 18, 2022
Merged

Run kselftest-tpm2 on grunt #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
109b310
rootfs-configs.yaml: Add python3 unittest to selftest for tpm2
nfraprado Feb 3, 2022
bc4429f
build-configs.yaml: Enable AMD pinctrl to get TPM working on grunt
nfraprado Feb 4, 2022
88c3062
test-configs.yaml: Add kselftest-tpm2 test
nfraprado Feb 4, 2022
53520de
test-configs.yaml: Enable kselftest-tpm2 on grunt
nfraprado Feb 4, 2022
e669253
rootfs-configs.yaml: Add tpm2-tools to kselftest-bullseye
nfraprado Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/core/build-configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ fragments:
- 'CONFIG_TCG_TIS_I2C_CR50=y'
- 'CONFIG_SPI=y'
- 'CONFIG_SPI_PXA2XX=y'
- 'CONFIG_PINCTRL_AMD=y'

@gctucker gctucker Feb 25, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@gctucker gctucker Feb 25, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

# 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


x86_kvm_guest:
path: "kernel/configs/kvm_guest.config"
Expand Down
3 changes: 3 additions & 0 deletions config/core/rootfs-configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ rootfs_configs:
- perl-modules-5.32
- procps
- publicsuffix
- python3-minimal
- python3-unittest2
Comment on lines +162 to +163

@gctucker gctucker Feb 25, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

- tpm2-tools
- wget
- xz-utils

Expand Down
7 changes: 7 additions & 0 deletions config/core/test-configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@ test_plans:
job_timeout: '10'
kselftest_collections: "seccomp"

kselftest-tpm2:
<<: *kselftest
params:
job_timeout: '10'
kselftest_collections: "tpm2"

kselftest-vm:
<<: *kselftest
params:
Expand Down Expand Up @@ -1969,6 +1975,7 @@ test_configs:
- kselftest-lkdtm
- kselftest-rtc
- kselftest-seccomp
- kselftest-tpm2

@gctucker gctucker Feb 4, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about running it on other devices? Does it require particular hardware only available on grunt?

@nfraprado nfraprado Feb 4, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

- kselftest-vm
- ltp-crypto
- ltp-fcntl-locktests
Expand Down