From patchwork Tue Apr 12 16:34:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 65638 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2022118qge; Tue, 12 Apr 2016 09:34:27 -0700 (PDT) X-Received: by 10.66.166.78 with SMTP id ze14mr5843689pab.149.1460478867787; Tue, 12 Apr 2016 09:34:27 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lm4si11102774pab.191.2016.04.12.09.34.27; Tue, 12 Apr 2016 09:34:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933265AbcDLQe0 (ORCPT + 3 others); Tue, 12 Apr 2016 12:34:26 -0400 Received: from foss.arm.com ([217.140.101.70]:57078 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933334AbcDLQeZ (ORCPT ); Tue, 12 Apr 2016 12:34:25 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1646F28; Tue, 12 Apr 2016 09:33:11 -0700 (PDT) Received: from e104818-lin.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8D8773F25F; Tue, 12 Apr 2016 09:34:23 -0700 (PDT) From: Catalin Marinas To: Cc: Christoffer Dall , Marc Zyngier , Paolo Bonzini Subject: [PATCH for 4.5.x] kvm: arm64: Disable compiler instrumentation for hypervisor code Date: Tue, 12 Apr 2016 17:34:15 +0100 Message-Id: <1460478855-11004-1-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 2.1.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit a6cdf1c08cbfe0818a3d8042844d75bf74fd82bd upstream. With the recent rewrite of the arm64 KVM hypervisor code in C, enabling certain options like KASAN would allow the compiler to generate memory accesses or function calls to addresses not mapped at EL2. This patch disables the compiler instrumentation on the arm64 hypervisor code for gcov-based profiling (GCOV_KERNEL) and kernel address sanitizer (KASAN). Signed-off-by: Catalin Marinas Cc: Christoffer Dall Cc: Marc Zyngier Cc: Paolo Bonzini Cc: # 4.5+ Signed-off-by: Christoffer Dall Signed-off-by: Catalin Marinas --- The original commit upstream failed to apply on top of 4.5, so here's the back-port. arch/arm64/kvm/hyp/Makefile | 3 +++ 1 file changed, 3 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 826032bc3945..333374766c4b 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -12,3 +12,6 @@ obj-$(CONFIG_KVM_ARM_HOST) += switch.o obj-$(CONFIG_KVM_ARM_HOST) += fpsimd.o obj-$(CONFIG_KVM_ARM_HOST) += tlb.o obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o + +GCOV_PROFILE := n +KASAN_SANITIZE := n