Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1297025ybt; Thu, 18 Jun 2020 05:31:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyh2bMYZFFRBsx5PGMB58JnjWRgMjpyMnmvcS4KboeFXNIKlxFZCbh2MClIkp22D4BlA3Lu X-Received: by 2002:a17:906:4b50:: with SMTP id j16mr3984059ejv.415.1592483507912; Thu, 18 Jun 2020 05:31:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592483507; cv=none; d=google.com; s=arc-20160816; b=ekVmsPBe+4UeveBE+hedpcJYFIHMIFqXWuRLS/9mrZZ5Xoy5e6b9MEJVW9OA5gL2cZ 2lqb/bGbxaDJ2chUknb7ScCN2cvV5we9kdjHygyUfkvum94ujR8xuNfJWf+fwFt83rnU O+kJgEebYpr8zay5Vh31kSg3CW2r2l9rN+VJ5Tbtpo6MnyOrW790Yce3c4c8OAOneICV rW1cdlk6rOCFv6SyIjSxLFR/s3a8S9HNEAl9sh/piyuwdQQUSHXeGePziC3nY84VO2Za 9YZQWjUmALfdzqURZ9CuDpoP0BTs9J+f5MkpSNVEu13Gfwu427USA7FNSnMdHXCcOT0Q JrSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9UqUeY7OXLgzhtG0HSCI0KGyw2fojhVrUyAizWtz3uQ=; b=OyJgzpwBY168KgauzZ9QWBjRGmHj/8JHBsjCigE8a3I95f7JhpFAHNMFJnn11TTLlU 4JwhpPPdiYVzw+I2WPsDraFZFRHCbnddiSkfhgatHv09cy32zcl3762/8+2ylFTA/5Mu n2WUSrIInshccBW6vn+q1oAmLSY4EFNFuBJaHPariY5bAZw3S5ZkxthUxkcmJppYj47H MVIHzDA7u4niCpIKzSUysGJSjIR9a4h6Z0upYlValhbj7NKMY2ZGwfSgAOv8EadleTTR 7336cu7J+P0dhudvfqiV2PFFEWQ88Px7fAN0X85fqEj4wwuo0aRL5X4H0nUUdcwjrkM/ Xmlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=lDL+1M12; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bi11si2071845edb.544.2020.06.18.05.31.24; Thu, 18 Jun 2020 05:31:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=lDL+1M12; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729436AbgFRM1r (ORCPT + 99 others); Thu, 18 Jun 2020 08:27:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728850AbgFRMZ7 (ORCPT ); Thu, 18 Jun 2020 08:25:59 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABB3AC0613EE for ; Thu, 18 Jun 2020 05:25:55 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id r7so5870187wro.1 for ; Thu, 18 Jun 2020 05:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9UqUeY7OXLgzhtG0HSCI0KGyw2fojhVrUyAizWtz3uQ=; b=lDL+1M12TpapBiE/BxxPn7H/Zdg//ebIYbJekkz1AV0ZryE1ikhGJ5S23TJI3xERzk 4VVo1NVYtqQQ9io/3n17rVZorxQ9hPbukspNmDlfaI201Arw7MDytSRjgsfWxCgQIjrO v5VNJRuIhv08aJGwKRn/Q74a80Gs0DKvQn0oa9bycdXCe5JH2D6sYktAaqxQC9rv+tma gnM9hF6A9VlmIvGMFAnurXHJedhdR2pEHgINA7A81uqJKqgzZgjRE4XVIzDOs+5YXMnC dyvhAbfkN+IHx2AactUh9w6/nvIPTHquaz6kXgqjknUS+4TILH16apm8+74uWp3+5oZ4 HzOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9UqUeY7OXLgzhtG0HSCI0KGyw2fojhVrUyAizWtz3uQ=; b=jn31CFFCR49wEwWRM+PnG98w9zPFh5tyxCY6toa6sIJPfS5cDeuNADS8yzU+E0mkTt vvv/B3xZPeQ8u2n6iGhwMRLthEzpPr+6iCw8yrHITtTxopQ8OnFg/koOTtRZ2CJJuMgl tiusxBgWerFWhRNURKMe+TSxm4CB7mkqduPBLTFXrIAXAFMCvBEiloQg0b8HWC8ZtLqG LoDWP+ARdzZKrmeqyUgP8rOfnsRHLKaGwZNITYWFYEp+KO0+Ns21EDL5Hz4twer5YHTK fD2C22G67P6Vtf0/xzjGnbkRJpSC+vTOAPe29mCo7gUW/9ogAqL1ChXau6abCqe4Q958 Hhqg== X-Gm-Message-State: AOAM530uKPLJeX46OzMXLDP0IAISuUS1qPxjZ6QP6XOD6HM9VAyOp/Cf GOWWKssD3IOyIKseG9rSx7C5Xg== X-Received: by 2002:a5d:664e:: with SMTP id f14mr4427208wrw.6.1592483154144; Thu, 18 Jun 2020 05:25:54 -0700 (PDT) Received: from localhost ([2a01:4b00:8523:2d03:c1af:c724:158a:e200]) by smtp.gmail.com with ESMTPSA id u13sm3336611wrp.53.2020.06.18.05.25.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Jun 2020 05:25:53 -0700 (PDT) From: David Brazdil To: Marc Zyngier , Will Deacon , Catalin Marinas , James Morse , Julien Thierry , Suzuki K Poulose Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, kernel-team@android.com, David Brazdil Subject: [PATCH v3 03/15] arm64: kvm: Add build rules for separate nVHE object files Date: Thu, 18 Jun 2020 13:25:25 +0100 Message-Id: <20200618122537.9625-4-dbrazdil@google.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200618122537.9625-1-dbrazdil@google.com> References: <20200618122537.9625-1-dbrazdil@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add new folder arch/arm64/kvm/hyp/nvhe and a Makefile for building code that runs in EL2 under nVHE KVM. Compile each source file into a `.hyp.tmp.o` object first, then prefix all its symbols with "__kvm_nvhe_" using `objcopy` and produce a `.hyp.o`. Suffixes were chosen so that it would be possible for VHE and nVHE to share some source files, but compiled with different CFLAGS. nVHE build rules add -D__KVM_NVHE_HYPERVISOR__. The nVHE ELF symbol prefix is added to kallsyms.c as ignored. EL2-only symbols will never appear in EL1 stack traces. Signed-off-by: David Brazdil --- arch/arm64/kernel/image-vars.h | 12 +++++++++++ arch/arm64/kvm/hyp/Makefile | 2 +- arch/arm64/kvm/hyp/nvhe/Makefile | 35 ++++++++++++++++++++++++++++++++ scripts/kallsyms.c | 1 + 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/kvm/hyp/nvhe/Makefile diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index be0a63ffed23..f32b406e90c0 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -51,4 +51,16 @@ __efistub__ctype = _ctype; #endif +#ifdef CONFIG_KVM + +/* + * KVM nVHE code has its own symbol namespace prefixed by __kvm_nvhe_, to + * isolate it from the kernel proper. The following symbols are legally + * accessed by it, therefore provide aliases to make them linkable. + * Do not include symbols which may not be safely accessed under hypervisor + * memory mappings. + */ + +#endif /* CONFIG_KVM */ + #endif /* __ARM64_KERNEL_IMAGE_VARS_H */ diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 5d8357ddc234..5f4f217532e0 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -6,7 +6,7 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING \ $(DISABLE_STACKLEAK_PLUGIN) -obj-$(CONFIG_KVM) += hyp.o +obj-$(CONFIG_KVM) += hyp.o nvhe/ obj-$(CONFIG_KVM_INDIRECT_VECTORS) += smccc_wa.o hyp-y := vgic-v3-sr.o timer-sr.o aarch32.o vgic-v2-cpuif-proxy.o sysreg-sr.o \ diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile new file mode 100644 index 000000000000..7d64235dba62 --- /dev/null +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for Kernel-based Virtual Machine module, HYP/nVHE part +# + +asflags-y := -D__KVM_NVHE_HYPERVISOR__ +ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -fno-stack-protector \ + -DDISABLE_BRANCH_PROFILING $(DISABLE_STACKLEAK_PLUGIN) + +obj-y := + +obj-y := $(patsubst %.o,%.hyp.o,$(obj-y)) +extra-y := $(patsubst %.hyp.o,%.hyp.tmp.o,$(obj-y)) + +$(obj)/%.hyp.tmp.o: $(src)/%.c FORCE + $(call if_changed_rule,cc_o_c) +$(obj)/%.hyp.tmp.o: $(src)/%.S FORCE + $(call if_changed_rule,as_o_S) +$(obj)/%.hyp.o: $(obj)/%.hyp.tmp.o FORCE + $(call if_changed,hypcopy) + +quiet_cmd_hypcopy = HYPCOPY $@ + cmd_hypcopy = $(OBJCOPY) --prefix-symbols=__kvm_nvhe_ $< $@ + +# KVM nVHE 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 + +# Skip objtool checking for this directory because nVHE code is compiled with +# non-standard build rules. +OBJECT_FILES_NON_STANDARD := y diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c index 6dc3078649fa..0096cd965332 100644 --- a/scripts/kallsyms.c +++ b/scripts/kallsyms.c @@ -109,6 +109,7 @@ static bool is_ignored_symbol(const char *name, char type) ".LASANPC", /* s390 kasan local symbols */ "__crc_", /* modversions */ "__efistub_", /* arm64 EFI stub namespace */ + "__kvm_nvhe_", /* arm64 non-VHE KVM namespace */ NULL }; -- 2.27.0