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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 7FB47C4724C for ; Thu, 30 Apr 2020 14:49:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E9A92074A for ; Thu, 30 Apr 2020 14:49:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="efC8vkYg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728298AbgD3OtM (ORCPT ); Thu, 30 Apr 2020 10:49:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726640AbgD3OtJ (ORCPT ); Thu, 30 Apr 2020 10:49:09 -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 5005BC035494 for ; Thu, 30 Apr 2020 07:49:09 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id d17so7241796wrg.11 for ; Thu, 30 Apr 2020 07:49:09 -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=umkbm5KRG1N3np5zJ4HE1sftpuuUyazttPbykboHAm8=; b=efC8vkYgvNM1vKeVr2o1KyvheFweWQLdJEpfuO35sBECfVZWnRqYWwF651X3tv7WUl y7foAr0R0XqqiZFBrmI42yS1Ovwh7dWqJWSGU7t2oFv+doT6ZnA2r5ymHwPFZD2OBVPT pMw0DH9qc39RJ/JvzQIbUxJASJN7ZxUpMhrKoubW3zdb3umhK9O7VKPc1aDoQUlJyVMx O+Ei/SA4/M9+HqIx1BrLA84FsSF9Zm4hUlUT/C6/Qx4J7F1lhqzW5VbWxfHgrTX0eWjE Nzs6eMyZqIpzGWPgODgpMKn5JoW7WpNAATr3jAtV9DoXK0zChwiEWhVhc5aN3uSgaXwW 91Mw== 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=umkbm5KRG1N3np5zJ4HE1sftpuuUyazttPbykboHAm8=; b=tLJORck0KxWZneQTR87zuigqG3OZiL5sVWIobzcdfpU8OXGHzs/5ayOc4SNbRqgqSf mXDL/v9cDXyC3xO8ilBEVqG2vWNFuhoZdI6UIdjAKLPsThT6fouciYo+iYAZAEADVwoQ eSbE9NYQhdWJyTBLwW0/+GcD0E8wVWcg5DcRi5CVOgosjX109uQiYvkDrasOfWHQgp7z 5pIFQosU4YnCGChBqxpXog6rwxAy21LHegzZ5hskS3MoqFcAU0ZaliD0TKkhuaUj4sI1 08aKaQC8p+VRL4N55iRm9G6TiSlBsrQZosszHQQ84aWTQmJPdq3GjIM54WpyrfuZk3r2 h3vQ== X-Gm-Message-State: AGi0PuYWh+O2jSPS+MPkUYdxK74hKF5sJfIBEQj5hrTk6ggnnEN/ohWv SYNFw5wtxt2+ZmMI4kFTdHXkJw== X-Google-Smtp-Source: APiQypIpmxrWfSEem32pw/VDQBnv+MYBdsOIVLgK9Hym1JocNQpMrPcTj2RTIrgFipnFVqbek+O/ww== X-Received: by 2002:a5d:6841:: with SMTP id o1mr4321497wrw.412.1588258147736; Thu, 30 Apr 2020 07:49:07 -0700 (PDT) Received: from localhost ([2a01:4b00:8523:2d03:d4b6:9828:8bd2:ce6f]) by smtp.gmail.com with ESMTPSA id s14sm12054954wmh.18.2020.04.30.07.49.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Apr 2020 07:49:07 -0700 (PDT) From: David Brazdil To: Catalin Marinas , James Morse , Julien Thierry , Marc Zyngier , Suzuki K Poulose , Will Deacon Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, David Brazdil Subject: [PATCH 12/15] arm64: kvm: Compile remaining hyp/ files for both VHE/nVHE Date: Thu, 30 Apr 2020 15:48:28 +0100 Message-Id: <20200430144831.59194-13-dbrazdil@google.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200430144831.59194-1-dbrazdil@google.com> References: <20200430144831.59194-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 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 b3de24d7ecd1..e272eedfe19a 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -61,26 +61,8 @@ __efistub__ctype = _ctype; * memory mappings. */ -__hyp_text___fpsimd_restore_state = __fpsimd_restore_state; -__hyp_text___fpsimd_save_state = __fpsimd_save_state; -__hyp_text___guest_enter = __guest_enter; -__hyp_text___guest_exit = __guest_exit; __hyp_text___icache_flags = __icache_flags; __hyp_text___kvm_handle_stub_hvc = __kvm_handle_stub_hvc; -__hyp_text___vgic_v2_perform_cpuif_access = __vgic_v2_perform_cpuif_access; -__hyp_text___vgic_v3_activate_traps = __vgic_v3_activate_traps; -__hyp_text___vgic_v3_deactivate_traps = __vgic_v3_deactivate_traps; -__hyp_text___vgic_v3_get_ich_vtr_el2 = __vgic_v3_get_ich_vtr_el2; -__hyp_text___vgic_v3_init_lrs = __vgic_v3_init_lrs; -__hyp_text___vgic_v3_perform_cpuif_access = __vgic_v3_perform_cpuif_access; -__hyp_text___vgic_v3_read_vmcr = __vgic_v3_read_vmcr; -__hyp_text___vgic_v3_restore_aprs = __vgic_v3_restore_aprs; -__hyp_text___vgic_v3_restore_state = __vgic_v3_restore_state; -__hyp_text___vgic_v3_save_aprs = __vgic_v3_save_aprs; -__hyp_text___vgic_v3_save_state = __vgic_v3_save_state; -__hyp_text___vgic_v3_write_vmcr = __vgic_v3_write_vmcr; -__hyp_text_abort_guest_exit_end = abort_guest_exit_end; -__hyp_text_abort_guest_exit_start = abort_guest_exit_start; __hyp_text_arm64_const_caps_ready = arm64_const_caps_ready; __hyp_text_arm64_enable_wa2_handling = arm64_enable_wa2_handling; __hyp_text_arm64_ssbd_callback_required = arm64_ssbd_callback_required; @@ -89,7 +71,6 @@ __hyp_text_cpu_hwcaps = cpu_hwcaps; __hyp_text_kimage_voffset = kimage_voffset; __hyp_text_kvm_host_data = kvm_host_data; __hyp_text_kvm_patch_vector_branch = kvm_patch_vector_branch; -__hyp_text_kvm_skip_instr32 = kvm_skip_instr32; __hyp_text_kvm_update_va_mask = kvm_update_va_mask; __hyp_text_kvm_vgic_global_state = kvm_vgic_global_state; __hyp_text_panic = panic; diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 2b8286ee8138..41018d25118c 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -7,8 +7,9 @@ asflags-y := -D__HYPERVISOR__ ccflags-y := -D__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 \ - host_hypercall.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 host_hypercall.o ../hyp-entry.o obj-y := $(patsubst %.o,%.hyp.o,$(obj-y)) extra-y := $(patsubst %.hyp.o,%.hyp.tmp.o,$(obj-y)) -- 2.26.1 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 60A9AC47255 for ; Thu, 30 Apr 2020 14:49:17 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 1ABE12074A for ; Thu, 30 Apr 2020 14:49:17 +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="efC8vkYg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1ABE12074A 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 B8D194B539; Thu, 30 Apr 2020 10:49:16 -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 vruJ1NXa4cPe; Thu, 30 Apr 2020 10:49:15 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 1AB234B540; Thu, 30 Apr 2020 10:49:11 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E46A24B4DC for ; Thu, 30 Apr 2020 10:49:09 -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 tK0cB36wPgkr for ; Thu, 30 Apr 2020 10:49:09 -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 D759C4B52C for ; Thu, 30 Apr 2020 10:49:08 -0400 (EDT) Received: by mail-wr1-f67.google.com with SMTP id c12so2136069wrp.0 for ; Thu, 30 Apr 2020 07:49:08 -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=umkbm5KRG1N3np5zJ4HE1sftpuuUyazttPbykboHAm8=; b=efC8vkYgvNM1vKeVr2o1KyvheFweWQLdJEpfuO35sBECfVZWnRqYWwF651X3tv7WUl y7foAr0R0XqqiZFBrmI42yS1Ovwh7dWqJWSGU7t2oFv+doT6ZnA2r5ymHwPFZD2OBVPT pMw0DH9qc39RJ/JvzQIbUxJASJN7ZxUpMhrKoubW3zdb3umhK9O7VKPc1aDoQUlJyVMx O+Ei/SA4/M9+HqIx1BrLA84FsSF9Zm4hUlUT/C6/Qx4J7F1lhqzW5VbWxfHgrTX0eWjE Nzs6eMyZqIpzGWPgODgpMKn5JoW7WpNAATr3jAtV9DoXK0zChwiEWhVhc5aN3uSgaXwW 91Mw== 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=umkbm5KRG1N3np5zJ4HE1sftpuuUyazttPbykboHAm8=; b=qn5RM41yalP+ha1XdF16qNL+4GirUR3y0EP2hQcBGS8HrWOgnDpumB0FCXr/c+B7Fd 2DMyaxnKgo5/h1oA9cMzjNeVkEsDg8qOuhbkbY6/TNquxfmmODrLKkKIhFufPzdO1gh7 FXZPLB8KtOs+Oz/bkj0mUP5/kWn4IBX6ontHjqtr5zs/+3xgbTHcb4uIyHD1Wc+d7R+n zHGQXb/KXd5Q70M+iR58Yg03TnTos9EfTWe5EPEIFLIPhQjKGLf4QNHmus6IEJqAWR6L f/em54ocvnHsPpLrgvH5WvVCbSG62qLoqK4MfkaCgHWFtsit93ByDWhXXQitowSjw+Qs /ugw== X-Gm-Message-State: AGi0PuYXIMZuNxbDKCe3cxYluPU35jg6+H4u4UK5M7s+Us/+1qd3/QnT dK2f2CX2aFddJ5t5vbYWDzXHvIPzjX0= X-Google-Smtp-Source: APiQypIpmxrWfSEem32pw/VDQBnv+MYBdsOIVLgK9Hym1JocNQpMrPcTj2RTIrgFipnFVqbek+O/ww== X-Received: by 2002:a5d:6841:: with SMTP id o1mr4321497wrw.412.1588258147736; Thu, 30 Apr 2020 07:49:07 -0700 (PDT) Received: from localhost ([2a01:4b00:8523:2d03:d4b6:9828:8bd2:ce6f]) by smtp.gmail.com with ESMTPSA id s14sm12054954wmh.18.2020.04.30.07.49.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Apr 2020 07:49:07 -0700 (PDT) From: David Brazdil To: Catalin Marinas , James Morse , Julien Thierry , Marc Zyngier , Suzuki K Poulose , Will Deacon Subject: [PATCH 12/15] arm64: kvm: Compile remaining hyp/ files for both VHE/nVHE Date: Thu, 30 Apr 2020 15:48:28 +0100 Message-Id: <20200430144831.59194-13-dbrazdil@google.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200430144831.59194-1-dbrazdil@google.com> References: <20200430144831.59194-1-dbrazdil@google.com> MIME-Version: 1.0 Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.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 b3de24d7ecd1..e272eedfe19a 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -61,26 +61,8 @@ __efistub__ctype = _ctype; * memory mappings. */ -__hyp_text___fpsimd_restore_state = __fpsimd_restore_state; -__hyp_text___fpsimd_save_state = __fpsimd_save_state; -__hyp_text___guest_enter = __guest_enter; -__hyp_text___guest_exit = __guest_exit; __hyp_text___icache_flags = __icache_flags; __hyp_text___kvm_handle_stub_hvc = __kvm_handle_stub_hvc; -__hyp_text___vgic_v2_perform_cpuif_access = __vgic_v2_perform_cpuif_access; -__hyp_text___vgic_v3_activate_traps = __vgic_v3_activate_traps; -__hyp_text___vgic_v3_deactivate_traps = __vgic_v3_deactivate_traps; -__hyp_text___vgic_v3_get_ich_vtr_el2 = __vgic_v3_get_ich_vtr_el2; -__hyp_text___vgic_v3_init_lrs = __vgic_v3_init_lrs; -__hyp_text___vgic_v3_perform_cpuif_access = __vgic_v3_perform_cpuif_access; -__hyp_text___vgic_v3_read_vmcr = __vgic_v3_read_vmcr; -__hyp_text___vgic_v3_restore_aprs = __vgic_v3_restore_aprs; -__hyp_text___vgic_v3_restore_state = __vgic_v3_restore_state; -__hyp_text___vgic_v3_save_aprs = __vgic_v3_save_aprs; -__hyp_text___vgic_v3_save_state = __vgic_v3_save_state; -__hyp_text___vgic_v3_write_vmcr = __vgic_v3_write_vmcr; -__hyp_text_abort_guest_exit_end = abort_guest_exit_end; -__hyp_text_abort_guest_exit_start = abort_guest_exit_start; __hyp_text_arm64_const_caps_ready = arm64_const_caps_ready; __hyp_text_arm64_enable_wa2_handling = arm64_enable_wa2_handling; __hyp_text_arm64_ssbd_callback_required = arm64_ssbd_callback_required; @@ -89,7 +71,6 @@ __hyp_text_cpu_hwcaps = cpu_hwcaps; __hyp_text_kimage_voffset = kimage_voffset; __hyp_text_kvm_host_data = kvm_host_data; __hyp_text_kvm_patch_vector_branch = kvm_patch_vector_branch; -__hyp_text_kvm_skip_instr32 = kvm_skip_instr32; __hyp_text_kvm_update_va_mask = kvm_update_va_mask; __hyp_text_kvm_vgic_global_state = kvm_vgic_global_state; __hyp_text_panic = panic; diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 2b8286ee8138..41018d25118c 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -7,8 +7,9 @@ asflags-y := -D__HYPERVISOR__ ccflags-y := -D__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 \ - host_hypercall.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 host_hypercall.o ../hyp-entry.o obj-y := $(patsubst %.o,%.hyp.o,$(obj-y)) extra-y := $(patsubst %.hyp.o,%.hyp.tmp.o,$(obj-y)) -- 2.26.1 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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.7 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 57096C47247 for ; Thu, 30 Apr 2020 14:53:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 297F72074A for ; Thu, 30 Apr 2020 14:53:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jaCX7hEW"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="efC8vkYg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 297F72074A Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=T+8m4VcE/jNn/atzX3lHrAdI80OLp9GAaTaTycVr/H0=; b=jaCX7hEW5Ri1yp 76fI0cGURqZePk+VsVkSrPD3uTVB79O+0BE57+sswud5BqFFooYRHJgZ+ZGrFrs8UJR7TjsCzUN4j PTb2WqJ7tmUkw3jcA3A2VhgOn+N2nNKB2ownjPRxZSAWegrITQQAcM4uRKYKcv60xP5BOef17B7Er IAvepIXOF5qqGzOJiNe2BPnWk4Y2+59HiF3WJ+TO92xfEH6dF0dP4ceU4JIBx+HuwlLBb6Qyu6oSO uwuwy8TTmNtll9ACsUDrNl4CEDdx/ssmfXc4o0dRIUQ9JCY8rdbvN7cuf+W8JFTe6Q/Hw/D5LtvsD UMwsPDJnmCrRqIEvEtHw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jUAZ4-00019W-RN; Thu, 30 Apr 2020 14:53:26 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jUAUv-00042A-D3 for linux-arm-kernel@lists.infradead.org; Thu, 30 Apr 2020 14:49:21 +0000 Received: by mail-wr1-x444.google.com with SMTP id k1so7287716wrx.4 for ; Thu, 30 Apr 2020 07:49:09 -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=umkbm5KRG1N3np5zJ4HE1sftpuuUyazttPbykboHAm8=; b=efC8vkYgvNM1vKeVr2o1KyvheFweWQLdJEpfuO35sBECfVZWnRqYWwF651X3tv7WUl y7foAr0R0XqqiZFBrmI42yS1Ovwh7dWqJWSGU7t2oFv+doT6ZnA2r5ymHwPFZD2OBVPT pMw0DH9qc39RJ/JvzQIbUxJASJN7ZxUpMhrKoubW3zdb3umhK9O7VKPc1aDoQUlJyVMx O+Ei/SA4/M9+HqIx1BrLA84FsSF9Zm4hUlUT/C6/Qx4J7F1lhqzW5VbWxfHgrTX0eWjE Nzs6eMyZqIpzGWPgODgpMKn5JoW7WpNAATr3jAtV9DoXK0zChwiEWhVhc5aN3uSgaXwW 91Mw== 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=umkbm5KRG1N3np5zJ4HE1sftpuuUyazttPbykboHAm8=; b=CHv/w7v2V+QBIR0aUtem3saC0jiPR4QOfeqhKXGrd1q6kymj8v4Kk/4K1PP3q+oAXZ EpeleQip4784Is8Cod4yN1s6s0ZY1dKDH59bDuStvIW5nAAxSrvR7uTuFn7jjNAWaA33 H5AjHeVDoAJ8yPN3pz03c7xaeGI+ASMji5/oW1H9eFcrlcHtLFNjEB5cHu7nKuu6UAKa dLO+n0sj81JmsLe+A/m2Qh7SBSwCN1NTXIY3FY4zT0nabQ81bbV/b4s1EUUSn3GGFGCl jpnnezcZt40BGS6dNtM804P1NsUmKIWuiZJE3vL+ltvxLRJD6YWmOwY7iIco4zFdW5X/ eRNA== X-Gm-Message-State: AGi0PuYhMIfrLuOY711h5Kxsgam8PS1CgNTm+cymG4zEB0V5VbBHKzY8 gFB3vE2S+1TOhGc+AGCmEnEEFA== X-Google-Smtp-Source: APiQypIpmxrWfSEem32pw/VDQBnv+MYBdsOIVLgK9Hym1JocNQpMrPcTj2RTIrgFipnFVqbek+O/ww== X-Received: by 2002:a5d:6841:: with SMTP id o1mr4321497wrw.412.1588258147736; Thu, 30 Apr 2020 07:49:07 -0700 (PDT) Received: from localhost ([2a01:4b00:8523:2d03:d4b6:9828:8bd2:ce6f]) by smtp.gmail.com with ESMTPSA id s14sm12054954wmh.18.2020.04.30.07.49.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Apr 2020 07:49:07 -0700 (PDT) From: David Brazdil To: Catalin Marinas , James Morse , Julien Thierry , Marc Zyngier , Suzuki K Poulose , Will Deacon Subject: [PATCH 12/15] arm64: kvm: Compile remaining hyp/ files for both VHE/nVHE Date: Thu, 30 Apr 2020 15:48:28 +0100 Message-Id: <20200430144831.59194-13-dbrazdil@google.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200430144831.59194-1-dbrazdil@google.com> References: <20200430144831.59194-1-dbrazdil@google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200430_074909_620085_28E26C79 X-CRM114-Status: GOOD ( 12.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Brazdil , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 b3de24d7ecd1..e272eedfe19a 100644 --- a/arch/arm64/kernel/image-vars.h +++ b/arch/arm64/kernel/image-vars.h @@ -61,26 +61,8 @@ __efistub__ctype = _ctype; * memory mappings. */ -__hyp_text___fpsimd_restore_state = __fpsimd_restore_state; -__hyp_text___fpsimd_save_state = __fpsimd_save_state; -__hyp_text___guest_enter = __guest_enter; -__hyp_text___guest_exit = __guest_exit; __hyp_text___icache_flags = __icache_flags; __hyp_text___kvm_handle_stub_hvc = __kvm_handle_stub_hvc; -__hyp_text___vgic_v2_perform_cpuif_access = __vgic_v2_perform_cpuif_access; -__hyp_text___vgic_v3_activate_traps = __vgic_v3_activate_traps; -__hyp_text___vgic_v3_deactivate_traps = __vgic_v3_deactivate_traps; -__hyp_text___vgic_v3_get_ich_vtr_el2 = __vgic_v3_get_ich_vtr_el2; -__hyp_text___vgic_v3_init_lrs = __vgic_v3_init_lrs; -__hyp_text___vgic_v3_perform_cpuif_access = __vgic_v3_perform_cpuif_access; -__hyp_text___vgic_v3_read_vmcr = __vgic_v3_read_vmcr; -__hyp_text___vgic_v3_restore_aprs = __vgic_v3_restore_aprs; -__hyp_text___vgic_v3_restore_state = __vgic_v3_restore_state; -__hyp_text___vgic_v3_save_aprs = __vgic_v3_save_aprs; -__hyp_text___vgic_v3_save_state = __vgic_v3_save_state; -__hyp_text___vgic_v3_write_vmcr = __vgic_v3_write_vmcr; -__hyp_text_abort_guest_exit_end = abort_guest_exit_end; -__hyp_text_abort_guest_exit_start = abort_guest_exit_start; __hyp_text_arm64_const_caps_ready = arm64_const_caps_ready; __hyp_text_arm64_enable_wa2_handling = arm64_enable_wa2_handling; __hyp_text_arm64_ssbd_callback_required = arm64_ssbd_callback_required; @@ -89,7 +71,6 @@ __hyp_text_cpu_hwcaps = cpu_hwcaps; __hyp_text_kimage_voffset = kimage_voffset; __hyp_text_kvm_host_data = kvm_host_data; __hyp_text_kvm_patch_vector_branch = kvm_patch_vector_branch; -__hyp_text_kvm_skip_instr32 = kvm_skip_instr32; __hyp_text_kvm_update_va_mask = kvm_update_va_mask; __hyp_text_kvm_vgic_global_state = kvm_vgic_global_state; __hyp_text_panic = panic; diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 2b8286ee8138..41018d25118c 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -7,8 +7,9 @@ asflags-y := -D__HYPERVISOR__ ccflags-y := -D__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 \ - host_hypercall.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 host_hypercall.o ../hyp-entry.o obj-y := $(patsubst %.o,%.hyp.o,$(obj-y)) extra-y := $(patsubst %.hyp.o,%.hyp.tmp.o,$(obj-y)) -- 2.26.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel