diff mbox series

kselftest/arm64: pac: Fix skipping of tests on systems without PAC

Message ID 20210819165723.43903-1-broonie@kernel.org
State Accepted
Commit 0c69bd2ca6ee20064dde7853cd749284e053a874
Headers show
Series kselftest/arm64: pac: Fix skipping of tests on systems without PAC | expand

Commit Message

Mark Brown Aug. 19, 2021, 4:57 p.m. UTC 
The PAC tests check to see if the system supports the relevant PAC features
but instead of skipping the tests if they can't be executed they fail the
tests which makes things look like they're not working when they are.

Signed-off-by: Mark Brown <broonie@kernel.org>

---
 tools/testing/selftests/arm64/pauth/pac.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

-- 
2.20.1

Comments

Amit Kachhap Aug. 20, 2021, 7:09 a.m. UTC | #1 
On 8/19/21 10:27 PM, Mark Brown wrote:
> The PAC tests check to see if the system supports the relevant PAC features

> but instead of skipping the tests if they can't be executed they fail the

> tests which makes things look like they're not working when they are.

> 

> Signed-off-by: Mark Brown <broonie@kernel.org>

> ---

>   tools/testing/selftests/arm64/pauth/pac.c | 10 ++++++----

>   1 file changed, 6 insertions(+), 4 deletions(-)

> 

> diff --git a/tools/testing/selftests/arm64/pauth/pac.c b/tools/testing/selftests/arm64/pauth/pac.c

> index 592fe538506e..b743daa772f5 100644

> --- a/tools/testing/selftests/arm64/pauth/pac.c

> +++ b/tools/testing/selftests/arm64/pauth/pac.c

> @@ -25,13 +25,15 @@

>   do { \

>   	unsigned long hwcaps = getauxval(AT_HWCAP); \

>   	/* data key instructions are not in NOP space. This prevents a SIGILL */ \

> -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \

> +	if (!(hwcaps & HWCAP_PACA))					\

> +		SKIP(return, "PAUTH not enabled"); \

>   } while (0)

>   #define ASSERT_GENERIC_PAUTH_ENABLED() \


May be ASSERT_GENERIC_PAUTH_ENABLED can be replaced with
something like VERIFY_GENERIC_PAUTH_ENABLED

or can be modified like below and instead of failing it skips with a
message

   -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \
   +	ASSERT_NE(0, hwcaps & HWCAP_PACA) SKIP(return, "PAUTH not 
enabled"); \					


>   do { \

>   	unsigned long hwcaps = getauxval(AT_HWCAP); \

>   	/* generic key instructions are not in NOP space. This prevents a SIGILL */ \

> -	ASSERT_NE(0, hwcaps & HWCAP_PACG) TH_LOG("Generic PAUTH not enabled"); \

> +	if (!(hwcaps & HWCAP_PACG)) \

> +		SKIP(return, "Generic PAUTH not enabled");	\

>   } while (0)

>   

>   void sign_specific(struct signatures *sign, size_t val)

> @@ -256,7 +258,7 @@ TEST(single_thread_different_keys)

>   	unsigned long hwcaps = getauxval(AT_HWCAP);

>   

>   	/* generic and data key instructions are not in NOP space. This prevents a SIGILL */

> -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled");

> +	ASSERT_PAUTH_ENABLED();

>   	if (!(hwcaps & HWCAP_PACG)) {

>   		TH_LOG("WARNING: Generic PAUTH not enabled. Skipping generic key checks");

>   		nkeys = NKEYS - 1;

> @@ -299,7 +301,7 @@ TEST(exec_changed_keys)

>   	unsigned long hwcaps = getauxval(AT_HWCAP);

>   

>   	/* generic and data key instructions are not in NOP space. This prevents a SIGILL */

> -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled");

> +	ASSERT_PAUTH_ENABLED();

>   	if (!(hwcaps & HWCAP_PACG)) {

>   		TH_LOG("WARNING: Generic PAUTH not enabled. Skipping generic key checks");

>   		nkeys = NKEYS - 1;

>
Mark Brown Aug. 20, 2021, 10:55 a.m. UTC | #2 
On Fri, Aug 20, 2021 at 12:39:39PM +0530, Amit Kachhap wrote:
> On 8/19/21 10:27 PM, Mark Brown wrote:


> > -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \

> > +	if (!(hwcaps & HWCAP_PACA))					\

> > +		SKIP(return, "PAUTH not enabled"); \

> >   } while (0)

> >   #define ASSERT_GENERIC_PAUTH_ENABLED() \


> May be ASSERT_GENERIC_PAUTH_ENABLED can be replaced with

> something like VERIFY_GENERIC_PAUTH_ENABLED


I thought briefly about bikeshedding the name but didn't come up with
anything that was sufficiently better/clearer.

> or can be modified like below and instead of failing it skips with a

> message


>   -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \

>   +	ASSERT_NE(0, hwcaps & HWCAP_PACA) SKIP(return, "PAUTH not enabled");


That's what the patch does?
Amit Kachhap Aug. 20, 2021, 11:35 a.m. UTC | #3 
On 8/20/21 4:25 PM, Mark Brown wrote:
> On Fri, Aug 20, 2021 at 12:39:39PM +0530, Amit Kachhap wrote:

>> On 8/19/21 10:27 PM, Mark Brown wrote:

> 

>>> -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \

>>> +	if (!(hwcaps & HWCAP_PACA))					\

>>> +		SKIP(return, "PAUTH not enabled"); \

>>>    } while (0)

>>>    #define ASSERT_GENERIC_PAUTH_ENABLED() \

> 

>> May be ASSERT_GENERIC_PAUTH_ENABLED can be replaced with

>> something like VERIFY_GENERIC_PAUTH_ENABLED

> 

> I thought briefly about bikeshedding the name but didn't come up with

> anything that was sufficiently better/clearer.

> 

>> or can be modified like below and instead of failing it skips with a

>> message

> 

>>    -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \

>>    +	ASSERT_NE(0, hwcaps & HWCAP_PACA) SKIP(return, "PAUTH not enabled");

> 

> That's what the patch does?


Agree, I saw few other testcases where ASSERT is used along with SKIP.
(tools/testing/selftests/core/close_range_test.c) so this way 
ASSERT_GENERIC_* macro will be clear. There will be just an extra
log like "hwcaps & HWCAP_PACA = 0" in this case.

Probably your way is consistent as other tests in arm64 also just
skips due to HWCAP mismatch.

>
Mark Brown Aug. 20, 2021, noon UTC | #4 
On Fri, Aug 20, 2021 at 05:05:05PM +0530, Amit Kachhap wrote:
> On 8/20/21 4:25 PM, Mark Brown wrote:

> > On Fri, Aug 20, 2021 at 12:39:39PM +0530, Amit Kachhap wrote:


> > >    -	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \

> > >    +	ASSERT_NE(0, hwcaps & HWCAP_PACA) SKIP(return, "PAUTH not enabled");


> > That's what the patch does?


> Agree, I saw few other testcases where ASSERT is used along with SKIP.

> (tools/testing/selftests/core/close_range_test.c) so this way

> ASSERT_GENERIC_* macro will be clear. There will be just an extra

> log like "hwcaps & HWCAP_PACA = 0" in this case.


I'm not 100% sure I follow what you're saying here?  I don't see a log
message saying "hwcaps & HWCAP_PACA = 0" on non-PAC systems, or is that
what you're saying you want to see?

> Probably your way is consistent as other tests in arm64 also just

> skips due to HWCAP mismatch.


Right, we can't usefully run tests for features not present in the
system - this sort of thing is the intent of the kselftest skip feature.
Catalin Marinas Aug. 20, 2021, 4:57 p.m. UTC | #5 
On Thu, 19 Aug 2021 17:57:23 +0100, Mark Brown wrote:
> The PAC tests check to see if the system supports the relevant PAC features

> but instead of skipping the tests if they can't be executed they fail the

> tests which makes things look like they're not working when they are.


Applied to arm64 (for-next/kselftest), thanks!

[1/1] kselftest/arm64: pac: Fix skipping of tests on systems without PAC
      https://git.kernel.org/arm64/c/0c69bd2ca6ee

-- 
Catalin
diff mbox series

Patch

diff --git a/tools/testing/selftests/arm64/pauth/pac.c b/tools/testing/selftests/arm64/pauth/pac.c
index 592fe538506e..b743daa772f5 100644
--- a/tools/testing/selftests/arm64/pauth/pac.c
+++ b/tools/testing/selftests/arm64/pauth/pac.c
@@ -25,13 +25,15 @@ 
 do { \
 	unsigned long hwcaps = getauxval(AT_HWCAP); \
 	/* data key instructions are not in NOP space. This prevents a SIGILL */ \
-	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled"); \
+	if (!(hwcaps & HWCAP_PACA))					\
+		SKIP(return, "PAUTH not enabled"); \
 } while (0)
 #define ASSERT_GENERIC_PAUTH_ENABLED() \
 do { \
 	unsigned long hwcaps = getauxval(AT_HWCAP); \
 	/* generic key instructions are not in NOP space. This prevents a SIGILL */ \
-	ASSERT_NE(0, hwcaps & HWCAP_PACG) TH_LOG("Generic PAUTH not enabled"); \
+	if (!(hwcaps & HWCAP_PACG)) \
+		SKIP(return, "Generic PAUTH not enabled");	\
 } while (0)
 
 void sign_specific(struct signatures *sign, size_t val)
@@ -256,7 +258,7 @@  TEST(single_thread_different_keys)
 	unsigned long hwcaps = getauxval(AT_HWCAP);
 
 	/* generic and data key instructions are not in NOP space. This prevents a SIGILL */
-	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled");
+	ASSERT_PAUTH_ENABLED();
 	if (!(hwcaps & HWCAP_PACG)) {
 		TH_LOG("WARNING: Generic PAUTH not enabled. Skipping generic key checks");
 		nkeys = NKEYS - 1;
@@ -299,7 +301,7 @@  TEST(exec_changed_keys)
 	unsigned long hwcaps = getauxval(AT_HWCAP);
 
 	/* generic and data key instructions are not in NOP space. This prevents a SIGILL */
-	ASSERT_NE(0, hwcaps & HWCAP_PACA) TH_LOG("PAUTH not enabled");
+	ASSERT_PAUTH_ENABLED();
 	if (!(hwcaps & HWCAP_PACG)) {
 		TH_LOG("WARNING: Generic PAUTH not enabled. Skipping generic key checks");
 		nkeys = NKEYS - 1;