Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp387015pxk; Thu, 3 Sep 2020 02:18:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgA74NflmbMv98Rv51o6EoQRB2Ir0Ox0GZmBHmiilDNytxwoO5kxuEU0e1PgttI+RXCKF7 X-Received: by 2002:a05:6402:1779:: with SMTP id da25mr1972402edb.75.1599124730448; Thu, 03 Sep 2020 02:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599124730; cv=none; d=google.com; s=arc-20160816; b=NROHlcF3WSS19C47l1oeobquUYCvBr4SVT6cFUf+whN0PzEGWcuCx8ni1Hv2Hyg/Vx CpAxZKwzsJI6VXojOvnM5Kb3o5Juk78kAEDqv3DLP3nOaeawfInvh0eyp9jiTtNK8V6d euA71lnagLr5a01cvMBmxVbP6GFSPf+IuKPMazide9Y8FdSYilPRXgTJDTxm0NNMcNbF b1hD1JWmUn+eDRaMoJxsk4j8Ygh/OK3uJcHiUzwGmCErmUi2xAH1hsqj8Y4BYhDcDk6P 8xVHcXlkxaTzI5KdT35qnqRjP3c3b6DqH0OkUktquTRbqggf+3BB1QNVNwUUyj7eiRcf ccjA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=ybBiP+e417RFA7nMR4Bu7V33eb9o8gA61OetpUfftkQ=; b=vKYi4rWxVOHnOryoUqf+RCs4b5zGH7WjFT5LzsWagwyMSbIYQWU9ybrOz+3Fj/6QBL MAKVrKj2ndneVBw8/COsAYD5/Amlv90ITNg2SwB4wLYWII0/9izbsDdzZuNQr79LqWp+ 4pnPHrK8vNyWSCamFW0ZnCZjIcTBlL/fn7B+II44Me+FjHjNrJB9iVXzKzCsEOpJdHae joVlude6JeT0RQUGx7YFKUZ4cuwjNWBz8GBowK4yBafuLOiJ5PEDCTMUu5MHlfFvuFhd Um8rpGXirIKcUtmJvbkbIeXw2AVLlYLj3ksal0ayS2k6V7oylMnFNLTss6+/GQ8Wl0/Q cEvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=APLmMrE9; 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 mb19si731640ejb.589.2020.09.03.02.18.27; Thu, 03 Sep 2020 02:18:50 -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=APLmMrE9; 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 S1726726AbgICJRn (ORCPT + 99 others); Thu, 3 Sep 2020 05:17:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbgICJRj (ORCPT ); Thu, 3 Sep 2020 05:17:39 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB5B9C061245 for ; Thu, 3 Sep 2020 02:17:37 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id i26so2770511ejb.12 for ; Thu, 03 Sep 2020 02:17:37 -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=ybBiP+e417RFA7nMR4Bu7V33eb9o8gA61OetpUfftkQ=; b=APLmMrE9eEbfLFqGCI1U6UkzQSGgJVYT4fP69U8vY4IlnhXbOnr9RQuoxMki8HmaZ2 hKKQGLreepg4yFdemEkt4tTzSK31vCuqaa+W9k2u/u9b4F7KVEas6PBuxUVrrIHd7zV/ 83k8qYFhmmAueuH8UbIKhI4d0y51jhHFNYF7MZibLhrowrX7RKs0qA4jpeEV+fLRSHa3 LAkXEcSV6ctzyXlOPMd8Fc3wo9JJkJ6bwRk4wjYBhBa2pCVPkGdRYlRATOUWBEXYu1ud il6iZjUzLeM46Wwbgu3Qmmqltj3yRYqjHzSmkJyqufbPD/tdNc6KSK7+lqX0f2abBSob J2DA== 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=ybBiP+e417RFA7nMR4Bu7V33eb9o8gA61OetpUfftkQ=; b=X7eZTxGpc/86Zou7oNeonky83TfiM4ta4+hVCM7zcCpwDLRfKbqGxDgvmaBMWuXpRT 1Z4kV4y241kA9vaVvIs/szugDQlZw5CEF7SYGetdwQJRs5s6JwlPqN63jPHa3gjzrVy+ 2fCuqJmNbHZqwEqS6VH3t21HcH06HuACCUkD10DboQBzuCpMj1bDuv1THbvZ8uBuKj+e TjprzbRu7jiwRq4zvCzBYVdLjDVbDZeImvRHaluEzWHGSWBQ0lQgita/AlLLR9kZUddO SFZ7NvcQgeI40GcWKNRgKEqwtmlFjcozXRwP4sjcEIQM05H6OrCFQdD8LpqxCSfhlwzh 9mZg== X-Gm-Message-State: AOAM533qdSiwxHWUmNAUplmX3zTbggCv3yz7hejj70tzhEpr3V2uI8H0 eExq1FbeJpIs0ZIBWiaaC06wEw== X-Received: by 2002:a17:906:a116:: with SMTP id t22mr1160350ejy.353.1599124654241; Thu, 03 Sep 2020 02:17:34 -0700 (PDT) Received: from localhost (dynamic-2a00-1028-919a-a06e-64ac-0036-822c-68d3.ipv6.broadband.iol.cz. [2a00:1028:919a:a06e:64ac:36:822c:68d3]) by smtp.gmail.com with ESMTPSA id x10sm2414585eds.21.2020.09.03.02.17.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Sep 2020 02:17:33 -0700 (PDT) From: David Brazdil To: Marc Zyngier , Catalin Marinas , Will Deacon , Dennis Zhou , Tejun Heo , Christoph Lameter , Arnd Bergmann Cc: James Morse , Julien Thierry , Suzuki K Poulose , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arch@vger.kernel.org, kernel-team@android.com, David Brazdil Subject: [PATCH v2 00/10] Independent per-CPU data section for nVHE Date: Thu, 3 Sep 2020 11:17:02 +0200 Message-Id: <20200903091712.46456-1-dbrazdil@google.com> X-Mailer: git-send-email 2.28.0 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 Introduce '.hyp.data..percpu' as part of ongoing effort to make nVHE hyp code self-contained and independent of the rest of the kernel. The series builds on top of the "Split off nVHE hyp code" series which used objcopy to rename '.text' to '.hyp.text' and prefix all ELF symbols with '__kvm_nvhe' for all object files under kvm/hyp/nvhe. The series is structured as follows: - patch 1: Modify generic PERCPU_* linker script macros to make it possible to define multiple per-CPU ELF sections with prefixed section and symbol names. - patch 2: Improve existing hyp build rules. This could be sent and merged independently of per-CPU but this series builds on it. - patches 3-4: 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 5-7: 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 8-10: 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-rc3 and available in branch 'topic/percpu-v2' at: https://android-kvm.googlesource.com/linux Changes v1 -> v2: * 5.9-rc3 base * partially link hyp code, add linker script David Brazdil (10): Macros to override naming of percpu symbols and sections kvm: arm64: Partially link nVHE hyp code, simplify HYPCOPY 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/kvm_asm.h | 74 ++++++++------- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/include/asm/kvm_mmu.h | 23 ++--- arch/arm64/include/asm/percpu.h | 33 ++++++- arch/arm64/include/asm/sections.h | 1 + arch/arm64/kernel/image-vars.h | 2 - arch/arm64/kernel/vmlinux.lds.S | 10 ++ arch/arm64/kvm/arm.c | 110 ++++++++++++++++++---- 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 | 56 +++++------ 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 ++- include/asm-generic/vmlinux.lds.h | 40 +++++--- 19 files changed, 304 insertions(+), 137 deletions(-) create mode 100644 arch/arm64/kvm/hyp/nvhe/hyp.lds.S -- 2.28.0.402.g5ffc5be6b7-goog