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=-14.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 1AEF6C433DB for ; Sat, 23 Jan 2021 13:56:19 +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 C349822B48 for ; Sat, 23 Jan 2021 13:56:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C349822B48 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-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Subject:To:From: Message-ID:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8IaqsC7XCWS7i0sA3upGQ2ISYHiavjMI0+nQ0uW4K24=; b=ZmCww/3hGR75BLy988tyH38yg KzR7k/vlsnK+hy0/Tf0v91AlmR8iDjddt+IL8lOq214DFZLcS6qsP3kAxlUdohk9kRLwohgqkI42b 19VfvNH3zmc/h8wHCvTofhfA5Z7DRiEf6w1dLyF96nW5/GM+FBtu+z//uJd/nwvKa3g2OyMggnJ5X YFWyDnsDMTnlz4vll2oG/eisUWZ+1t5B8ovYIk9sdeFLiF+AQmUfdOK8ULNk2Sw+a+FPcL12geglZ 4lO8ZEFAGI8/wXUVSpRQR07L9LhD7/d9VmCsbfWpenMeR79GGmxypqth9BHLzEffCc4dx1WOiSgWK JvR++VnJw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3JNN-0004vL-Pm; Sat, 23 Jan 2021 13:54:53 +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 1l3JNL-0004v1-7Q for linux-arm-kernel@lists.infradead.org; Sat, 23 Jan 2021 13:54:52 +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 A30BB22B48; Sat, 23 Jan 2021 13:54:49 +0000 (UTC) Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1l3JNH-009bsW-PK; Sat, 23 Jan 2021 13:54:47 +0000 Date: Sat, 23 Jan 2021 13:54:47 +0000 Message-ID: <87y2gjkbbs.wl-maz@kernel.org> From: Marc Zyngier To: David Brazdil Subject: Re: [PATCH v2 8/8] KVM: arm64: Remove hyp_symbol_addr In-Reply-To: <20210105180541.65031-9-dbrazdil@google.com> References: <20210105180541.65031-1-dbrazdil@google.com> <20210105180541.65031-9-dbrazdil@google.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: dbrazdil@google.com, kvmarm@lists.cs.columbia.edu, catalin.marinas@arm.com, will@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, ardb@kernel.org, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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-20210123_085451_395257_51BB7D16 X-CRM114-Status: GOOD ( 25.80 ) 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 , Suzuki K Poulose , Catalin Marinas , linux-kernel@vger.kernel.org, Ard Biesheuvel , James Morse , linux-arm-kernel@lists.infradead.org, Will Deacon , kvmarm@lists.cs.columbia.edu, Julien Thierry Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 05 Jan 2021 18:05:41 +0000, David Brazdil wrote: > > Hyp code used the hyp_symbol_addr helper to force PC-relative addressing > because absolute addressing results in kernel VAs due to the way hyp > code is linked. This is not true anymore, so remove the helper and > update all of its users. > > Acked-by: Ard Biesheuvel > Signed-off-by: David Brazdil > --- > arch/arm64/include/asm/kvm_asm.h | 26 ------------------------ > arch/arm64/kvm/hyp/include/hyp/switch.h | 4 ++-- > arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 4 ++-- > arch/arm64/kvm/hyp/nvhe/psci-relay.c | 24 +++++++++++----------- > arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 2 +- > 5 files changed, 17 insertions(+), 43 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h > index 8a33d83ea843..22d933e9b59e 100644 > --- a/arch/arm64/include/asm/kvm_asm.h > +++ b/arch/arm64/include/asm/kvm_asm.h > @@ -199,32 +199,6 @@ extern void __vgic_v3_init_lrs(void); > > extern u32 __kvm_get_mdcr_el2(void); > > -#if defined(GCC_VERSION) && GCC_VERSION < 50000 > -#define SYM_CONSTRAINT "i" > -#else > -#define SYM_CONSTRAINT "S" > -#endif > - > -/* > - * Obtain the PC-relative address of a kernel symbol > - * s: symbol > - * > - * The goal of this macro is to return a symbol's address based on a > - * PC-relative computation, as opposed to a loading the VA from a > - * constant pool or something similar. This works well for HYP, as an > - * absolute VA is guaranteed to be wrong. Only use this if trying to > - * obtain the address of a symbol (i.e. not something you obtained by > - * following a pointer). > - */ > -#define hyp_symbol_addr(s) \ > - ({ \ > - typeof(s) *addr; \ > - asm("adrp %0, %1\n" \ > - "add %0, %0, :lo12:%1\n" \ > - : "=r" (addr) : SYM_CONSTRAINT (&s)); \ > - addr; \ > - }) > - This hunk is going to conflict in a fairly benign way with the removal of the GCC workaround which I think Will queued for 5.12. I'll work something out... Thanks, M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel