* [PATCH] Kernel selftests: Add check if tpm devices are supported
@ 2020-05-18 21:39 Nikita Sobolev
2020-05-18 21:50 ` Petr Vorel
2020-05-19 13:48 ` Jarkko Sakkinen
0 siblings, 2 replies; 3+ messages in thread
From: Nikita Sobolev @ 2020-05-18 21:39 UTC (permalink / raw)
To: Shuah Khan, linux-kselftest
Cc: Jarkko Sakkinen, Tadeusz Struk, Joey Pabalinas, Petr Vorel,
linux-kernel, linux-integrity, Jason Gunthorpe, Peter Huewe,
Alexey Brodkin, Eugeniy Paltsev, linux-snps-arc, Nikita Sobolev
tpm2 tests set uses /dev/tpm0 and /dev/tpmrm0 without check if they
are available. In case, when these devices are not available test
fails, but expected behaviour is test to be skipped.
Signed-off-by: Nikita Sobolev <Nikita.Sobolev@synopsys.com>
---
tools/testing/selftests/tpm2/test_smoke.sh | 11 +++++++++--
tools/testing/selftests/tpm2/test_space.sh | 9 ++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh
index 8155c2ea7ccb..e55d3e400666 100755
--- a/tools/testing/selftests/tpm2/test_smoke.sh
+++ b/tools/testing/selftests/tpm2/test_smoke.sh
@@ -1,8 +1,15 @@
#!/bin/bash
# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
-python -m unittest -v tpm2_tests.SmokeTest
-python -m unittest -v tpm2_tests.AsyncTest
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+
+if [ -f /dev/tpm0 ] ; then
+ python -m unittest -v tpm2_tests.SmokeTest
+ python -m unittest -v tpm2_tests.AsyncTest
+else
+ exit $ksft_skip
+fi
CLEAR_CMD=$(which tpm2_clear)
if [ -n $CLEAR_CMD ]; then
diff --git a/tools/testing/selftests/tpm2/test_space.sh b/tools/testing/selftests/tpm2/test_space.sh
index a6f5e346635e..180b469c53b4 100755
--- a/tools/testing/selftests/tpm2/test_space.sh
+++ b/tools/testing/selftests/tpm2/test_space.sh
@@ -1,4 +1,11 @@
#!/bin/bash
# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
-python -m unittest -v tpm2_tests.SpaceTest
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+
+if [ -f /dev/tpmrm0 ] ; then
+ python -m unittest -v tpm2_tests.SpaceTest
+else
+ exit $ksft_skip
+fi
--
2.16.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Kernel selftests: Add check if tpm devices are supported
2020-05-18 21:39 [PATCH] Kernel selftests: Add check if tpm devices are supported Nikita Sobolev
@ 2020-05-18 21:50 ` Petr Vorel
2020-05-19 13:48 ` Jarkko Sakkinen
1 sibling, 0 replies; 3+ messages in thread
From: Petr Vorel @ 2020-05-18 21:50 UTC (permalink / raw)
To: Nikita Sobolev
Cc: Shuah Khan, linux-kselftest, Jarkko Sakkinen, Tadeusz Struk,
Joey Pabalinas, linux-kernel, linux-integrity, Jason Gunthorpe,
Peter Huewe, Alexey Brodkin, Eugeniy Paltsev, linux-snps-arc
Hi Nikita,
> tpm2 tests set uses /dev/tpm0 and /dev/tpmrm0 without check if they
> are available. In case, when these devices are not available test
> fails, but expected behaviour is test to be skipped.
> Signed-off-by: Nikita Sobolev <Nikita.Sobolev@synopsys.com>
Good catch.
Reviewed-by: Petr Vorel <pvorel@suse.cz>
> ---
> tools/testing/selftests/tpm2/test_smoke.sh | 11 +++++++++--
> tools/testing/selftests/tpm2/test_space.sh | 9 ++++++++-
> 2 files changed, 17 insertions(+), 3 deletions(-)
> diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh
> index 8155c2ea7ccb..e55d3e400666 100755
> --- a/tools/testing/selftests/tpm2/test_smoke.sh
> +++ b/tools/testing/selftests/tpm2/test_smoke.sh
> @@ -1,8 +1,15 @@
> #!/bin/bash
> # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
> -python -m unittest -v tpm2_tests.SmokeTest
> -python -m unittest -v tpm2_tests.AsyncTest
> +# Kselftest framework requirement - SKIP code is 4.
> +ksft_skip=4
I hope one day kselftest adds these constants into single file :).
> +
> +if [ -f /dev/tpm0 ] ; then
> + python -m unittest -v tpm2_tests.SmokeTest
> + python -m unittest -v tpm2_tests.AsyncTest
> +else
> + exit $ksft_skip
> +fi
nit: instead of if/else, I'd use shorter form:
[ -f /dev/tpm0 ] || exit $ksft_skip
python -m unittest -v tpm2_tests.SmokeTest
python -m unittest -v tpm2_tests.AsyncTest
> CLEAR_CMD=$(which tpm2_clear)
> if [ -n $CLEAR_CMD ]; then
> diff --git a/tools/testing/selftests/tpm2/test_space.sh b/tools/testing/selftests/tpm2/test_space.sh
> index a6f5e346635e..180b469c53b4 100755
> --- a/tools/testing/selftests/tpm2/test_space.sh
> +++ b/tools/testing/selftests/tpm2/test_space.sh
> @@ -1,4 +1,11 @@
> #!/bin/bash
> # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
> -python -m unittest -v tpm2_tests.SpaceTest
> +# Kselftest framework requirement - SKIP code is 4.
> +ksft_skip=4
> +
> +if [ -f /dev/tpmrm0 ] ; then
same here.
> + python -m unittest -v tpm2_tests.SpaceTest
> +else
> + exit $ksft_skip
> +fi
Kind regards,
Petr
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Kernel selftests: Add check if tpm devices are supported
2020-05-18 21:39 [PATCH] Kernel selftests: Add check if tpm devices are supported Nikita Sobolev
2020-05-18 21:50 ` Petr Vorel
@ 2020-05-19 13:48 ` Jarkko Sakkinen
1 sibling, 0 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2020-05-19 13:48 UTC (permalink / raw)
To: Nikita Sobolev
Cc: Shuah Khan, linux-kselftest, Tadeusz Struk, Joey Pabalinas,
Petr Vorel, linux-kernel, linux-integrity, Jason Gunthorpe,
Peter Huewe, Alexey Brodkin, Eugeniy Paltsev, linux-snps-arc
On Tue, May 19, 2020 at 12:39:34AM +0300, Nikita Sobolev wrote:
> tpm2 tests set uses /dev/tpm0 and /dev/tpmrm0 without check if they
> are available. In case, when these devices are not available test
> fails, but expected behaviour is test to be skipped.
>
> Signed-off-by: Nikita Sobolev <Nikita.Sobolev@synopsys.com>
tpm2 tests set -> TPM2 test suite
Fixes tag is also required.
There is nothing cool writing acronyms in lower case, so lets
just always write them correctly.
> ---
> tools/testing/selftests/tpm2/test_smoke.sh | 11 +++++++++--
> tools/testing/selftests/tpm2/test_space.sh | 9 ++++++++-
> 2 files changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh
> index 8155c2ea7ccb..e55d3e400666 100755
> --- a/tools/testing/selftests/tpm2/test_smoke.sh
> +++ b/tools/testing/selftests/tpm2/test_smoke.sh
> @@ -1,8 +1,15 @@
> #!/bin/bash
> # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
>
> -python -m unittest -v tpm2_tests.SmokeTest
> -python -m unittest -v tpm2_tests.AsyncTest
> +# Kselftest framework requirement - SKIP code is 4.
> +ksft_skip=4
> +
> +if [ -f /dev/tpm0 ] ; then
> + python -m unittest -v tpm2_tests.SmokeTest
> + python -m unittest -v tpm2_tests.AsyncTest
> +else
> + exit $ksft_skip
> +fi
>
> CLEAR_CMD=$(which tpm2_clear)
> if [ -n $CLEAR_CMD ]; then
> diff --git a/tools/testing/selftests/tpm2/test_space.sh b/tools/testing/selftests/tpm2/test_space.sh
> index a6f5e346635e..180b469c53b4 100755
> --- a/tools/testing/selftests/tpm2/test_space.sh
> +++ b/tools/testing/selftests/tpm2/test_space.sh
> @@ -1,4 +1,11 @@
> #!/bin/bash
> # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
>
> -python -m unittest -v tpm2_tests.SpaceTest
> +# Kselftest framework requirement - SKIP code is 4.
> +ksft_skip=4
> +
> +if [ -f /dev/tpmrm0 ] ; then
> + python -m unittest -v tpm2_tests.SpaceTest
> +else
> + exit $ksft_skip
> +fi
> --
> 2.16.2
>
This would make the change more compact:
# Kselftest framework requirement - SKIP code is 4.
if [ ! -f /dev/tpmrm0 ] ; then
exit 4
fi
python -m unittest -v tpm2_tests.SpaceTest
(also for /dev/tpm0)
/Jarkko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-19 13:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-18 21:39 [PATCH] Kernel selftests: Add check if tpm devices are supported Nikita Sobolev
2020-05-18 21:50 ` Petr Vorel
2020-05-19 13:48 ` Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).