From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 939B4C433E0 for ; Thu, 18 Jun 2020 12:26:25 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 435802075E for ; Thu, 18 Jun 2020 12:26:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="GEbrZUYq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 435802075E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id DF3EE4B1C7; Thu, 18 Jun 2020 08:26:24 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08pjjjvt+veI; Thu, 18 Jun 2020 08:26:23 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id AE32B4B150; Thu, 18 Jun 2020 08:26:15 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E68704B189 for ; Thu, 18 Jun 2020 08:26:12 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RabhYBSjbWxC for ; Thu, 18 Jun 2020 08:26:11 -0400 (EDT) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 518FD4B188 for ; Thu, 18 Jun 2020 08:26:11 -0400 (EDT) Received: by mail-wr1-f67.google.com with SMTP id x6so5824331wrm.13 for ; Thu, 18 Jun 2020 05:26:11 -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=E1RONziHkaXcIbp8EZDtcBXhqYuNXkWrxwk7rGyJjWU=; b=GEbrZUYqxyO+kyfPLW1XsrO90u8JIgVJkPp7Ozi4c+c3BAL1hjqsyehMHSraKA9IaF iFVKkO6pAzNc1X4cQYOdnMRyAve1mAXOGX3kykmGwsSwV+kD4Hn9EFHcUWruCoVxe/0A ErGcs1QOOt7cihX/KUvc0I8ouOORh83beB6KQULWl9r+55Bx85RVg7KTcC6iQVbWmDLP EfRtkUPnPFfKS4Y4Llfn2K9nMlRZz2NLNE/KAtkfHAxw9DyALzAC5UGBgYPZezEMj04A rHOw1Hu4XAuXLvJTUjAXN5H15zJP+Fo8dwD3GYdAzLaJktcA2MMwG13bVp1Vh6Baku0o JxNQ== 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=E1RONziHkaXcIbp8EZDtcBXhqYuNXkWrxwk7rGyJjWU=; b=MJD2g7wcNVlsRYB4Wru08TnLT0E6CojOWhIyn+yNF8eqmyYzrcp3gkGvL723EbX3XT Quqq16ENmEXAHSw20NoopEMRY/3qjAabo2rm4XYh/jwCN1jmhMye6k7Yug0IA2//KOHY zVXHkD8fML2L0AId9+rXnqtqmGDZkG1BXI/LGtI+HEZ+ty8hzRtsHk9ArSEE5r14qPN6 FoBylDwL0263W/h74YgR+DqfU98LWg9xZJCaRhZv8eJpmVR5TU/APXew12bEKRJhJPfm Wj2y982LneLtHkx2a9F9MC+PnT5aX8KueQOtAR2z2/yj9NHk0RfjJsXt3CaZP08135wn nelg== X-Gm-Message-State: AOAM531fN1wnl12BsduKkVw2zcM0uH9JTbGEUfye8z7hyYLK7b/dBqve TV7FwT2ENfbPYmCSNJEkRy7n0g== X-Google-Smtp-Source: ABdhPJxtj4KuEKVAUVM/ayFvRfAHHTsgx+xpEM7sEoPG8ylQ3t5pkgRZ9BQ6Ls0lNwmXJ9BWTKycUA== X-Received: by 2002:a5d:6a4b:: with SMTP id t11mr4289837wrw.404.1592483170221; Thu, 18 Jun 2020 05:26:10 -0700 (PDT) Received: from localhost ([2a01:4b00:8523:2d03:c1af:c724:158a:e200]) by smtp.gmail.com with ESMTPSA id j5sm3377432wrm.57.2020.06.18.05.26.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Jun 2020 05:26:09 -0700 (PDT) From: David Brazdil To: Marc Zyngier , Will Deacon , Catalin Marinas , James Morse , Julien Thierry , Suzuki K Poulose Subject: [PATCH v3 12/15] arm64: kvm: Compile remaining hyp/ files for both VHE/nVHE Date: Thu, 18 Jun 2020 13:25:34 +0100 Message-Id: <20200618122537.9625-13-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 Cc: android-kvm@google.com, linux-kernel@vger.kernel.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu This patch is part of a series which builds KVM's non-VHE hyp code separately from VHE and the rest of the kernel. The following files in hyp/ contain only code shared by VHE/nVHE: vgic-v3-sr.c, aarch32.c, vgic-v2-cpuif-proxy.c, entry.S, fpsimd.S Compile them under both configurations. Deletions in image-vars.h reflect eliminated dependencies of nVHE code on the rest of the kernel. Signed-off-by: David Brazdil --- arch/arm64/kernel/image-vars.h | 19 ------------------- arch/arm64/kvm/hyp/nvhe/Makefile | 5 +++-- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/arch/arm64/kernel/image-vars.h b/arch/arm64/kernel/image-vars.h index 94bfc61b3f51..2cc3e7673dc2 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -61,27 +61,9 @@ __efistub__ctype = _ctype; * memory mappings. */ -__kvm_nvhe___fpsimd_restore_state = __fpsimd_restore_state; -__kvm_nvhe___fpsimd_save_state = __fpsimd_save_state; -__kvm_nvhe___guest_enter = __guest_enter; -__kvm_nvhe___guest_exit = __guest_exit; __kvm_nvhe___hyp_panic_string = __hyp_panic_string; __kvm_nvhe___hyp_stub_vectors = __hyp_stub_vectors; __kvm_nvhe___icache_flags = __icache_flags; -__kvm_nvhe___vgic_v2_perform_cpuif_access = __vgic_v2_perform_cpuif_access; -__kvm_nvhe___vgic_v3_activate_traps = __vgic_v3_activate_traps; -__kvm_nvhe___vgic_v3_deactivate_traps = __vgic_v3_deactivate_traps; -__kvm_nvhe___vgic_v3_get_ich_vtr_el2 = __vgic_v3_get_ich_vtr_el2; -__kvm_nvhe___vgic_v3_init_lrs = __vgic_v3_init_lrs; -__kvm_nvhe___vgic_v3_perform_cpuif_access = __vgic_v3_perform_cpuif_access; -__kvm_nvhe___vgic_v3_read_vmcr = __vgic_v3_read_vmcr; -__kvm_nvhe___vgic_v3_restore_aprs = __vgic_v3_restore_aprs; -__kvm_nvhe___vgic_v3_restore_state = __vgic_v3_restore_state; -__kvm_nvhe___vgic_v3_save_aprs = __vgic_v3_save_aprs; -__kvm_nvhe___vgic_v3_save_state = __vgic_v3_save_state; -__kvm_nvhe___vgic_v3_write_vmcr = __vgic_v3_write_vmcr; -__kvm_nvhe_abort_guest_exit_end = abort_guest_exit_end; -__kvm_nvhe_abort_guest_exit_start = abort_guest_exit_start; __kvm_nvhe_arm64_const_caps_ready = arm64_const_caps_ready; __kvm_nvhe_arm64_enable_wa2_handling = arm64_enable_wa2_handling; __kvm_nvhe_arm64_ssbd_callback_required = arm64_ssbd_callback_required; @@ -94,7 +76,6 @@ __kvm_nvhe_idmap_t0sz = idmap_t0sz; __kvm_nvhe_kimage_voffset = kimage_voffset; __kvm_nvhe_kvm_host_data = kvm_host_data; __kvm_nvhe_kvm_patch_vector_branch = kvm_patch_vector_branch; -__kvm_nvhe_kvm_skip_instr32 = kvm_skip_instr32; __kvm_nvhe_kvm_update_va_mask = kvm_update_va_mask; __kvm_nvhe_kvm_vgic_global_state = kvm_vgic_global_state; __kvm_nvhe_panic = panic; diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 4ec34abce0a9..d51ae163430d 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -7,8 +7,9 @@ asflags-y := -D__KVM_NVHE_HYPERVISOR__ ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -fno-stack-protector \ -DDISABLE_BRANCH_PROFILING $(DISABLE_STACKLEAK_PLUGIN) -obj-y := ../timer-sr.o timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o \ - hyp-init.o ../hyp-entry.o +obj-y := ../vgic-v3-sr.o ../timer-sr.o timer-sr.o ../aarch32.o \ + ../vgic-v2-cpuif-proxy.o sysreg-sr.o debug-sr.o ../entry.o switch.o \ + ../fpsimd.o tlb.o hyp-init.o ../hyp-entry.o obj-y := $(patsubst %.o,%.hyp.o,$(obj-y)) extra-y := $(patsubst %.hyp.o,%.hyp.tmp.o,$(obj-y)) -- 2.27.0 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm