Skip to content

Commit bece04b

Browse files
melvertorvalds
authored andcommitted
kcov: fix generic Kconfig dependencies if ARCH_WANTS_NO_INSTR
Until recent versions of GCC and Clang, it was not possible to disable KCOV instrumentation via a function attribute. The relevant function attribute was introduced in 540540d ("kcov: add __no_sanitize_coverage to fix noinstr for all architectures"). x86 was the first architecture to want a working noinstr, and at the time no compiler support for the attribute existed yet. Therefore, commit 0f1441b ("objtool: Fix noinstr vs KCOV") introduced the ability to NOP __sanitizer_cov_*() calls in .noinstr.text. However, this doesn't work for other architectures like arm64 and s390 that want a working noinstr per ARCH_WANTS_NO_INSTR. At the time of 0f1441b, we didn't yet have ARCH_WANTS_NO_INSTR, but now we can move the Kconfig dependency checks to the generic KCOV option. KCOV will be available if: - architecture does not care about noinstr, OR - we have objtool support (like on x86), OR - GCC is 12.0 or newer, OR - Clang is 13.0 or newer. Link: https://lkml.kernel.org/r/20211201152604.3984495-1-elver@google.com Signed-off-by: Marco Elver <elver@google.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent bbd2e05 commit bece04b

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

arch/x86/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ config X86
7878
select ARCH_HAS_FILTER_PGPROT
7979
select ARCH_HAS_FORTIFY_SOURCE
8080
select ARCH_HAS_GCOV_PROFILE_ALL
81-
select ARCH_HAS_KCOV if X86_64 && STACK_VALIDATION
81+
select ARCH_HAS_KCOV if X86_64
8282
select ARCH_HAS_MEM_ENCRYPT
8383
select ARCH_HAS_MEMBARRIER_SYNC_CORE
8484
select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

lib/Kconfig.debug

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,6 +1979,8 @@ config KCOV
19791979
bool "Code coverage for fuzzing"
19801980
depends on ARCH_HAS_KCOV
19811981
depends on CC_HAS_SANCOV_TRACE_PC || GCC_PLUGINS
1982+
depends on !ARCH_WANTS_NO_INSTR || STACK_VALIDATION || \
1983+
GCC_VERSION >= 120000 || CLANG_VERSION >= 130000
19821984
select DEBUG_FS
19831985
select GCC_PLUGIN_SANCOV if !CC_HAS_SANCOV_TRACE_PC
19841986
help

0 commit comments

Comments
 (0)