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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 005D6C388F9 for ; Mon, 23 Nov 2020 12:52:29 +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 7E3D82168B for ; Mon, 23 Nov 2020 12:52:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sDr5vR6h"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="n+SsvAnO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7E3D82168B Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com 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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L63JWQO8ZP0Kepu1ctZ0EOOtBUxH4j6sWuFXEpkl2VI=; b=sDr5vR6hV01UjGpNBy+kM3Uj+ mG8aNbJC0XyVrrFuW1bmPE4Kfz8PjuA4DDG0kGImrolEt1mjTAxi6/GSbraCuw7oc5CiQYQYt7jc8 Tn+bmXtQ//2ma7FdWRn4kgS80fxPIVzo3qspSCkNrOzgHZqERkXwJYuIpZwNJRpCrYD/KLHG9saV2 shLsUYVXkACsGMQwu6ZcZjZ8p6DsjxTSm2uNiSQsxzSPKQHuEOhOK3GDwXmvtPCkpbKOShPXER4KA ld9VxxR8Oiop/V7acKFffO++Fa/YXgO3sQC1z6Tp434gaDWXSswplNGjf2nV19ZF0uV6nHFh/8/WN ZCESOxP2g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khBK4-0002du-6b; Mon, 23 Nov 2020 12:52:00 +0000 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khBK0-0002d8-Sc for linux-arm-kernel@lists.infradead.org; Mon, 23 Nov 2020 12:51:57 +0000 Received: by mail-ej1-x641.google.com with SMTP id k27so23062299ejs.10 for ; Mon, 23 Nov 2020 04:51:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=jnD6JxIyxc4vm54K4tKnhPWtevyVeHY1Zgn00laUUfA=; b=n+SsvAnOuvFpo9fuYFpraPfRqMJQBKN5DmMsO67xbOdk7xeiFLjd9qowus6ere1Cg3 IyClkLOxj+jm6I2dSTy2Tx1nAoEZtFF6N2t915Kw+bQ+hCeNUQe+u8vfps7+3A37Wd0i Xw468ZyUMHg34aARMw+5sCah5Ife3hgkIOgBaEFtTkrdvjw+F3UZo5x6JCdflbNWKuPL +gH7yEC9lZxw9iErt3++xiBCrsbPc8RsDMEJx2rKd5jMKKG8buEGI2odLG0PEC0EqUaX T33iehIZOGb9ctsRDtPWP1OUCnXL1/JQt4rpA1d7l2yVOfogxApssQ/fZAMIbiU6O13Y pn1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=jnD6JxIyxc4vm54K4tKnhPWtevyVeHY1Zgn00laUUfA=; b=DrGaSaMZFKBUMy0rkmddpQekHvJPe0ksVzUS3ZyZQ0n5P59JuknIHOexyinAlBMYRz c3PDOtkA4DJDTw10MyIMfErKsmasY7t6HA/XXbURgklTNPMP+yrr0g9ZLrHavsEefip4 2oTGmdsQ6qcw6iRk7AZya6HM9NklwNX1hpTxh5o9crZ4pHM//q074wuhJhJ+ALpQtzb+ 2CKKYbOnDeIxInuSsus3CzCBtPwVfmVDSvxgmsJ6mS7Hc5tse7+/31ft2d8kMzUsOHxI m9EMmSdVOC+4HvYi2o5p2hVOWwY7vFCyDT9GcMSg+BLMNa7Us+CbOAl7w8PYz9l9Ts66 d2YA== X-Gm-Message-State: AOAM533AloFSHX4UUSPtA92Ps7noIDWOzrt0xXFwSlRV18YLBnMYRImv cDJa2vYXfylHFF/cINkKvRGRmw== X-Google-Smtp-Source: ABdhPJzoJRpQuSQbyVo4FnWnIGE0h6PqMXD5ASqgZR/lDI3/6lf/+dq9ThIlEFnuoEOJELCR8o+4KQ== X-Received: by 2002:a17:907:c14:: with SMTP id ga20mr43858051ejc.526.1606135915525; Mon, 23 Nov 2020 04:51:55 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:acac:b2ef:c7d:fd8a]) by smtp.gmail.com with ESMTPSA id z19sm4921235ejj.101.2020.11.23.04.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 04:51:54 -0800 (PST) Date: Mon, 23 Nov 2020 12:51:53 +0000 From: David Brazdil To: Quentin Perret Subject: Re: [RFC PATCH 08/27] KVM: arm64: Make kvm_call_hyp() a function call at Hyp Message-ID: <20201123125153.hnipzls2ijptpti7@google.com> References: <20201117181607.1761516-1-qperret@google.com> <20201117181607.1761516-9-qperret@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201117181607.1761516-9-qperret@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201123_075156_978522_AD9A823E X-CRM114-Status: GOOD ( 21.08 ) 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: "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE" , kernel-team@android.com, Frank Rowand , Suzuki K Poulose , android-kvm@google.com, Catalin Marinas , open list , Rob Herring , James Morse , "moderated list:ARM64 PORT \(AARCH64 ARCHITECTURE\)" , Marc Zyngier , Will Deacon , "open list:KERNEL VIRTUAL MACHINE FOR ARM64 \(KVM/arm64\)" , 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, Nov 17, 2020 at 06:15:48PM +0000, 'Quentin Perret' via kernel-team wrote: > kvm_call_hyp() has some logic to issue a function call or a hypercall > depending the EL at which the kernel is running. However, all the code > compiled under __KVM_NVHE_HYPERVISOR__ is guaranteed to run only at EL2, > and in this case a simple function call is needed. > > Add ifdefery to kvm_host.h to symplify kvm_call_hyp() in .hyp.text. > > Signed-off-by: Quentin Perret > --- > arch/arm64/include/asm/kvm_host.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index ac11adab6602..7a5d5f4b3351 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -557,6 +557,7 @@ int kvm_test_age_hva(struct kvm *kvm, unsigned long hva); > void kvm_arm_halt_guest(struct kvm *kvm); > void kvm_arm_resume_guest(struct kvm *kvm); > > +#ifndef __KVM_NVHE_HYPERVISOR__ > #define kvm_call_hyp_nvhe(f, ...) \ > ({ \ > struct arm_smccc_res res; \ > @@ -596,6 +597,11 @@ void kvm_arm_resume_guest(struct kvm *kvm); > \ > ret; \ > }) > +#else /* __KVM_NVHE_HYPERVISOR__ */ > +#define kvm_call_hyp(f, ...) f(__VA_ARGS__) > +#define kvm_call_hyp_ret(f, ...) f(__VA_ARGS__) > +#define kvm_call_hyp_nvhe(f, ...) f(__VA_ARGS__) > +#endif /* __KVM_NVHE_HYPERVISOR__ */ I was hoping we could define this as the following instead. That would require adding host-side declarations of all functions currently called with _nvhe. #define kvm_call_hyp_nvhe(f, ...) \ + is_nvhe_hyp_code() ? f(__VA_ARGS__) : \ ({ \ struct arm_smccc_res res; \ \ arm_smccc_1_1_hvc(KVM_HOST_SMCCC_FUNC(f), \ ##__VA_ARGS__, &res); \ WARN_ON(res.a0 != SMCCC_RET_SUCCESS); \ \ res.a1; \ }) Up to you what you think is cleaner, just my 2 cents... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel