From: Andrew Scull <ascull@google.com>
To: David Brazdil <dbrazdil@google.com>
Cc: Marc Zyngier <maz@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Dennis Zhou <dennis@kernel.org>,
Tejun Heo <tj@kernel.org>, Christoph Lameter <cl@linux.com>,
Arnd Bergmann <arnd@arndb.de>, James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
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
Subject: Re: [PATCH v2 10/10] kvm: arm64: Remove unnecessary hyp mappings
Date: Thu, 10 Sep 2020 15:07:38 +0100 [thread overview]
Message-ID: <20200910140738.GE93664@google.com> (raw)
In-Reply-To: <20200903091712.46456-11-dbrazdil@google.com>
On Thu, Sep 03, 2020 at 11:17:12AM +0200, 'David Brazdil' via kernel-team wrote:
> With all nVHE per-CPU variables being part of the hyp per-CPU region,
> mapping them individual is not necessary any longer. They are mapped to hyp
> as part of the overall per-CPU region.
>
> Signed-off-by: David Brazdil <dbrazdil@google.com>
Acked-by: Andrew Scull<ascull@google.com>
> ---
> arch/arm64/include/asm/kvm_mmu.h | 25 +++++++------------------
> arch/arm64/kvm/arm.c | 17 +----------------
> 2 files changed, 8 insertions(+), 34 deletions(-)
>
> diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
> index 9db93da35606..bbe9df76ff42 100644
> --- a/arch/arm64/include/asm/kvm_mmu.h
> +++ b/arch/arm64/include/asm/kvm_mmu.h
> @@ -531,28 +531,17 @@ static inline int kvm_map_vectors(void)
> DECLARE_PER_CPU_READ_MOSTLY(u64, arm64_ssbd_callback_required);
> DECLARE_KVM_NVHE_PER_CPU(u64, arm64_ssbd_callback_required);
>
> -static inline int hyp_init_aux_data(void)
> +static inline void hyp_init_aux_data(void)
> {
> - int cpu, err;
> + int cpu;
>
> - for_each_possible_cpu(cpu) {
> - u64 *ptr;
> -
> - ptr = per_cpu_ptr_nvhe(arm64_ssbd_callback_required, cpu);
> - err = create_hyp_mappings(ptr, ptr + 1, PAGE_HYP);
> - if (err)
> - return err;
> -
> - /* Copy value from kernel to hyp. */
> - *ptr = per_cpu(arm64_ssbd_callback_required, cpu);
> - }
> - return 0;
> + /* Copy arm64_ssbd_callback_required values from kernel to hyp. */
> + for_each_possible_cpu(cpu)
> + *(per_cpu_ptr_nvhe(arm64_ssbd_callback_required, cpu)) =
> + per_cpu(arm64_ssbd_callback_required, cpu);
Careful with breaking allocations across lines, that seems to be taboo
in this subsystem.
> }
> #else
> -static inline int hyp_init_aux_data(void)
> -{
> - return 0;
> -}
> +static inline void hyp_init_aux_data(void) {}
> #endif
>
> #define kvm_phys_to_vttbr(addr) phys_to_ttbr(addr)
> diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
> index df7d133056ce..dfe1baa5bbb7 100644
> --- a/arch/arm64/kvm/arm.c
> +++ b/arch/arm64/kvm/arm.c
> @@ -1631,22 +1631,7 @@ static int init_hyp_mode(void)
> }
> }
>
> - for_each_possible_cpu(cpu) {
> - kvm_host_data_t *cpu_data;
> -
> - cpu_data = per_cpu_ptr_hyp(kvm_host_data, cpu);
> - err = create_hyp_mappings(cpu_data, cpu_data + 1, PAGE_HYP);
> -
> - if (err) {
> - kvm_err("Cannot map host CPU state: %d\n", err);
> - goto out_err;
> - }
> - }
> -
> - err = hyp_init_aux_data();
> - if (err)
> - kvm_err("Cannot map host auxiliary data: %d\n", err);
> -
> + hyp_init_aux_data();
> return 0;
>
> out_err:
> --
> 2.28.0.402.g5ffc5be6b7-goog
>
> --
> To unsubscribe from this group and stop receiving emails from it, send an email to kernel-team+unsubscribe@android.com.
>
next prev parent reply other threads:[~2020-09-10 14:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 9:17 [PATCH v2 00/10] Independent per-CPU data section for nVHE David Brazdil
2020-09-03 9:17 ` [PATCH v2 01/10] Macros to override naming of percpu symbols and sections David Brazdil
2020-09-03 9:17 ` [PATCH v2 02/10] kvm: arm64: Partially link nVHE hyp code, simplify HYPCOPY David Brazdil
2020-09-10 9:54 ` Andrew Scull
2020-09-14 13:09 ` Will Deacon
2020-09-03 9:17 ` [PATCH v2 03/10] kvm: arm64: Remove __hyp_this_cpu_read David Brazdil
2020-09-10 11:12 ` Andrew Scull
2020-09-17 8:34 ` David Brazdil
2020-09-03 9:17 ` [PATCH v2 04/10] kvm: arm64: Remove hyp_adr/ldr_this_cpu David Brazdil
2020-09-10 12:34 ` Andrew Scull
2020-09-03 9:17 ` [PATCH v2 05/10] kvm: arm64: Add helpers for accessing nVHE hyp per-cpu vars David Brazdil
2020-09-03 9:17 ` [PATCH v2 06/10] kvm: arm64: Duplicate arm64_ssbd_callback_required for nVHE hyp David Brazdil
2020-09-03 9:17 ` [PATCH v2 07/10] kvm: arm64: Create separate instances of kvm_host_data for VHE/nVHE David Brazdil
2020-09-03 9:17 ` [PATCH v2 08/10] kvm: arm64: Mark hyp stack pages reserved David Brazdil
2020-09-03 9:17 ` [PATCH v2 09/10] kvm: arm64: Set up hyp percpu data for nVHE David Brazdil
2020-09-03 9:17 ` [PATCH v2 10/10] kvm: arm64: Remove unnecessary hyp mappings David Brazdil
2020-09-10 14:07 ` Andrew Scull [this message]
2020-09-16 13:35 ` David Brazdil
2020-09-14 17:40 ` [PATCH v2 00/10] Independent per-CPU data section for nVHE Will Deacon
2020-09-16 11:54 ` David Brazdil
2020-09-16 12:24 ` David Brazdil
2020-09-16 12:39 ` Will Deacon
2020-09-16 12:40 ` David Brazdil
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=20200910140738.GE93664@google.com \
--to=ascull@google.com \
--cc=arnd@arndb.de \
--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-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--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).