| Message ID | 20220511161004.189348-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kselftest/arm64: Explicitly build no BTI tests with BTI disabled | expand |
On Wed, May 11, 2022 at 05:10:04PM +0100, Mark Brown wrote: > In case a distribution enables branch protection by default do as we do for > the main kernel and explicitly disable branch protection when building the > test case for having BTI disabled to ensure it doesn't get turned on by the > toolchain defaults. > > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > tools/testing/selftests/arm64/bti/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/arm64/bti/Makefile b/tools/testing/selftests/arm64/bti/Makefile > index 10a12c5e05e6..a3e59d7910b3 100644 > --- a/tools/testing/selftests/arm64/bti/Makefile > +++ b/tools/testing/selftests/arm64/bti/Makefile > @@ -14,7 +14,7 @@ CFLAGS += -I../../../../../usr/include/ > > CFLAGS_STATIC = -ffreestanding > > -CFLAGS_NOBTI = -DBTI=0 > +CFLAGS_NOBTI = -mbranch-protection=none -DBTI=0 > CFLAGS_BTI = -mbranch-protection=standard -DBTI=1 Do I miss an patches? I can't see the CFLAGS_STATIC in the arm64 branches, nor in next.
On Mon, May 16, 2022 at 07:09:36PM +0100, Catalin Marinas wrote: > On Wed, May 11, 2022 at 05:10:04PM +0100, Mark Brown wrote: > > -CFLAGS_NOBTI = -DBTI=0 > > +CFLAGS_NOBTI = -mbranch-protection=none -DBTI=0 > > CFLAGS_BTI = -mbranch-protection=standard -DBTI=1 > Do I miss an patches? I can't see the CFLAGS_STATIC in the arm64 > branches, nor in next. Ah, sorry - I have some WIP stuff to do a dynamic btitest binary.
diff --git a/tools/testing/selftests/arm64/bti/Makefile b/tools/testing/selftests/arm64/bti/Makefile index 10a12c5e05e6..a3e59d7910b3 100644 --- a/tools/testing/selftests/arm64/bti/Makefile +++ b/tools/testing/selftests/arm64/bti/Makefile @@ -14,7 +14,7 @@ CFLAGS += -I../../../../../usr/include/ CFLAGS_STATIC = -ffreestanding -CFLAGS_NOBTI = -DBTI=0 +CFLAGS_NOBTI = -mbranch-protection=none -DBTI=0 CFLAGS_BTI = -mbranch-protection=standard -DBTI=1 CFLAGS_COMMON = -Wall -Wextra $(CFLAGS)
In case a distribution enables branch protection by default do as we do for the main kernel and explicitly disable branch protection when building the test case for having BTI disabled to ensure it doesn't get turned on by the toolchain defaults. Signed-off-by: Mark Brown <broonie@kernel.org> --- tools/testing/selftests/arm64/bti/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)