From patchwork Wed Sep 16 17:34:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brazdil X-Patchwork-Id: 11780273 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF8B8746 for ; Wed, 16 Sep 2020 17:36:38 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 8D71A20672 for ; Wed, 16 Sep 2020 17:36:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1w9HsRJO"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="vGAU2kWR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D71A20672 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=Jja8wLp4B0pCWzY5TVVg3m8/zchqUshktZKJ1CQstAQ=; b=1w9HsRJOu7ScVg+n58P6ZdKsdp FkHhQiyZEW7Nwh2mWN9/9JLJcJPxzZfXxn2w0vjMQspDfqkxhCDV7n2ZVtdkwyXl3UBDkoZJskjup yNcOZEqyvWLM0+lHUS8zM0FZOhFMMFkbr+w0qAOChzZdiHmHLIOu6RVmlRqwU0g16VOuU+WlaqLvL fPjp6d2/WW9jku7oHyvAmckFmsScOyjb7a96Lcmsp/O2357sYEe74d2vsOXqYf2x3CwtQU3kBvtgH Wt+BzvM0T6BQkjnFPiESPbLfbiScNRCKI/XTvJoSbBzutccZPvW1hnloESRvWGnyUG2XhpOLCZZ8u +vG5Auzg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIbKT-0000pb-LZ; Wed, 16 Sep 2020 17:34:49 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIbKQ-0000ot-TD for linux-arm-kernel@lists.infradead.org; Wed, 16 Sep 2020 17:34:47 +0000 Received: by mail-wr1-x444.google.com with SMTP id t10so7812349wrv.1 for ; Wed, 16 Sep 2020 10:34:46 -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:mime-version :content-transfer-encoding; bh=7mFDfLRc/4coa4w4PmVZiF39D3EbfTO0poh1JSaf3tg=; b=vGAU2kWRhekFoBDT7sUBYbd7AQ/0NP8rSF7wCZ5cc1mqJHfnkU2LjdxpqgvLSzC8C6 HgK02bdPHtLbqtZn4q0RnS1+zmNXG6b9m/TES+lyBYb2TqNi/8kRzN7/jf0y7NjX7EpS pt6qAOuPo6oyK//jwyuGbT6kcxGnovcDDEppAUOdKxofvqiqaZmpGbz73Jb0jc5ytCne Elp8PtK3xec2AV24MDV0HI1V2eP53YwAN77CLySTA5Lm1UefJnEEepbtf3Ad6NktHs8V rKpZjaC58ODG5D60rOWatOiXUAirqTD58E++PKgCBvPwbwpXA3sRP3PQRGW3dcAiasL/ Fqgg== 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:mime-version :content-transfer-encoding; bh=7mFDfLRc/4coa4w4PmVZiF39D3EbfTO0poh1JSaf3tg=; b=DrhvdRjso0JY27cA4L0djdtJh9uTcQueYASt11pgtEBQK4yxcLh18xTNJz3Hy0fK22 LYYfzQ7bml2iqqsdaHfaXXmPJ4e/Pvua3leiy5bQsT2oVWGXl3q+R75g8YHDTX183ezZ 89GzkcfLFU+TKDI4Yl7+OVGjxWK5OMA6XediD5OnHmdkGQwqSnQqNYloSft0TRBVV+DJ DdDSvg1BBsrAeLwxW1wRbxzqDVNEpcHo7mC9tv/JN0Xf1LHLxckZR1hX4j8N8DzgSKQe 9KmcxTVQ9p1KAC26zNAb0K/coyZ0fT8fCWKcHxRbNWcJtGj5H6+Yp3gM0UQKSdqXvs69 pdDw== X-Gm-Message-State: AOAM533+TSwjbzAEVyJdYGycFDtr2YwPl+ozAbpyKPRYsp2NAqU7bWsm 6h02EjD5folRskAGgVeCaFMPzA== X-Google-Smtp-Source: ABdhPJzmjFCynjgBuUkJ+b5Puz0KOw8KtSCoG1vuE4eR8lKjcBVC8JI8uRWOwLM4nzTsOVZRlwYx+A== X-Received: by 2002:adf:d845:: with SMTP id k5mr26012928wrl.285.1600277685420; Wed, 16 Sep 2020 10:34:45 -0700 (PDT) Received: from localhost ([2a01:4b00:8523:2d03:e49d:f6be:d31b:ad3c]) by smtp.gmail.com with ESMTPSA id a5sm246603wrp.37.2020.09.16.10.34.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Sep 2020 10:34:44 -0700 (PDT) From: David Brazdil To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v3 00/10] Independent per-CPU data section for nVHE Date: Wed, 16 Sep 2020 18:34:28 +0100 Message-Id: <20200916173439.32265-1-dbrazdil@google.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200916_133446_975228_6B06AC6A X-CRM114-Status: GOOD ( 18.01 ) X-Spam-Score: -15.7 (---------------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-15.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list -7.5 USER_IN_DEF_SPF_WL From: address is in the default SPF white-list -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.5 ENV_AND_HDR_SPF_MATCH Env and Hdr From used in default SPF WL Match -0.0 DKIMWL_WL_MED DKIMwl.org - Medium sender 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: kernel-team@android.com, Suzuki K Poulose , Catalin Marinas , linux-kernel@vger.kernel.org, James Morse , linux-arm-kernel@lists.infradead.org, Marc Zyngier , Tejun Heo , Dennis Zhou , Christoph Lameter , David Brazdil , Will Deacon , Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Introduce '.hyp.data..percpu' as part of ongoing effort to make nVHE hyp code self-contained and independent of the rest of the kernel. Main benefits: * independent nVHE per-CPU data section that can be unmapped from host, * more robust linking of nVHE hyp code, * no need for hyp-specific macros to access per-CPU variables. The series is structured as follows: - patch 1: Improve existing hyp build rules. This could be sent and merged independently of per-CPU but this series builds on it. - patches 2-3: Minor cleanups. - patches 4-5: Replace hyp helpers for accessing per-CPU variables with common helpers modified to work correctly in hyp. Per-CPU variables can now be accessed with one API anywhere. - patches 6-8: Where VHE and nVHE use per-CPU variables defined in kernel proper, move their definitions to hyp/ where they are duplicated and owned by VHE/nVHE, respectively. Non-VHE hyp code now refers only to per-CPU variables defined in its source files. Helpers are added so that kernel proper can continue to access nVHE hyp variables, same way as it does with other nVHE symbols. - patches 9-11: Introduce '.hyp.data..percpu' ELF section and allocate memory for every CPU core during KVM init. All nVHE per-CPU state is now grouped together in ELF and in memory. Introducing a new per-CPU variable does not require adding new memory mappings any more. nVHE hyp code cannot accidentally refer to kernel-proper per-CPU data as it only has the pointer to its own per-CPU memory. Patches are rebased on v5.9-rc5 and available in branch 'topic/percpu-v3' at: https://android-kvm.googlesource.com/linux For maintainers: In case of interest, there are patches that remove the need for redefining macros under DEBUG_PREEMPT available at the same repo, branch 'topic/percpu-v3-debug-preempt'. Since they are non-trivial, I am not going to post them here so late in the 5.10 window. I plan to post them for 5.11 when they will also be useful for other patches. Changes v2 -> v3: * Use PERCPU_INPUT in hyp.ld instead of modifying PERCPU_SECTION * Only pass linker script once to LD (fix error message) * Renamed '.hyp.o' to '.nvhe.o' * Use __KVM_VHE_HYPERVISOR__ to select TPIDR_EL2 instead of alternatives * Move all prefixing-related macros to hyp_image.h Changes v1 -> v2: * partially link hyp code, add linker script David Brazdil (11): kvm: arm64: Partially link nVHE hyp code, simplify HYPCOPY kvm: arm64: Move nVHE hyp namespace macros to hyp_image.h kvm: arm64: Only define __kvm_ex_table for CONFIG_KVM kvm: arm64: Remove __hyp_this_cpu_read kvm: arm64: Remove hyp_adr/ldr_this_cpu kvm: arm64: Add helpers for accessing nVHE hyp per-cpu vars kvm: arm64: Duplicate arm64_ssbd_callback_required for nVHE hyp kvm: arm64: Create separate instances of kvm_host_data for VHE/nVHE kvm: arm64: Mark hyp stack pages reserved kvm: arm64: Set up hyp percpu data for nVHE kvm: arm64: Remove unnecessary hyp mappings arch/arm64/include/asm/assembler.h | 27 ++++-- arch/arm64/include/asm/hyp_image.h | 36 +++++++ arch/arm64/include/asm/kvm_asm.h | 82 ++++++++-------- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/include/asm/kvm_mmu.h | 19 ++-- arch/arm64/include/asm/percpu.h | 33 ++++++- arch/arm64/include/asm/sections.h | 1 + arch/arm64/kernel/image-vars.h | 4 - arch/arm64/kernel/vmlinux.lds.S | 13 +++ arch/arm64/kvm/arm.c | 109 +++++++++++++++++++--- arch/arm64/kvm/hyp/hyp-entry.S | 2 +- arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 4 +- arch/arm64/kvm/hyp/include/hyp/switch.h | 8 +- arch/arm64/kvm/hyp/nvhe/Makefile | 60 ++++++------ arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 19 ++++ arch/arm64/kvm/hyp/nvhe/switch.c | 8 +- arch/arm64/kvm/hyp/vhe/switch.c | 5 +- arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 4 +- arch/arm64/kvm/pmu.c | 13 ++- 19 files changed, 320 insertions(+), 129 deletions(-) create mode 100644 arch/arm64/include/asm/hyp_image.h create mode 100644 arch/arm64/kvm/hyp/nvhe/hyp.lds.S