| Message ID | 1431698344-28054-2-git-send-email-a.ryabinin@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 2015-05-15 at 16:59 +0300, Andrey Ryabinin wrote: > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > +config KASAN_SHADOW_OFFSET > + hex > + default 0xdffffc0000000000 This sets CONFIG_KASAN_SHADOW_OFFSET for _all_ X86 configurations, doesn't it? > --- a/lib/Kconfig.kasan > +++ b/lib/Kconfig.kasan > -config KASAN_SHADOW_OFFSET > - hex > - default 0xdffffc0000000000 if X86_64 While here it used to depend, at least, on HAVE_ARCH_KASAN. But grepping the tree shows the two places where CONFIG_KASAN_SHADOW_OFFSET is currently used are guarded by #ifdef CONFIG_KASAN. So perhaps the default line should actually read default 0xdffffc0000000000 if KASAN after the move. Would that work? Paul Bolle
On 05/16/2015 02:27 PM, Paul Bolle wrote: > On Fri, 2015-05-15 at 16:59 +0300, Andrey Ryabinin wrote: >> --- a/arch/x86/Kconfig >> +++ b/arch/x86/Kconfig > >> +config KASAN_SHADOW_OFFSET >> + hex >> + default 0xdffffc0000000000 > > This sets CONFIG_KASAN_SHADOW_OFFSET for _all_ X86 configurations, > doesn't it? > Right. >> --- a/lib/Kconfig.kasan >> +++ b/lib/Kconfig.kasan > >> -config KASAN_SHADOW_OFFSET >> - hex >> - default 0xdffffc0000000000 if X86_64 > > While here it used to depend, at least, on HAVE_ARCH_KASAN. But grepping > the tree shows the two places where CONFIG_KASAN_SHADOW_OFFSET is > currently used are guarded by #ifdef CONFIG_KASAN. So perhaps the > default line should actually read > default 0xdffffc0000000000 if KASAN > > after the move. Would that work? > Yes, but I would rather add "depends on KASAN". > > Paul Bolle > >
On Mon, 2015-05-18 at 10:43 +0300, Andrey Ryabinin wrote: > On 05/16/2015 02:27 PM, Paul Bolle wrote: > > So perhaps the > > default line should actually read > > default 0xdffffc0000000000 if KASAN > > > > after the move. Would that work? > > Yes, but I would rather add "depends on KASAN". That would have the same effect, as far as I can see, so if adding "depends on KASAN" works for you that's fine with me too. Thanks, Paul Bolle
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c92fdcc..b530967 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -251,6 +251,10 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING config ARCH_SUPPORTS_DEBUG_PAGEALLOC def_bool y +config KASAN_SHADOW_OFFSET + hex + default 0xdffffc0000000000 + config HAVE_INTEL_TXT def_bool y depends on INTEL_IOMMU && ACPI diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 777eda7..39f24d6 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -18,10 +18,6 @@ config KASAN For better error detection enable CONFIG_STACKTRACE, and add slub_debug=U to boot cmdline. -config KASAN_SHADOW_OFFSET - hex - default 0xdffffc0000000000 if X86_64 - choice prompt "Instrumentation type" depends on KASAN
KASAN_SHADOW_OFFSET is purely arch specific setting, so it should be in arch's Kconfig file. This simplifies porting KASan to other architectures and maintenance of it. Signed-off-by: Andrey Ryabinin <a.ryabinin@samsung.com> --- arch/x86/Kconfig | 4 ++++ lib/Kconfig.kasan | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)