From: Marc Zyngier <maz@kernel.org>
To: David Brazdil <dbrazdil@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
kernel-team@android.com,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Andrew Walbran <qwandor@google.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Quentin Perret <qperret@google.com>,
linux-kernel@vger.kernel.org, James Morse <james.morse@arm.com>,
linux-arm-kernel@lists.infradead.org, Tejun Heo <tj@kernel.org>,
Dennis Zhou <dennis@kernel.org>, Christoph Lameter <cl@linux.com>,
Will Deacon <will@kernel.org>,
kvmarm@lists.cs.columbia.edu,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Andrew Scull <ascull@google.com>
Subject: Re: [PATCH v1 16/24] kvm: arm64: Add offset for hyp VA <-> PA conversion
Date: Wed, 11 Nov 2020 13:47:28 +0000 [thread overview]
Message-ID: <ded6b623ea8ddc43f7dcabd0ec59d4b5@kernel.org> (raw)
In-Reply-To: <20201109113233.9012-17-dbrazdil@google.com>
On 2020-11-09 11:32, David Brazdil wrote:
> Add a host-initialized constant to KVM nVHE hyp code for converting
> between EL2 linear map virtual addresses and physical addresses.
> Also add `__hyp_pa` macro that performs the conversion.
>
> Signed-off-by: David Brazdil <dbrazdil@google.com>
> ---
> arch/arm64/kvm/arm.c | 15 +++++++++++++++
> arch/arm64/kvm/hyp/nvhe/psci.c | 3 +++
> 2 files changed, 18 insertions(+)
>
> diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
> index 28e3bc056225..dc7d43d7785a 100644
> --- a/arch/arm64/kvm/arm.c
> +++ b/arch/arm64/kvm/arm.c
> @@ -1484,6 +1484,20 @@ static inline void hyp_cpu_pm_exit(void)
> }
> #endif
>
> +static void init_hyp_physvirt_offset(void)
> +{
> + extern s64 kvm_nvhe_sym(hyp_physvirt_offset);
> + unsigned long kern_vaddr, hyp_vaddr, paddr;
> +
> + /* Check that kvm_arm_hyp_percpu_base has been set. */
> + BUG_ON(kvm_arm_hyp_percpu_base[0] == 0);
Why is this dependent on the percpu base? Or is that just a convenient
symbol?
> +
> + kern_vaddr = kvm_arm_hyp_percpu_base[0];
> + hyp_vaddr = kern_hyp_va(kern_vaddr);
> + paddr = __pa(kern_vaddr);
> + CHOOSE_NVHE_SYM(hyp_physvirt_offset) = (s64)paddr - (s64)hyp_vaddr;
> +}
It feels like this offset could be set at the point where we compute
the hyp_va offset in va_layout.c, couldn't it? It would have the
advantage of keeping all the ugly VA hacks together.
> +
> static void init_cpu_logical_map(void)
> {
> extern u64 kvm_nvhe_sym(__cpu_logical_map)[NR_CPUS];
> @@ -1688,6 +1702,7 @@ static int init_hyp_mode(void)
> }
> }
>
> + init_hyp_physvirt_offset();
> init_cpu_logical_map();
> init_psci();
>
> diff --git a/arch/arm64/kvm/hyp/nvhe/psci.c
> b/arch/arm64/kvm/hyp/nvhe/psci.c
> index 82d3b2c89658..b0b5df590ba5 100644
> --- a/arch/arm64/kvm/hyp/nvhe/psci.c
> +++ b/arch/arm64/kvm/hyp/nvhe/psci.c
> @@ -16,6 +16,9 @@
> /* Config options set by the host. */
> u32 kvm_host_psci_version = PSCI_VERSION(0, 0);
> u32 kvm_host_psci_function_id[PSCI_FN_MAX];
> +s64 hyp_physvirt_offset;
> +
> +#define __hyp_pa(x) ((phys_addr_t)((x)) + hyp_physvirt_offset)
>
> static u64 get_psci_func_id(struct kvm_cpu_context *host_ctxt)
> {
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-11-11 13:48 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 11:32 [PATCH v1 00/24] Opt-in always-on nVHE hypervisor David Brazdil
2020-11-09 11:32 ` [PATCH v1 01/24] psci: Accessor for configured PSCI version David Brazdil
2020-11-10 14:43 ` Marc Zyngier
2020-11-11 11:31 ` David Brazdil
2020-11-09 11:32 ` [PATCH v1 02/24] psci: Accessor for configured PSCI function IDs David Brazdil
2020-11-09 11:32 ` [PATCH v1 03/24] arm64: Move MAIR_EL1_SET to asm/memory.h David Brazdil
2020-11-10 14:49 ` Marc Zyngier
2020-11-09 11:32 ` [PATCH v1 04/24] kvm: arm64: Initialize MAIR_EL2 using a constant David Brazdil
2020-11-09 11:32 ` [PATCH v1 05/24] kvm: arm64: Add .hyp.data..ro_after_init ELF section David Brazdil
2020-11-09 11:32 ` [PATCH v1 06/24] kvm: arm64: Support per_cpu_ptr in nVHE hyp code David Brazdil
2020-11-10 15:08 ` Marc Zyngier
2020-11-11 12:32 ` David Brazdil
2020-11-11 12:46 ` Marc Zyngier
2020-11-09 11:32 ` [PATCH v1 07/24] kvm: arm64: Create nVHE copy of cpu_logical_map David Brazdil
2020-11-10 15:24 ` Marc Zyngier
2020-11-11 13:03 ` David Brazdil
2020-11-11 13:29 ` Marc Zyngier
2020-11-11 13:45 ` David Brazdil
2020-11-11 13:52 ` Marc Zyngier
2020-11-09 11:32 ` [PATCH v1 08/24] kvm: arm64: Move hyp-init params to a per-CPU struct David Brazdil
2020-11-10 15:30 ` Marc Zyngier
2020-11-09 11:32 ` [PATCH v1 09/24] kvm: arm64: Refactor handle_trap to use a switch David Brazdil
2020-11-09 11:32 ` [PATCH v1 10/24] kvm: arm64: Extract parts of el2_setup into a macro David Brazdil
2020-11-10 15:56 ` Marc Zyngier
2020-11-16 17:56 ` David Brazdil
2020-11-09 11:32 ` [PATCH v1 11/24] kvm: arm64: Add SMC handler in nVHE EL2 David Brazdil
2020-11-11 12:12 ` Marc Zyngier
2020-11-09 11:32 ` [PATCH v1 12/24] kvm: arm64: Extract __do_hyp_init into a helper function David Brazdil
2020-11-09 11:32 ` [PATCH v1 13/24] kvm: arm64: Add CPU entry point in nVHE hyp David Brazdil
2020-11-11 11:57 ` Marc Zyngier
2020-11-16 11:49 ` David Brazdil
2020-11-16 12:40 ` Marc Zyngier
2020-11-09 11:32 ` [PATCH v1 14/24] kvm: arm64: Add function to enter host from KVM nVHE hyp code David Brazdil
2020-11-09 11:32 ` [PATCH v1 15/24] kvm: arm64: Bootstrap PSCI SMC handler in nVHE EL2 David Brazdil
2020-11-11 13:18 ` Marc Zyngier
2020-11-09 11:32 ` [PATCH v1 16/24] kvm: arm64: Add offset for hyp VA <-> PA conversion David Brazdil
2020-11-11 13:47 ` Marc Zyngier [this message]
2020-11-09 11:32 ` [PATCH v1 17/24] kvm: arm64: Add __hyp_pa_symbol helper macro David Brazdil
2020-11-09 16:59 ` Quentin Perret
2020-11-09 18:10 ` Marc Zyngier
2020-11-10 9:24 ` David Brazdil
2020-11-09 11:32 ` [PATCH v1 18/24] kvm: arm64: Forward safe PSCI SMCs coming from host David Brazdil
2020-11-09 11:32 ` [PATCH v1 19/24] kvm: arm64: Intercept host's PSCI_CPU_ON SMCs David Brazdil
2020-11-09 11:32 ` [PATCH v1 20/24] kvm: arm64: Intercept host's CPU_SUSPEND PSCI SMCs David Brazdil
2020-11-09 11:32 ` [PATCH v1 21/24] kvm: arm64: Add kvm-arm.protected early kernel parameter David Brazdil
2020-11-09 11:32 ` [PATCH v1 22/24] kvm: arm64: Keep nVHE EL2 vector installed David Brazdil
2020-11-09 11:32 ` [PATCH v1 23/24] kvm: arm64: Trap host SMCs in protected mode David Brazdil
2020-11-10 5:02 ` kernel test robot
2020-11-10 9:03 ` Marc Zyngier
2020-11-10 13:00 ` David Brazdil
2020-11-09 11:32 ` [PATCH v1 24/24] kvm: arm64: Fix EL2 mode availability checks David Brazdil
2020-11-10 10:15 ` [PATCH v1 00/24] Opt-in always-on nVHE hypervisor Christoph Hellwig
2020-11-10 11:18 ` Marc Zyngier
2021-01-19 13:17 ` Janne Karhunen
2020-11-11 14:32 ` Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ded6b623ea8ddc43f7dcabd0ec59d4b5@kernel.org \
--to=maz@kernel.org \
--cc=ascull@google.com \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=dbrazdil@google.com \
--cc=dennis@kernel.org \
--cc=james.morse@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=qperret@google.com \
--cc=qwandor@google.com \
--cc=suzuki.poulose@arm.com \
--cc=tj@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).