Message ID | 20190814152017.GD51963@lakrids.cambridge.arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm64: fix CONFIG_KASAN_SW_TAGS && CONFIG_KASAN_INLINE (was: Re: [PATCH V5 03/12] arm64: kasan: Switch to using) KASAN_SHADOW_OFFSET | expand |
On Wed, Aug 14, 2019 at 04:20:18PM +0100, Mark Rutland wrote: > On Wed, Aug 07, 2019 at 04:55:15PM +0100, Steve Capper wrote: > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > > index b2400f9c1213..2b7db0d41498 100644 > > --- a/arch/arm64/Makefile > > +++ b/arch/arm64/Makefile > > @@ -126,14 +126,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > -# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) > > -# - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) > > -# in 32-bit arithmetic > > -KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ > > - (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 1 - 32))) \ > > - + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ > > - - (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) ) > > - > > export TEXT_OFFSET GZFLAGS > > > > core-y += arch/arm64/kernel/ arch/arm64/mm/ > > I've just spotted this breaks build using CONFIG_KASAN_SW_TAGS && > CONFIG_KASAN_INLINE, as scripts/Makefile.kasan only propagates > CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET when > CONFIG_KASAN_GENERIC is selected, but consumes KASAN_SHADOW_OFFSET > regardless. > > I think that's by accident rather than by design, but to > minimize/localize the fixup, how about the below? I can send a cleanup > patch for scripts/Makefile.kasan later. How much work is that? I've dropped this stuff from -next for now, so we have time to fix it properly as long as it's not going to take weeks. > ---->8---- > From b1a6f2dd5aa30d874c4bd97a20ea1330607da624 Mon Sep 17 00:00:00 2001 > From: Mark Rutland <mark.rutland@arm.com> > Date: Wed, 14 Aug 2019 15:51:14 +0100 > Subject: [PATCH] arm64: fix CONFIG_KASAN_SW_TAGS && CONFIG_KASAN_INLINE > > Since commit: > > 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") > > ... attempting to build with CONFIG_KASAN_SW_TAGS && CONFIG_KASAN_INLINE > results ins splat: > > | [mark@lakrids:~/src/linux]% usellvm 8.0.1 usekorg 8.1.0 make ARCH=arm64 CROSS_COMPILE=aarch64-linux- CC=clang > | scripts/kconfig/conf --syncconfig Kconfig > | CC scripts/mod/empty.o > | clang (LLVM option parsing): for the -hwasan-mapping-offset option: '' value invalid for uint argument! > | scripts/Makefile.build:273: recipe for target 'scripts/mod/empty.o' failed > | make[1]: *** [scripts/mod/empty.o] Error 1 > | Makefile:1123: recipe for target 'prepare0' failed > | make: *** [prepare0] Error 2 > > ... since Makefile.kasan only consumes CONFIG_KASAN_SHADOW_OFFSET when > CONFIG_KASAN_GENERIC is selected, and for CONFIG_KASAN_SW_TAGS it consumes > KASAN_SHADOW_OFFSET (without a CONFIG_ prefix). > > For the moment, let's always propagate CONFIG_KASAN_SHADOW_OFFSET into > KASAN_SHADOW_OFFSET via the arm64 Makefile. We can clean up the generic kasan > Makefile later down the line. > > Fixes: 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Steve Capper <steve.capper@arm.com> > Cc: Will Deacon <will@kernel.org> > --- > arch/arm64/Makefile | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > index a8d2a241ac58..a0c733f93b5b 100644 > --- a/arch/arm64/Makefile > +++ b/arch/arm64/Makefile > @@ -126,6 +126,8 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > +KASAN_SHADOW_OFFSET := $(CONFIG_KASAN_SHADOW_OFFSET) This needs a comment explaining what it's doing and that it's a dirty, temporary hack. Will
On Wed, Aug 14, 2019 at 04:57:11PM +0100, Will Deacon wrote: > On Wed, Aug 14, 2019 at 04:20:18PM +0100, Mark Rutland wrote: > > On Wed, Aug 07, 2019 at 04:55:15PM +0100, Steve Capper wrote: > > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > > > index b2400f9c1213..2b7db0d41498 100644 > > > --- a/arch/arm64/Makefile > > > +++ b/arch/arm64/Makefile > > > @@ -126,14 +126,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > > > -# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) > > > -# - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) > > > -# in 32-bit arithmetic > > > -KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ > > > - (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 1 - 32))) \ > > > - + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ > > > - - (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) ) > > > - > > > export TEXT_OFFSET GZFLAGS > > > > > > core-y += arch/arm64/kernel/ arch/arm64/mm/ > > > > I've just spotted this breaks build using CONFIG_KASAN_SW_TAGS && > > CONFIG_KASAN_INLINE, as scripts/Makefile.kasan only propagates > > CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET when > > CONFIG_KASAN_GENERIC is selected, but consumes KASAN_SHADOW_OFFSET > > regardless. > > > > I think that's by accident rather than by design, but to > > minimize/localize the fixup, how about the below? I can send a cleanup > > patch for scripts/Makefile.kasan later. > > How much work is that? I've dropped this stuff from -next for now, so we > have time to fix it properly as long as it's not going to take weeks. I wrote it first, so no effort; patch below. Andrey, would you be happy with this? Thanks, Mark. ---->8---- From ecdf60051a850f817d98f84ae9011afa2311b8f1 Mon Sep 17 00:00:00 2001 From: Mark Rutland <mark.rutland@arm.com> Date: Wed, 14 Aug 2019 15:31:57 +0100 Subject: [PATCH] kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE The generic Makefile.kasan propagates CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET, but only does so for CONFIG_KASAN_GENERIC. Since commit: 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") ... arm64 defines CONFIG_KASAN_SHADOW_OFFSET in Kconfig rather than defining KASAN_SHADOW_OFFSET in a Makefile. Thus, if CONFIG_KASAN_SW_TAGS && KASAN_INLINE are selected, we get build time splats due to KASAN_SHADOW_OFFSET not being set: | [mark@lakrids:~/src/linux]% usellvm 8.0.1 usekorg 8.1.0 make ARCH=arm64 CROSS_COMPILE=aarch64-linux- CC=clang | scripts/kconfig/conf --syncconfig Kconfig | CC scripts/mod/empty.o | clang (LLVM option parsing): for the -hwasan-mapping-offset option: '' value invalid for uint argument! | scripts/Makefile.build:273: recipe for target 'scripts/mod/empty.o' failed | make[1]: *** [scripts/mod/empty.o] Error 1 | Makefile:1123: recipe for target 'prepare0' failed | make: *** [prepare0] Error 2 Let's fix this by always propagating CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET if CONFIG_KASAN is selected, moving the existing common definition of +CFLAGS_KASAN_NOSANITIZE to the top of Makefile.kasan. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Steve Capper <steve.capper@arm.com> Cc: Will Deacon <will@kernel.org> --- scripts/Makefile.kasan | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan index 6410bd22fe38..03757cc60e06 100644 --- a/scripts/Makefile.kasan +++ b/scripts/Makefile.kasan @@ -1,4 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 +ifdef CONFIG_KASAN +CFLAGS_KASAN_NOSANITIZE := -fno-builtin +KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) +endif + ifdef CONFIG_KASAN_GENERIC ifdef CONFIG_KASAN_INLINE @@ -7,8 +12,6 @@ else call_threshold := 0 endif -KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) - CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1))) @@ -45,7 +48,3 @@ CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ $(instrumentation_flags) endif # CONFIG_KASAN_SW_TAGS - -ifdef CONFIG_KASAN -CFLAGS_KASAN_NOSANITIZE := -fno-builtin -endif
On Wed, Aug 14, 2019 at 04:20:18PM +0100, Mark Rutland wrote: > Hi Steve, > Hi Mark, > On Wed, Aug 07, 2019 at 04:55:15PM +0100, Steve Capper wrote: > > +config KASAN_SHADOW_OFFSET > > + hex > > + depends on KASAN > > + default 0xdfffa00000000000 if (ARM64_VA_BITS_48 || ARM64_USER_VA_BITS_52) && !KASAN_SW_TAGS > > + default 0xdfffd00000000000 if ARM64_VA_BITS_47 && !KASAN_SW_TAGS > > + default 0xdffffe8000000000 if ARM64_VA_BITS_42 && !KASAN_SW_TAGS > > + default 0xdfffffd000000000 if ARM64_VA_BITS_39 && !KASAN_SW_TAGS > > + default 0xdffffffa00000000 if ARM64_VA_BITS_36 && !KASAN_SW_TAGS > > + default 0xefff900000000000 if (ARM64_VA_BITS_48 || ARM64_USER_VA_BITS_52) && KASAN_SW_TAGS > > + default 0xefffc80000000000 if ARM64_VA_BITS_47 && KASAN_SW_TAGS > > + default 0xeffffe4000000000 if ARM64_VA_BITS_42 && KASAN_SW_TAGS > > + default 0xefffffc800000000 if ARM64_VA_BITS_39 && KASAN_SW_TAGS > > + default 0xeffffff900000000 if ARM64_VA_BITS_36 && KASAN_SW_TAGS > > + default 0xffffffffffffffff > > + > > source "arch/arm64/Kconfig.platforms" > > > > menu "Kernel Features" > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > > index b2400f9c1213..2b7db0d41498 100644 > > --- a/arch/arm64/Makefile > > +++ b/arch/arm64/Makefile > > @@ -126,14 +126,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > -# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) > > -# - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) > > -# in 32-bit arithmetic > > -KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ > > - (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 1 - 32))) \ > > - + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ > > - - (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) ) > > - > > export TEXT_OFFSET GZFLAGS > > > > core-y += arch/arm64/kernel/ arch/arm64/mm/ > > I've just spotted this breaks build using CONFIG_KASAN_SW_TAGS && > CONFIG_KASAN_INLINE, as scripts/Makefile.kasan only propagates > CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET when > CONFIG_KASAN_GENERIC is selected, but consumes KASAN_SHADOW_OFFSET > regardless. > > I think that's by accident rather than by design, but to > minimize/localize the fixup, how about the below? I can send a cleanup > patch for scripts/Makefile.kasan later. > > Build and boot tested with CONFIG_KASAN_{SW_TAGS,GENERIC} and > VA_BITS_52 (on a 48-bit VA system). > I've tested this with VA_BITS_52 (booted with 52-bit) with inline SW_TAGS and generic KASAN. FWIW: Tested-by: Steve Capper <steve.capper@arm.com> Reviewed-by: Steve Capper <steve.capper@arm.com> Agreed for this small fix now and a bigger fix in Makefile.kasan later. Cheers,
On Wed, Aug 14, 2019 at 05:07:15PM +0100, Steve Capper wrote: > On Wed, Aug 14, 2019 at 04:20:18PM +0100, Mark Rutland wrote: > > Hi Steve, > > > > Hi Mark, > > > On Wed, Aug 07, 2019 at 04:55:15PM +0100, Steve Capper wrote: > > > +config KASAN_SHADOW_OFFSET > > > + hex > > > + depends on KASAN > > > + default 0xdfffa00000000000 if (ARM64_VA_BITS_48 || ARM64_USER_VA_BITS_52) && !KASAN_SW_TAGS > > > + default 0xdfffd00000000000 if ARM64_VA_BITS_47 && !KASAN_SW_TAGS > > > + default 0xdffffe8000000000 if ARM64_VA_BITS_42 && !KASAN_SW_TAGS > > > + default 0xdfffffd000000000 if ARM64_VA_BITS_39 && !KASAN_SW_TAGS > > > + default 0xdffffffa00000000 if ARM64_VA_BITS_36 && !KASAN_SW_TAGS > > > + default 0xefff900000000000 if (ARM64_VA_BITS_48 || ARM64_USER_VA_BITS_52) && KASAN_SW_TAGS > > > + default 0xefffc80000000000 if ARM64_VA_BITS_47 && KASAN_SW_TAGS > > > + default 0xeffffe4000000000 if ARM64_VA_BITS_42 && KASAN_SW_TAGS > > > + default 0xefffffc800000000 if ARM64_VA_BITS_39 && KASAN_SW_TAGS > > > + default 0xeffffff900000000 if ARM64_VA_BITS_36 && KASAN_SW_TAGS > > > + default 0xffffffffffffffff > > > + > > > source "arch/arm64/Kconfig.platforms" > > > > > > menu "Kernel Features" > > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > > > index b2400f9c1213..2b7db0d41498 100644 > > > --- a/arch/arm64/Makefile > > > +++ b/arch/arm64/Makefile > > > @@ -126,14 +126,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > > > -# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) > > > -# - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) > > > -# in 32-bit arithmetic > > > -KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ > > > - (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 1 - 32))) \ > > > - + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ > > > - - (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) ) > > > - > > > export TEXT_OFFSET GZFLAGS > > > > > > core-y += arch/arm64/kernel/ arch/arm64/mm/ > > > > I've just spotted this breaks build using CONFIG_KASAN_SW_TAGS && > > CONFIG_KASAN_INLINE, as scripts/Makefile.kasan only propagates > > CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET when > > CONFIG_KASAN_GENERIC is selected, but consumes KASAN_SHADOW_OFFSET > > regardless. > > > > I think that's by accident rather than by design, but to > > minimize/localize the fixup, how about the below? I can send a cleanup > > patch for scripts/Makefile.kasan later. > > > > Build and boot tested with CONFIG_KASAN_{SW_TAGS,GENERIC} and > > VA_BITS_52 (on a 48-bit VA system). > > > > I've tested this with VA_BITS_52 (booted with 52-bit) with inline > SW_TAGS and generic KASAN. > > FWIW: > Tested-by: Steve Capper <steve.capper@arm.com> > Reviewed-by: Steve Capper <steve.capper@arm.com> > > Agreed for this small fix now and a bigger fix in Makefile.kasan later. > Apologies for the noise, I didn't notice the thread progress as I was testing. Will test the improved patch :-). Cheers,
On Wed, Aug 14, 2019 at 05:03:24PM +0100, Mark Rutland wrote: > On Wed, Aug 14, 2019 at 04:57:11PM +0100, Will Deacon wrote: > > On Wed, Aug 14, 2019 at 04:20:18PM +0100, Mark Rutland wrote: > > > On Wed, Aug 07, 2019 at 04:55:15PM +0100, Steve Capper wrote: > > > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > > > > index b2400f9c1213..2b7db0d41498 100644 > > > > --- a/arch/arm64/Makefile > > > > +++ b/arch/arm64/Makefile > > > > @@ -126,14 +126,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > > > > > -# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) > > > > -# - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) > > > > -# in 32-bit arithmetic > > > > -KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ > > > > - (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 1 - 32))) \ > > > > - + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ > > > > - - (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) ) > > > > - > > > > export TEXT_OFFSET GZFLAGS > > > > > > > > core-y += arch/arm64/kernel/ arch/arm64/mm/ > > > > > > I've just spotted this breaks build using CONFIG_KASAN_SW_TAGS && > > > CONFIG_KASAN_INLINE, as scripts/Makefile.kasan only propagates > > > CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET when > > > CONFIG_KASAN_GENERIC is selected, but consumes KASAN_SHADOW_OFFSET > > > regardless. > > > > > > I think that's by accident rather than by design, but to > > > minimize/localize the fixup, how about the below? I can send a cleanup > > > patch for scripts/Makefile.kasan later. > > > > How much work is that? I've dropped this stuff from -next for now, so we > > have time to fix it properly as long as it's not going to take weeks. > > I wrote it first, so no effort; patch below. > > Andrey, would you be happy with this? > > Thanks, > Mark. FWIW, this one worked well for me too (52-bit VA runtime, SW TAGS + GENERIC both inlined). Tested-by: Steve Capper <steve.capper@arm.com> Cheers,
[+more kasan people and the kasan-dev list] On Wed, Aug 14, 2019 at 05:03:24PM +0100, Mark Rutland wrote: > On Wed, Aug 14, 2019 at 04:57:11PM +0100, Will Deacon wrote: > > On Wed, Aug 14, 2019 at 04:20:18PM +0100, Mark Rutland wrote: > > > On Wed, Aug 07, 2019 at 04:55:15PM +0100, Steve Capper wrote: > > > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > > > > index b2400f9c1213..2b7db0d41498 100644 > > > > --- a/arch/arm64/Makefile > > > > +++ b/arch/arm64/Makefile > > > > @@ -126,14 +126,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > > > > > -# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) > > > > -# - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) > > > > -# in 32-bit arithmetic > > > > -KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ > > > > - (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 1 - 32))) \ > > > > - + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ > > > > - - (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) ) > > > > - > > > > export TEXT_OFFSET GZFLAGS > > > > > > > > core-y += arch/arm64/kernel/ arch/arm64/mm/ > > > > > > I've just spotted this breaks build using CONFIG_KASAN_SW_TAGS && > > > CONFIG_KASAN_INLINE, as scripts/Makefile.kasan only propagates > > > CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET when > > > CONFIG_KASAN_GENERIC is selected, but consumes KASAN_SHADOW_OFFSET > > > regardless. > > > > > > I think that's by accident rather than by design, but to > > > minimize/localize the fixup, how about the below? I can send a cleanup > > > patch for scripts/Makefile.kasan later. > > > > How much work is that? I've dropped this stuff from -next for now, so we > > have time to fix it properly as long as it's not going to take weeks. > > I wrote it first, so no effort; patch below. The patch looks fine to me, but I'd like an Ack from one of the KASAN folks before I queue this via the arm64 tree (where support for 52-bit virtual addressing in the kernel [1] depends on this being fixed). Patch is quoted below. Please can somebody take a look? Thanks, Will [1] https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=for-next/52-bit-kva > From ecdf60051a850f817d98f84ae9011afa2311b8f1 Mon Sep 17 00:00:00 2001 > From: Mark Rutland <mark.rutland@arm.com> > Date: Wed, 14 Aug 2019 15:31:57 +0100 > Subject: [PATCH] kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE > > The generic Makefile.kasan propagates CONFIG_KASAN_SHADOW_OFFSET into > KASAN_SHADOW_OFFSET, but only does so for CONFIG_KASAN_GENERIC. > > Since commit: > > 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") > > ... arm64 defines CONFIG_KASAN_SHADOW_OFFSET in Kconfig rather than > defining KASAN_SHADOW_OFFSET in a Makefile. Thus, if > CONFIG_KASAN_SW_TAGS && KASAN_INLINE are selected, we get build time > splats due to KASAN_SHADOW_OFFSET not being set: > > | [mark@lakrids:~/src/linux]% usellvm 8.0.1 usekorg 8.1.0 make ARCH=arm64 CROSS_COMPILE=aarch64-linux- CC=clang > | scripts/kconfig/conf --syncconfig Kconfig > | CC scripts/mod/empty.o > | clang (LLVM option parsing): for the -hwasan-mapping-offset option: '' value invalid for uint argument! > | scripts/Makefile.build:273: recipe for target 'scripts/mod/empty.o' failed > | make[1]: *** [scripts/mod/empty.o] Error 1 > | Makefile:1123: recipe for target 'prepare0' failed > | make: *** [prepare0] Error 2 > > Let's fix this by always propagating CONFIG_KASAN_SHADOW_OFFSET into > KASAN_SHADOW_OFFSET if CONFIG_KASAN is selected, moving the existing > common definition of +CFLAGS_KASAN_NOSANITIZE to the top of > Makefile.kasan. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Steve Capper <steve.capper@arm.com> > Cc: Will Deacon <will@kernel.org> > --- > scripts/Makefile.kasan | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan > index 6410bd22fe38..03757cc60e06 100644 > --- a/scripts/Makefile.kasan > +++ b/scripts/Makefile.kasan > @@ -1,4 +1,9 @@ > # SPDX-License-Identifier: GPL-2.0 > +ifdef CONFIG_KASAN > +CFLAGS_KASAN_NOSANITIZE := -fno-builtin > +KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) > +endif > + > ifdef CONFIG_KASAN_GENERIC > > ifdef CONFIG_KASAN_INLINE > @@ -7,8 +12,6 @@ else > call_threshold := 0 > endif > > -KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) > - > CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address > > cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1))) > @@ -45,7 +48,3 @@ CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ > $(instrumentation_flags) > > endif # CONFIG_KASAN_SW_TAGS > - > -ifdef CONFIG_KASAN > -CFLAGS_KASAN_NOSANITIZE := -fno-builtin > -endif > -- > 2.11.0 >
On 8/15/19 3:09 PM, Will Deacon wrote: > On Wed, Aug 14, 2019 at 05:03:24PM +0100, Mark Rutland wrote: >> From ecdf60051a850f817d98f84ae9011afa2311b8f1 Mon Sep 17 00:00:00 2001 >> From: Mark Rutland <mark.rutland@arm.com> >> Date: Wed, 14 Aug 2019 15:31:57 +0100 >> Subject: [PATCH] kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE >> >> The generic Makefile.kasan propagates CONFIG_KASAN_SHADOW_OFFSET into >> KASAN_SHADOW_OFFSET, but only does so for CONFIG_KASAN_GENERIC. >> >> Since commit: >> >> 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") >> >> ... arm64 defines CONFIG_KASAN_SHADOW_OFFSET in Kconfig rather than >> defining KASAN_SHADOW_OFFSET in a Makefile. Thus, if >> CONFIG_KASAN_SW_TAGS && KASAN_INLINE are selected, we get build time >> splats due to KASAN_SHADOW_OFFSET not being set: >> >> | [mark@lakrids:~/src/linux]% usellvm 8.0.1 usekorg 8.1.0 make ARCH=arm64 CROSS_COMPILE=aarch64-linux- CC=clang >> | scripts/kconfig/conf --syncconfig Kconfig >> | CC scripts/mod/empty.o >> | clang (LLVM option parsing): for the -hwasan-mapping-offset option: '' value invalid for uint argument! >> | scripts/Makefile.build:273: recipe for target 'scripts/mod/empty.o' failed >> | make[1]: *** [scripts/mod/empty.o] Error 1 >> | Makefile:1123: recipe for target 'prepare0' failed >> | make: *** [prepare0] Error 2 >> >> Let's fix this by always propagating CONFIG_KASAN_SHADOW_OFFSET into >> KASAN_SHADOW_OFFSET if CONFIG_KASAN is selected, moving the existing >> common definition of +CFLAGS_KASAN_NOSANITIZE to the top of >> Makefile.kasan. >> >> Signed-off-by: Mark Rutland <mark.rutland@arm.com> >> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>>> Cc: Catalin Marinas <catalin.marinas@arm.com> >> Cc: Steve Capper <steve.capper@arm.com> >> Cc: Will Deacon <will@kernel.org> >> --- Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
On Thu, Aug 15, 2019 at 03:21:48PM +0300, Andrey Ryabinin wrote: > On 8/15/19 3:09 PM, Will Deacon wrote: > > > On Wed, Aug 14, 2019 at 05:03:24PM +0100, Mark Rutland wrote: > >> From ecdf60051a850f817d98f84ae9011afa2311b8f1 Mon Sep 17 00:00:00 2001 > >> From: Mark Rutland <mark.rutland@arm.com> > >> Date: Wed, 14 Aug 2019 15:31:57 +0100 > >> Subject: [PATCH] kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE > >> > >> The generic Makefile.kasan propagates CONFIG_KASAN_SHADOW_OFFSET into > >> KASAN_SHADOW_OFFSET, but only does so for CONFIG_KASAN_GENERIC. > >> > >> Since commit: > >> > >> 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") > >> > >> ... arm64 defines CONFIG_KASAN_SHADOW_OFFSET in Kconfig rather than > >> defining KASAN_SHADOW_OFFSET in a Makefile. Thus, if > >> CONFIG_KASAN_SW_TAGS && KASAN_INLINE are selected, we get build time > >> splats due to KASAN_SHADOW_OFFSET not being set: > >> > >> | [mark@lakrids:~/src/linux]% usellvm 8.0.1 usekorg 8.1.0 make ARCH=arm64 CROSS_COMPILE=aarch64-linux- CC=clang > >> | scripts/kconfig/conf --syncconfig Kconfig > >> | CC scripts/mod/empty.o > >> | clang (LLVM option parsing): for the -hwasan-mapping-offset option: '' value invalid for uint argument! > >> | scripts/Makefile.build:273: recipe for target 'scripts/mod/empty.o' failed > >> | make[1]: *** [scripts/mod/empty.o] Error 1 > >> | Makefile:1123: recipe for target 'prepare0' failed > >> | make: *** [prepare0] Error 2 > >> > >> Let's fix this by always propagating CONFIG_KASAN_SHADOW_OFFSET into > >> KASAN_SHADOW_OFFSET if CONFIG_KASAN is selected, moving the existing > >> common definition of +CFLAGS_KASAN_NOSANITIZE to the top of > >> Makefile.kasan. > >> > >> Signed-off-by: Mark Rutland <mark.rutland@arm.com> > >> Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>>> Cc: Catalin Marinas <catalin.marinas@arm.com> > >> Cc: Steve Capper <steve.capper@arm.com> > >> Cc: Will Deacon <will@kernel.org> > >> --- > > > Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com> Thanks, Andrey! Will
On Thu, Aug 15, 2019 at 5:39 PM Will Deacon <will@kernel.org> wrote: > > [+more kasan people and the kasan-dev list] > > On Wed, Aug 14, 2019 at 05:03:24PM +0100, Mark Rutland wrote: > > On Wed, Aug 14, 2019 at 04:57:11PM +0100, Will Deacon wrote: > > > On Wed, Aug 14, 2019 at 04:20:18PM +0100, Mark Rutland wrote: > > > > On Wed, Aug 07, 2019 at 04:55:15PM +0100, Steve Capper wrote: > > > > > diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile > > > > > index b2400f9c1213..2b7db0d41498 100644 > > > > > --- a/arch/arm64/Makefile > > > > > +++ b/arch/arm64/Makefile > > > > > @@ -126,14 +126,6 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > > KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > > KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) > > > > > > > > > > -# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - KASAN_SHADOW_SCALE_SHIFT)) > > > > > -# - (1 << (64 - KASAN_SHADOW_SCALE_SHIFT)) > > > > > -# in 32-bit arithmetic > > > > > -KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \ > > > > > - (0xffffffff & (-1 << ($(CONFIG_ARM64_VA_BITS) - 1 - 32))) \ > > > > > - + (1 << ($(CONFIG_ARM64_VA_BITS) - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) \ > > > > > - - (1 << (64 - 32 - $(KASAN_SHADOW_SCALE_SHIFT))) )) ) > > > > > - > > > > > export TEXT_OFFSET GZFLAGS > > > > > > > > > > core-y += arch/arm64/kernel/ arch/arm64/mm/ > > > > > > > > I've just spotted this breaks build using CONFIG_KASAN_SW_TAGS && > > > > CONFIG_KASAN_INLINE, as scripts/Makefile.kasan only propagates > > > > CONFIG_KASAN_SHADOW_OFFSET into KASAN_SHADOW_OFFSET when > > > > CONFIG_KASAN_GENERIC is selected, but consumes KASAN_SHADOW_OFFSET > > > > regardless. > > > > > > > > I think that's by accident rather than by design, but to > > > > minimize/localize the fixup, how about the below? I can send a cleanup > > > > patch for scripts/Makefile.kasan later. > > > > > > How much work is that? I've dropped this stuff from -next for now, so we > > > have time to fix it properly as long as it's not going to take weeks. > > > > I wrote it first, so no effort; patch below. > > The patch looks fine to me, but I'd like an Ack from one of the KASAN > folks before I queue this via the arm64 tree (where support for 52-bit > virtual addressing in the kernel [1] depends on this being fixed). > > Patch is quoted below. Please can somebody take a look? I tested this on my hpe and apm arm64 hardware boxes and the issue I reported via <http://lists.infradead.org/pipermail/linux-arm-kernel/2019-August/673424.html> seem fixed, so: Tested-by: Bhupesh Sharma <bhsharma@redhat.com> Thanks, Bhupesh > [1] https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=for-next/52-bit-kva > > > From ecdf60051a850f817d98f84ae9011afa2311b8f1 Mon Sep 17 00:00:00 2001 > > From: Mark Rutland <mark.rutland@arm.com> > > Date: Wed, 14 Aug 2019 15:31:57 +0100 > > Subject: [PATCH] kasan/arm64: fix CONFIG_KASAN_SW_TAGS && KASAN_INLINE > > > > The generic Makefile.kasan propagates CONFIG_KASAN_SHADOW_OFFSET into > > KASAN_SHADOW_OFFSET, but only does so for CONFIG_KASAN_GENERIC. > > > > Since commit: > > > > 6bd1d0be0e97936d ("arm64: kasan: Switch to using KASAN_SHADOW_OFFSET") > > > > ... arm64 defines CONFIG_KASAN_SHADOW_OFFSET in Kconfig rather than > > defining KASAN_SHADOW_OFFSET in a Makefile. Thus, if > > CONFIG_KASAN_SW_TAGS && KASAN_INLINE are selected, we get build time > > splats due to KASAN_SHADOW_OFFSET not being set: > > > > | [mark@lakrids:~/src/linux]% usellvm 8.0.1 usekorg 8.1.0 make ARCH=arm64 CROSS_COMPILE=aarch64-linux- CC=clang > > | scripts/kconfig/conf --syncconfig Kconfig > > | CC scripts/mod/empty.o > > | clang (LLVM option parsing): for the -hwasan-mapping-offset option: '' value invalid for uint argument! > > | scripts/Makefile.build:273: recipe for target 'scripts/mod/empty.o' failed > > | make[1]: *** [scripts/mod/empty.o] Error 1 > > | Makefile:1123: recipe for target 'prepare0' failed > > | make: *** [prepare0] Error 2 > > > > Let's fix this by always propagating CONFIG_KASAN_SHADOW_OFFSET into > > KASAN_SHADOW_OFFSET if CONFIG_KASAN is selected, moving the existing > > common definition of +CFLAGS_KASAN_NOSANITIZE to the top of > > Makefile.kasan. > > > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > > Cc: Andrey Ryabinin <aryabinin@virtuozzo.com> > > Cc: Catalin Marinas <catalin.marinas@arm.com> > > Cc: Steve Capper <steve.capper@arm.com> > > Cc: Will Deacon <will@kernel.org> > > --- > > scripts/Makefile.kasan | 11 +++++------ > > 1 file changed, 5 insertions(+), 6 deletions(-) > > > > diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan > > index 6410bd22fe38..03757cc60e06 100644 > > --- a/scripts/Makefile.kasan > > +++ b/scripts/Makefile.kasan > > @@ -1,4 +1,9 @@ > > # SPDX-License-Identifier: GPL-2.0 > > +ifdef CONFIG_KASAN > > +CFLAGS_KASAN_NOSANITIZE := -fno-builtin > > +KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) > > +endif > > + > > ifdef CONFIG_KASAN_GENERIC > > > > ifdef CONFIG_KASAN_INLINE > > @@ -7,8 +12,6 @@ else > > call_threshold := 0 > > endif > > > > -KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET) > > - > > CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address > > > > cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1))) > > @@ -45,7 +48,3 @@ CFLAGS_KASAN := -fsanitize=kernel-hwaddress \ > > $(instrumentation_flags) > > > > endif # CONFIG_KASAN_SW_TAGS > > - > > -ifdef CONFIG_KASAN > > -CFLAGS_KASAN_NOSANITIZE := -fno-builtin > > -endif > > -- > > 2.11.0 > >
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index a8d2a241ac58..a0c733f93b5b 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -126,6 +126,8 @@ KBUILD_CFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) KBUILD_CPPFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) KBUILD_AFLAGS += -DKASAN_SHADOW_SCALE_SHIFT=$(KASAN_SHADOW_SCALE_SHIFT) +KASAN_SHADOW_OFFSET := $(CONFIG_KASAN_SHADOW_OFFSET) + export TEXT_OFFSET GZFLAGS core-y += arch/arm64/kernel/ arch/arm64/mm/