* [PATCH] kselftest/arm64: Remove local definitions of MTE prctls
@ 2022-01-26 17:44 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2022-01-26 17:44 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Shuah Khan
Cc: Joey Gouly, linux-arm-kernel, linux-kselftest, Mark Brown
The GCR EL1 test unconditionally includes local definitions of the prctls
it tests. Since not only will the kselftest build infrastructure ensure
that the in tree uapi headers are available but the toolchain being used to
build kselftest may ensure that system uapi headers with MTE support are
available this causes the compiler to warn about duplicate definitions.
Remove these duplicate definitions.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
.../selftests/arm64/mte/check_gcr_el1_cswitch.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c b/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
index a876db1f096a..325bca0de0f6 100644
--- a/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
+++ b/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
@@ -19,17 +19,6 @@
#include "kselftest.h"
#include "mte_common_util.h"
-#define PR_SET_TAGGED_ADDR_CTRL 55
-#define PR_GET_TAGGED_ADDR_CTRL 56
-# define PR_TAGGED_ADDR_ENABLE (1UL << 0)
-# define PR_MTE_TCF_SHIFT 1
-# define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
-# define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
-# define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
-# define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
-# define PR_MTE_TAG_SHIFT 3
-# define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
-
#include "mte_def.h"
#define NUM_ITERATIONS 1024
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] kselftest/arm64: Remove local definitions of MTE prctls
2022-01-26 17:44 ` Mark Brown
@ 2022-02-01 18:33 ` Catalin Marinas
-1 siblings, 0 replies; 8+ messages in thread
From: Catalin Marinas @ 2022-02-01 18:33 UTC (permalink / raw)
To: Mark Brown
Cc: Will Deacon, Shuah Khan, Joey Gouly, linux-arm-kernel,
linux-kselftest
On Wed, Jan 26, 2022 at 05:44:21PM +0000, Mark Brown wrote:
> The GCR EL1 test unconditionally includes local definitions of the prctls
> it tests. Since not only will the kselftest build infrastructure ensure
> that the in tree uapi headers are available but the toolchain being used to
> build kselftest may ensure that system uapi headers with MTE support are
> available this causes the compiler to warn about duplicate definitions.
> Remove these duplicate definitions.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] kselftest/arm64: Remove local definitions of MTE prctls
@ 2022-02-01 18:33 ` Catalin Marinas
0 siblings, 0 replies; 8+ messages in thread
From: Catalin Marinas @ 2022-02-01 18:33 UTC (permalink / raw)
To: Mark Brown
Cc: Will Deacon, Shuah Khan, Joey Gouly, linux-arm-kernel,
linux-kselftest
On Wed, Jan 26, 2022 at 05:44:21PM +0000, Mark Brown wrote:
> The GCR EL1 test unconditionally includes local definitions of the prctls
> it tests. Since not only will the kselftest build infrastructure ensure
> that the in tree uapi headers are available but the toolchain being used to
> build kselftest may ensure that system uapi headers with MTE support are
> available this causes the compiler to warn about duplicate definitions.
> Remove these duplicate definitions.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] kselftest/arm64: Remove local definitions of MTE prctls
2022-01-26 17:44 ` Mark Brown
@ 2022-02-01 18:52 ` Shuah Khan
-1 siblings, 0 replies; 8+ messages in thread
From: Shuah Khan @ 2022-02-01 18:52 UTC (permalink / raw)
To: Mark Brown, Catalin Marinas, Will Deacon, Shuah Khan
Cc: Joey Gouly, linux-arm-kernel, linux-kselftest, Shuah Khan
On 1/26/22 10:44 AM, Mark Brown wrote:
> The GCR EL1 test unconditionally includes local definitions of the prctls
> it tests. Since not only will the kselftest build infrastructure ensure
> that the in tree uapi headers are available but the toolchain being used to
> build kselftest may ensure that system uapi headers with MTE support are
> available this causes the compiler to warn about duplicate definitions.
> Remove these duplicate definitions.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> .../selftests/arm64/mte/check_gcr_el1_cswitch.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c b/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> index a876db1f096a..325bca0de0f6 100644
> --- a/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> +++ b/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> @@ -19,17 +19,6 @@
> #include "kselftest.h"
> #include "mte_common_util.h"
>
> -#define PR_SET_TAGGED_ADDR_CTRL 55
> -#define PR_GET_TAGGED_ADDR_CTRL 56
> -# define PR_TAGGED_ADDR_ENABLE (1UL << 0)
> -# define PR_MTE_TCF_SHIFT 1
> -# define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
> -# define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
> -# define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
> -# define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
> -# define PR_MTE_TAG_SHIFT 3
> -# define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
> -
> #include "mte_def.h"
>
> #define NUM_ITERATIONS 1024
>
Thank you for cleaning this up. Assuming it is going to go through
arm tree:
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] kselftest/arm64: Remove local definitions of MTE prctls
@ 2022-02-01 18:52 ` Shuah Khan
0 siblings, 0 replies; 8+ messages in thread
From: Shuah Khan @ 2022-02-01 18:52 UTC (permalink / raw)
To: Mark Brown, Catalin Marinas, Will Deacon, Shuah Khan
Cc: Joey Gouly, linux-arm-kernel, linux-kselftest, Shuah Khan
On 1/26/22 10:44 AM, Mark Brown wrote:
> The GCR EL1 test unconditionally includes local definitions of the prctls
> it tests. Since not only will the kselftest build infrastructure ensure
> that the in tree uapi headers are available but the toolchain being used to
> build kselftest may ensure that system uapi headers with MTE support are
> available this causes the compiler to warn about duplicate definitions.
> Remove these duplicate definitions.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
> .../selftests/arm64/mte/check_gcr_el1_cswitch.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c b/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> index a876db1f096a..325bca0de0f6 100644
> --- a/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> +++ b/tools/testing/selftests/arm64/mte/check_gcr_el1_cswitch.c
> @@ -19,17 +19,6 @@
> #include "kselftest.h"
> #include "mte_common_util.h"
>
> -#define PR_SET_TAGGED_ADDR_CTRL 55
> -#define PR_GET_TAGGED_ADDR_CTRL 56
> -# define PR_TAGGED_ADDR_ENABLE (1UL << 0)
> -# define PR_MTE_TCF_SHIFT 1
> -# define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
> -# define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
> -# define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
> -# define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
> -# define PR_MTE_TAG_SHIFT 3
> -# define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
> -
> #include "mte_def.h"
>
> #define NUM_ITERATIONS 1024
>
Thank you for cleaning this up. Assuming it is going to go through
arm tree:
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
thanks,
-- Shuah
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] kselftest/arm64: Remove local definitions of MTE prctls
2022-01-26 17:44 ` Mark Brown
@ 2022-02-15 23:18 ` Will Deacon
-1 siblings, 0 replies; 8+ messages in thread
From: Will Deacon @ 2022-02-15 23:18 UTC (permalink / raw)
To: Mark Brown, Shuah Khan, Catalin Marinas
Cc: kernel-team, Will Deacon, linux-arm-kernel, Joey Gouly,
linux-kselftest
On Wed, 26 Jan 2022 17:44:21 +0000, Mark Brown wrote:
> The GCR EL1 test unconditionally includes local definitions of the prctls
> it tests. Since not only will the kselftest build infrastructure ensure
> that the in tree uapi headers are available but the toolchain being used to
> build kselftest may ensure that system uapi headers with MTE support are
> available this causes the compiler to warn about duplicate definitions.
> Remove these duplicate definitions.
>
> [...]
Applied to arm64 (for-next/kselftest), thanks!
[1/1] kselftest/arm64: Remove local definitions of MTE prctls
https://git.kernel.org/arm64/c/396520759bd3
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] kselftest/arm64: Remove local definitions of MTE prctls
@ 2022-02-15 23:18 ` Will Deacon
0 siblings, 0 replies; 8+ messages in thread
From: Will Deacon @ 2022-02-15 23:18 UTC (permalink / raw)
To: Mark Brown, Shuah Khan, Catalin Marinas
Cc: kernel-team, Will Deacon, linux-arm-kernel, Joey Gouly,
linux-kselftest
On Wed, 26 Jan 2022 17:44:21 +0000, Mark Brown wrote:
> The GCR EL1 test unconditionally includes local definitions of the prctls
> it tests. Since not only will the kselftest build infrastructure ensure
> that the in tree uapi headers are available but the toolchain being used to
> build kselftest may ensure that system uapi headers with MTE support are
> available this causes the compiler to warn about duplicate definitions.
> Remove these duplicate definitions.
>
> [...]
Applied to arm64 (for-next/kselftest), thanks!
[1/1] kselftest/arm64: Remove local definitions of MTE prctls
https://git.kernel.org/arm64/c/396520759bd3
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread