From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752750AbcFNQ5a (ORCPT ); Tue, 14 Jun 2016 12:57:30 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35396 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751388AbcFNQ53 (ORCPT ); Tue, 14 Jun 2016 12:57:29 -0400 From: Alexander Potapenko To: dvyukov@google.com, catalin.marinas@arm.com, quentin.casasnovas@oracle.com, will.deacon@arm.com, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, christoffer.dall@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, syzkaller@googlegroups.com, kcc@google.com, akpm@linux-foundation.org Subject: [PATCH v2] arm64: allow building with kcov coverage on ARM64 Date: Tue, 14 Jun 2016 18:57:21 +0200 Message-Id: <1465923441-107596-1-git-send-email-glider@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add ARCH_HAS_KCOV to ARM64 config. To avoid crashes, disable instrumentation of the following files: arch/arm64/boot/* arch/arm64/kvm/hyp/* Signed-off-by: Alexander Potapenko --- v2: - disable instrumentation of arch/arm64/{boot,kvm/hyp} - enable instrumentation of arch/arm64/lib/delay.c --- arch/arm64/Kconfig | 1 + arch/arm64/boot/Makefile | 4 ++++ arch/arm64/kvm/hyp/Makefile | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 5a0a691..eb0b0a0 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -7,6 +7,7 @@ config ARM64 select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_GCOV_PROFILE_ALL + select ARCH_HAS_KCOV select ARCH_HAS_SG_CHAIN select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_USE_CMPXCHG_LOCKREF diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index 305c552..74cec89 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -14,6 +14,10 @@ # Based on the ia64 boot/Makefile. # +# Avoid potential boot-time problems with kcov instrumentation. We are mostly +# interested in syscall coverage, so boot code is not interesting anyway. +KCOV_INSTRUMENT := n + targets := Image Image.gz $(obj)/Image: vmlinux FORCE diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 778d0ef..0c85feb 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -17,6 +17,10 @@ obj-$(CONFIG_KVM_ARM_HOST) += tlb.o obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o +# KVM code is run at a different exception code with a different map, so +# compiler instrumentation that inserts callbacks or checks into the code may +# cause crashes. Just disable it. GCOV_PROFILE := n KASAN_SANITIZE := n UBSAN_SANITIZE := n +KCOV_INSTRUMENT := n -- 2.8.0.rc3.226.g39d4020