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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 58256C388F7 for ; Tue, 10 Nov 2020 15:10:26 +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 C0D5920867 for ; Tue, 10 Nov 2020 15:10:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="p+tRfcJA"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="kUctPFeB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0D5920867 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:To:From: Date:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kw+r9Y03S5LmHfyZjoL5aloo7M8ngsSVuSJD1rx4QHE=; b=p+tRfcJAL0PuPgrb+eFmkX+hb Xf7JddEPujT8I6XiYGkKLQzhG44h2a3iJoDO4uhyHA3z4bSbr9ArcuJpGd2iDbL4PvcBOFsioL8Ko AZstCpP17rPiw+KDfOn1Tl2Ypv2hPKyMqqRectrO5sVwca1G8lsT873/t9oclAKHDWl4z9JZgoWio aa1jFtYXzUP8nCKdqQ3OCMOdjqWhCEXmscAmOu5gE+PMql0qbtCPf1+uXpKa3E/TQ77DwQqM4qC2x HZtQRJWS5UEyRLkzEKveVIqYRGSEATSGlJsIRzMGbm15T6mLAgFtSWQR8klx4gTTh0yKycn2pd0IQ 9zBP5MY9Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcVGV-0007zK-Uc; Tue, 10 Nov 2020 15:09:00 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcVGT-0007yv-NM for linux-arm-kernel@lists.infradead.org; Tue, 10 Nov 2020 15:08:58 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BB1F5207D3; Tue, 10 Nov 2020 15:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605020936; bh=CPiYtm+F0PANfE4kt6eHA760IlM+FG8ncMfDp1SQZhE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=kUctPFeBbk6qRT8XhV4xsPWX6VjAMNmYFFA7gj47eHtq/4GPeXccydN0GL2VE3lIa GY1uZippUCabAH40dyYYpq72OTRUI5zg1FwLjV+TKkKovKqNnD6XpCBehvkWHHvFUR 2LNet+aXc6xr04+8kz/EWe67veC8a9gTZBSpvjX8= Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94) (envelope-from ) id 1kcVGQ-009TzB-Qc; Tue, 10 Nov 2020 15:08:54 +0000 MIME-Version: 1.0 Date: Tue, 10 Nov 2020 15:08:54 +0000 From: Marc Zyngier To: David Brazdil Subject: Re: [PATCH v1 06/24] kvm: arm64: Support per_cpu_ptr in nVHE hyp code In-Reply-To: <20201109113233.9012-7-dbrazdil@google.com> References: <20201109113233.9012-1-dbrazdil@google.com> <20201109113233.9012-7-dbrazdil@google.com> User-Agent: Roundcube Webmail/1.4.9 Message-ID: X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: dbrazdil@google.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org, dennis@kernel.org, tj@kernel.org, cl@linux.com, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, qperret@google.com, ascull@google.com, qwandor@google.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201110_100857_914765_87DBE784 X-CRM114-Status: GOOD ( 25.47 ) 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: Mark Rutland , kernel-team@android.com, Lorenzo Pieralisi , Andrew Walbran , Suzuki K Poulose , Catalin Marinas , Quentin Perret , linux-kernel@vger.kernel.org, James Morse , linux-arm-kernel@lists.infradead.org, Tejun Heo , Dennis Zhou , Christoph Lameter , Will Deacon , kvmarm@lists.cs.columbia.edu, Julien Thierry , Andrew Scull Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2020-11-09 11:32, David Brazdil wrote: > When compiling with __KVM_NVHE_HYPERVISOR__ redefine per_cpu_offset() > to > __hyp_per_cpu_offset() which looks up the base of the nVHE per-CPU > region of the given cpu and computes its offset from the > .hyp.data..percpu section. > > This enables use of per_cpu_ptr() helpers in nVHE hyp code. Until now > only this_cpu_ptr() was supported by setting TPIDR_EL2. > > Signed-off-by: David Brazdil > --- > arch/arm64/include/asm/percpu.h | 6 ++++++ > arch/arm64/kernel/image-vars.h | 3 +++ > arch/arm64/kvm/hyp/nvhe/Makefile | 3 ++- > arch/arm64/kvm/hyp/nvhe/percpu.c | 22 ++++++++++++++++++++++ > 4 files changed, 33 insertions(+), 1 deletion(-) > create mode 100644 arch/arm64/kvm/hyp/nvhe/percpu.c > > diff --git a/arch/arm64/include/asm/percpu.h > b/arch/arm64/include/asm/percpu.h > index 1599e17379d8..8f1661603b78 100644 > --- a/arch/arm64/include/asm/percpu.h > +++ b/arch/arm64/include/asm/percpu.h > @@ -239,6 +239,12 @@ PERCPU_RET_OP(add, add, ldadd) > #define this_cpu_cmpxchg_8(pcp, o, n) \ > _pcp_protect_return(cmpxchg_relaxed, pcp, o, n) > > +#ifdef __KVM_NVHE_HYPERVISOR__ > +extern unsigned long __hyp_per_cpu_offset(unsigned int cpu); > +#define __per_cpu_offset > +#define per_cpu_offset(cpu) __hyp_per_cpu_offset((cpu)) > +#endif > + > #include > > /* Redefine macros for nVHE hyp under DEBUG_PREEMPT to avoid its > dependencies. */ > diff --git a/arch/arm64/kernel/image-vars.h > b/arch/arm64/kernel/image-vars.h > index c615b285ff5b..78a42a7cdb72 100644 > --- a/arch/arm64/kernel/image-vars.h > +++ b/arch/arm64/kernel/image-vars.h > @@ -103,6 +103,9 @@ KVM_NVHE_ALIAS(gic_nonsecure_priorities); > KVM_NVHE_ALIAS(__start___kvm_ex_table); > KVM_NVHE_ALIAS(__stop___kvm_ex_table); > > +/* Array containing bases of nVHE per-CPU memory regions. */ > +KVM_NVHE_ALIAS(kvm_arm_hyp_percpu_base); > + > #endif /* CONFIG_KVM */ > > #endif /* __ARM64_KERNEL_IMAGE_VARS_H */ > diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile > b/arch/arm64/kvm/hyp/nvhe/Makefile > index ddde15fe85f2..c45f440cce51 100644 > --- a/arch/arm64/kvm/hyp/nvhe/Makefile > +++ b/arch/arm64/kvm/hyp/nvhe/Makefile > @@ -6,7 +6,8 @@ > asflags-y := -D__KVM_NVHE_HYPERVISOR__ > ccflags-y := -D__KVM_NVHE_HYPERVISOR__ > > -obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o > host.o hyp-main.o > +obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o > host.o \ > + hyp-main.o percpu.o > obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o > ../entry.o \ > ../fpsimd.o ../hyp-entry.o > > diff --git a/arch/arm64/kvm/hyp/nvhe/percpu.c > b/arch/arm64/kvm/hyp/nvhe/percpu.c > new file mode 100644 > index 000000000000..5fd0c5696907 > --- /dev/null > +++ b/arch/arm64/kvm/hyp/nvhe/percpu.c > @@ -0,0 +1,22 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (C) 2020 - Google LLC > + * Author: David Brazdil > + */ > + > +#include > +#include > +#include > + > +unsigned long __hyp_per_cpu_offset(unsigned int cpu) > +{ > + unsigned long *cpu_base_array; > + unsigned long this_cpu_base; > + > + if (cpu >= ARRAY_SIZE(kvm_arm_hyp_percpu_base)) > + hyp_panic(); > + > + cpu_base_array = kern_hyp_va(&kvm_arm_hyp_percpu_base[0]); There is no guarantee that this will not generate a PC relative addressing, resulting in kern_hyp_va() being applied twice. Consider using hyp_symbol_addr() instead, which always does the right by forcing a PC relative addressing and not subsequently mangling the address. > + this_cpu_base = kern_hyp_va(cpu_base_array[cpu]); > + return this_cpu_base - (unsigned long)&__per_cpu_start; And this is the opposite case: if the compiler generates an absolute address, you're toast. Yes, this is just as unlikely, but hey... Same remedy should apply. 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