From patchwork Wed Jun 15 09:55:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 9177975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7A0AF6021C for ; Wed, 15 Jun 2016 09:57:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67F7A27F48 for ; Wed, 15 Jun 2016 09:57:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5ACB1281FE; Wed, 15 Jun 2016 09:57:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0476D27F48 for ; Wed, 15 Jun 2016 09:57:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bD7Y7-0001eG-7j; Wed, 15 Jun 2016 09:55:51 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bD7Y5-0001YH-0f for linux-arm-kernel@lists.infradead.org; Wed, 15 Jun 2016 09:55:49 +0000 Received: by mail-wm0-x22e.google.com with SMTP id m124so27853724wme.1 for ; Wed, 15 Jun 2016 02:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=9qAzCgpgL7cqJC34zouZ527Pn3OIMjGZaR16ean3m3w=; b=H4lKAz8EwfL4TAAOL9qJnx8T6PtOrKXhuqwbZ16dVC+lK6TkRQ7AQ2upSQf1QhVvS/ gcoV5svweW96vF+tPOYSw8p7wLI4d0VVNQJS2SKKVBaFw4Gs/Q/uyBkZgRyn3PbONyth PA2DgOPTfqYB0yIZSPZwE2xTwvQh5Zr7WGlur8gVCY2AUE4rj1RKCvdgOtJ5l9xkKYu0 3JkxqT7VmhB/yFJaYklTtW8TevOALHbbZJ6ASkFO/HwNLRqv690V58YtXlSfJLX2EFCq G0iqbM4OAS0HUHWfcEvrHxCpwoqj9zj13gCwN6nkIaZhBZkvb5SzyCUNC+XPH6Cgd5Vx PjeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9qAzCgpgL7cqJC34zouZ527Pn3OIMjGZaR16ean3m3w=; b=NpgMeV2rlsvVSS+m0/XHGspT8FDt1FhUBgsStvkJMRqY/3N0cRW1hQLtX7EE6NFmSD Awd/zV8kDL5G4t95gMOlhXglHeQCI90Woxz1xLp43t3asrO6XQMLBpZGAx4L9FF4Vl1w gd/2jA9eSN8oLVplUchP2r6oQIanUPRyIsOcNtEPXZFRyDsVavIGAedVPYsDDi7sIJ95 EeuRyo2AFvC/yh/02BxDmcPVxYYjjgECNnWMuHnHuHqgqtaUB8G7/9SjSGGn03qblJw0 qyXNNBZyYc0wg2zbZ3TunvdfYm/e6rZ/6PzBCn4K4T4uLWB0Bcl77/jdVV+fR+bpEVRS tH/w== X-Gm-Message-State: ALyK8tKiRraIpCsXBFtvPPwg2JlSdnvlXZ7vanTjI1xJS8RPVTgcT6xRDO3UU9rqKpx5ftM1 X-Received: by 10.28.173.66 with SMTP id w63mr11226889wme.14.1465984526983; Wed, 15 Jun 2016 02:55:26 -0700 (PDT) Received: from glider0.muc.corp.google.com ([100.105.12.50]) by smtp.gmail.com with ESMTPSA id wb10sm37574885wjc.8.2016.06.15.02.55.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Jun 2016 02:55:25 -0700 (PDT) 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 Subject: [PATCH] arm64: allow building with kcov coverage on ARM64 Date: Wed, 15 Jun 2016 11:55:23 +0200 Message-Id: <1465984523-68478-1-git-send-email-glider@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160615_025549_213558_F12CA0B8 X-CRM114-Status: GOOD ( 11.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kcc@google.com, akpm@linux-foundation.org, syzkaller@googlegroups.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add ARCH_HAS_KCOV to ARM64 config. To avoid potential crashes, disable instrumentation of the files in arch/arm64/kvm/hyp/*. Signed-off-by: Alexander Potapenko Acked-by: Mark Rutland Acked-by: Marc Zyngier --- v3: - reverted arch/arm64/boot/Makefile, there's no code in that dir - added ack from Mark Rutland v2: - disable instrumentation of arch/arm64/{boot,kvm/hyp} - enable instrumentation of arch/arm64/lib/delay.c --- arch/arm64/Kconfig | 1 + arch/arm64/kvm/hyp/Makefile | 4 ++++ 2 files changed, 5 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/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