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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A45C0C4332F for ; Tue, 15 Mar 2022 00:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245733AbiCOAYy (ORCPT ); Mon, 14 Mar 2022 20:24:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237769AbiCOAYv (ORCPT ); Mon, 14 Mar 2022 20:24:51 -0400 Received: from mail-yb1-xb30.google.com (mail-yb1-xb30.google.com [IPv6:2607:f8b0:4864:20::b30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D23BF3BBFA for ; Mon, 14 Mar 2022 17:23:40 -0700 (PDT) Received: by mail-yb1-xb30.google.com with SMTP id e186so34161374ybc.7 for ; Mon, 14 Mar 2022 17:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=EGfNWx74UGuUub5piWt3tsVOuTbPS9Nq0NSKYIwZfOc=; b=PYRfwuzfXlVuwTmkFVHsCaGsito8gFKFX2Q5Ixo4mOCFQegWQ3Ua2OPPOyN3A0VimE Q3DNZDn0azVbow/4cs7W963T2YreqnPHkXWXX60007eVdm/TIwcbMxgLqqH5+XzO4yHM GUiu2DUkVT79FkM54HgFWJb2rPzZN2SE77olXoMm5rnY4A+F/HizB7IDBdvQ5dQ8Yf6l Psc/LChDPo9yVp7pL2PdGYEA6xTADKKX+PVtMqWag0gBVoGxx7n6y9xmQq7DerQ/2CVW 2go7i1Gdudvc7dveN2yVpzs4YRCoHosYoelNlPhGpvwZ14oklaed28LZ9BgCFhrR67UN FMVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EGfNWx74UGuUub5piWt3tsVOuTbPS9Nq0NSKYIwZfOc=; b=1WWFuUdU2yGEj0/F7C/cQzpasJmJmArSBZ80E5t05n8A+H/Dx+w0ZBYtfC/YO0SCMw +6G+eQjmJ3mTuwe/1+K3c5JEyx1gowhRjHPT5XmKWT7UxLgUAucORc4KIGo8/bU9P6ek U91BG8KLIbMbXo1ToqaIAw/AiWYDu8ezGqNWg3XRFWAIt1nZhil9nfk1RpJmYs3G+o5X fWMPNJtGJJDKSGdY0fGaGLEkf3zzTISy8HkAfAn1EHcrnfEPxtvgWtp0A7QXnD9uGDwm nicreK+YwMJnpoIwubNX+NhMpVDAAKKouFGSxJpZbqykVVrDpl1E+t2bPyRkhOVOjE/b vMAg== X-Gm-Message-State: AOAM530cDsFwEOxUn4aOI5psbpAn3WELnfMeZVJxUw+egwnNkWFPu4Oe t01T4LIlNWdG+GFlylTELiZcIchqDBampTAzWQp/lg== X-Google-Smtp-Source: ABdhPJwfwj8uxFtCbOhp08GGf72OizUn5mMAatGc9XWM0wr+mGQO9ZtqIutLsRpwHCI+V+8WZgRGYPvDEQOa43mJIy8= X-Received: by 2002:a25:d512:0:b0:61d:aded:1743 with SMTP id r18-20020a25d512000000b0061daded1743mr19336522ybe.526.1647303819857; Mon, 14 Mar 2022 17:23:39 -0700 (PDT) MIME-Version: 1.0 References: <20220224172559.4170192-1-rananta@google.com> <20220224172559.4170192-7-rananta@google.com> In-Reply-To: From: Raghavendra Rao Ananta Date: Mon, 14 Mar 2022 17:23:27 -0700 Message-ID: Subject: Re: [PATCH v4 06/13] KVM: arm64: Add standard hypervisor firmware register To: Oliver Upton Cc: Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose , Paolo Bonzini , Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Reiji Watanabe , Jing Zhang , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 14, 2022 at 12:45 PM Oliver Upton wrote: > > On Thu, Feb 24, 2022 at 05:25:52PM +0000, Raghavendra Rao Ananta wrote: > > Introduce the firmware register to hold the standard hypervisor > > service calls (owner value 5) as a bitmap. The bitmap represents > > the features that'll be enabled for the guest, as configured by > > the user-space. Currently, this includes support only for > > Paravirtualized time, represented by bit-0. > > > > The register is also added to the kvm_arm_vm_scope_fw_regs[] list > > as it maintains its state per-VM. > > > > Signed-off-by: Raghavendra Rao Ananta > > --- > > arch/arm64/include/asm/kvm_host.h | 2 ++ > > arch/arm64/include/uapi/asm/kvm.h | 4 ++++ > > arch/arm64/kvm/guest.c | 1 + > > arch/arm64/kvm/hypercalls.c | 20 +++++++++++++++++++- > > include/kvm/arm_hypercalls.h | 3 +++ > > 5 files changed, 29 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index 1909ced3208f..318148b69279 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -105,9 +105,11 @@ struct kvm_arch_memory_slot { > > * struct kvm_hvc_desc: KVM ARM64 hypercall descriptor > > * > > * @hvc_std_bmap: Bitmap of standard secure service calls > > + * @hvc_std_hyp_bmap: Bitmap of standard hypervisor service calls > > */ > > struct kvm_hvc_desc { > > u64 hvc_std_bmap; > > + u64 hvc_std_hyp_bmap; > > }; > > > > struct kvm_arch { > > diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h > > index 2decc30d6b84..9a2caead7359 100644 > > --- a/arch/arm64/include/uapi/asm/kvm.h > > +++ b/arch/arm64/include/uapi/asm/kvm.h > > @@ -295,6 +295,10 @@ struct kvm_arm_copy_mte_tags { > > #define KVM_REG_ARM_STD_BIT_TRNG_V1_0 BIT(0) > > #define KVM_REG_ARM_STD_BMAP_BIT_MAX 0 /* Last valid bit */ > > > > +#define KVM_REG_ARM_STD_HYP_BMAP KVM_REG_ARM_FW_BMAP_REG(1) > > +#define KVM_REG_ARM_STD_HYP_BIT_PV_TIME BIT(0) > > +#define KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX 0 /* Last valid bit */ > > + > > /* SVE registers */ > > #define KVM_REG_ARM64_SVE (0x15 << KVM_REG_ARM_COPROC_SHIFT) > > > > diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c > > index d66e6c742bbe..c42426d6137e 100644 > > --- a/arch/arm64/kvm/guest.c > > +++ b/arch/arm64/kvm/guest.c > > @@ -66,6 +66,7 @@ static const u64 kvm_arm_vm_scope_fw_regs[] = { > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1, > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2, > > KVM_REG_ARM_STD_BMAP, > > + KVM_REG_ARM_STD_HYP_BMAP, > > }; > > > > /** > > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c > > index 48c126c3da72..ebc0cc26cf2e 100644 > > --- a/arch/arm64/kvm/hypercalls.c > > +++ b/arch/arm64/kvm/hypercalls.c > > @@ -75,6 +75,10 @@ static bool kvm_hvc_call_supported(struct kvm_vcpu *vcpu, u32 func_id) > > case ARM_SMCCC_TRNG_RND64: > > return kvm_arm_fw_reg_feat_enabled(hvc_desc->hvc_std_bmap, > > KVM_REG_ARM_STD_BIT_TRNG_V1_0); > > + case ARM_SMCCC_HV_PV_TIME_FEATURES: > > + case ARM_SMCCC_HV_PV_TIME_ST: > > + return kvm_arm_fw_reg_feat_enabled(hvc_desc->hvc_std_hyp_bmap, > > + KVM_REG_ARM_STD_HYP_BIT_PV_TIME); > > default: > > /* By default, allow the services that aren't listed here */ > > return true; > > @@ -83,6 +87,7 @@ static bool kvm_hvc_call_supported(struct kvm_vcpu *vcpu, u32 func_id) > > > > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) > > { > > + struct kvm_hvc_desc *hvc_desc = &vcpu->kvm->arch.hvc_desc; > > u32 func_id = smccc_get_function(vcpu); > > u64 val[4] = {SMCCC_RET_NOT_SUPPORTED}; > > u32 feature; > > @@ -134,7 +139,10 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) > > } > > break; > > case ARM_SMCCC_HV_PV_TIME_FEATURES: > > - val[0] = SMCCC_RET_SUCCESS; > > + if (kvm_arm_fw_reg_feat_enabled( > > + hvc_desc->hvc_std_hyp_bmap, > > It is probably OK to keep this parameter on the line above (just stay > under 100 characters a line). > Will rearrange this in the next series. Thanks. Regards, Raghavendra > > + KVM_REG_ARM_STD_HYP_BIT_PV_TIME)) > > + val[0] = SMCCC_RET_SUCCESS; > > break; > > } > > break; > > @@ -179,6 +187,7 @@ static const u64 kvm_arm_fw_reg_ids[] = { > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1, > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2, > > KVM_REG_ARM_STD_BMAP, > > + KVM_REG_ARM_STD_HYP_BMAP, > > }; > > > > void kvm_arm_init_hypercalls(struct kvm *kvm) > > @@ -186,6 +195,7 @@ void kvm_arm_init_hypercalls(struct kvm *kvm) > > struct kvm_hvc_desc *hvc_desc = &kvm->arch.hvc_desc; > > > > hvc_desc->hvc_std_bmap = ARM_SMCCC_STD_FEATURES; > > + hvc_desc->hvc_std_hyp_bmap = ARM_SMCCC_STD_HYP_FEATURES; > > } > > > > int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu) > > @@ -272,6 +282,9 @@ int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > > case KVM_REG_ARM_STD_BMAP: > > val = READ_ONCE(hvc_desc->hvc_std_bmap); > > break; > > + case KVM_REG_ARM_STD_HYP_BMAP: > > + val = READ_ONCE(hvc_desc->hvc_std_hyp_bmap); > > + break; > > default: > > return -ENOENT; > > } > > @@ -294,6 +307,10 @@ static int kvm_arm_set_fw_reg_bmap(struct kvm_vcpu *vcpu, u64 reg_id, u64 val) > > fw_reg_bmap = &hvc_desc->hvc_std_bmap; > > fw_reg_features = ARM_SMCCC_STD_FEATURES; > > break; > > + case KVM_REG_ARM_STD_HYP_BMAP: > > + fw_reg_bmap = &hvc_desc->hvc_std_hyp_bmap; > > + fw_reg_features = ARM_SMCCC_STD_HYP_FEATURES; > > + break; > > default: > > return -ENOENT; > > } > > @@ -398,6 +415,7 @@ int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > > > > return 0; > > case KVM_REG_ARM_STD_BMAP: > > + case KVM_REG_ARM_STD_HYP_BMAP: > > return kvm_arm_set_fw_reg_bmap(vcpu, reg_id, val); > > default: > > return -ENOENT; > > diff --git a/include/kvm/arm_hypercalls.h b/include/kvm/arm_hypercalls.h > > index 64d30b452809..a1cb6e839c74 100644 > > --- a/include/kvm/arm_hypercalls.h > > +++ b/include/kvm/arm_hypercalls.h > > @@ -9,6 +9,9 @@ > > #define ARM_SMCCC_STD_FEATURES \ > > GENMASK_ULL(KVM_REG_ARM_STD_BMAP_BIT_MAX, 0) > > > > +#define ARM_SMCCC_STD_HYP_FEATURES \ > > + GENMASK_ULL(KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX, 0) > > + > > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu); > > > > static inline u32 smccc_get_function(struct kvm_vcpu *vcpu) > > -- > > 2.35.1.473.g83b2b277ed-goog > > 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 Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CB27C433FE for ; Tue, 15 Mar 2022 00:23:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 1C56B49EAC; Mon, 14 Mar 2022 20:23:44 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VLlLTpADqUqZ; Mon, 14 Mar 2022 20:23:42 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 94BBE49ED7; Mon, 14 Mar 2022 20:23:42 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id CC5D149E35 for ; Mon, 14 Mar 2022 20:23:41 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J5hjjPLyjN44 for ; Mon, 14 Mar 2022 20:23:40 -0400 (EDT) Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 9049A49E2B for ; Mon, 14 Mar 2022 20:23:40 -0400 (EDT) Received: by mail-yb1-f177.google.com with SMTP id m67so788852ybm.4 for ; Mon, 14 Mar 2022 17:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=EGfNWx74UGuUub5piWt3tsVOuTbPS9Nq0NSKYIwZfOc=; b=PYRfwuzfXlVuwTmkFVHsCaGsito8gFKFX2Q5Ixo4mOCFQegWQ3Ua2OPPOyN3A0VimE Q3DNZDn0azVbow/4cs7W963T2YreqnPHkXWXX60007eVdm/TIwcbMxgLqqH5+XzO4yHM GUiu2DUkVT79FkM54HgFWJb2rPzZN2SE77olXoMm5rnY4A+F/HizB7IDBdvQ5dQ8Yf6l Psc/LChDPo9yVp7pL2PdGYEA6xTADKKX+PVtMqWag0gBVoGxx7n6y9xmQq7DerQ/2CVW 2go7i1Gdudvc7dveN2yVpzs4YRCoHosYoelNlPhGpvwZ14oklaed28LZ9BgCFhrR67UN FMVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EGfNWx74UGuUub5piWt3tsVOuTbPS9Nq0NSKYIwZfOc=; b=awlpvQPJtlLSd9HjLkgLJ96aRQy1COdRWbJ/3Q/5IaRj0UsXfDt2lPTnBTj1R33/13 hvuw6FkVLizPOxSeSkm/h72PR9TNOPbEIQyCmXbFRnHsTEGiLQwSiAR2iLx3kL8D3Rdg mK31hb6EgJY7mftCJ12Qwmtc/Ohv0Uswh5pPGyTMaB+rvNhtUhcIc6XFCuF80xbKJ9CT vO6fYvvWozDMJtX42Nlr8hgf0UYtlzLenkz66KscMcx3mzvce/KpAOfaphHx+bXxpgiC 0dQYbLGwMe0ISa8EVWo07XScrzzGvRhF/tqFzdC9WDKnMzhMXgJGf0RE1yK4E7vexKYZ ZeoA== X-Gm-Message-State: AOAM530DGXCiRqyFmeeFkHFTfvBjqHWpX4jqjdQqGCT7V74KqwYXCEFo 3tiBjqzmIhArHcpMfhQqD+3jWtNergJ/l5MRdiFtPg== X-Google-Smtp-Source: ABdhPJwfwj8uxFtCbOhp08GGf72OizUn5mMAatGc9XWM0wr+mGQO9ZtqIutLsRpwHCI+V+8WZgRGYPvDEQOa43mJIy8= X-Received: by 2002:a25:d512:0:b0:61d:aded:1743 with SMTP id r18-20020a25d512000000b0061daded1743mr19336522ybe.526.1647303819857; Mon, 14 Mar 2022 17:23:39 -0700 (PDT) MIME-Version: 1.0 References: <20220224172559.4170192-1-rananta@google.com> <20220224172559.4170192-7-rananta@google.com> In-Reply-To: From: Raghavendra Rao Ananta Date: Mon, 14 Mar 2022 17:23:27 -0700 Message-ID: Subject: Re: [PATCH v4 06/13] KVM: arm64: Add standard hypervisor firmware register To: Oliver Upton Cc: kvm@vger.kernel.org, Will Deacon , Marc Zyngier , Peter Shier , linux-kernel@vger.kernel.org, Catalin Marinas , Paolo Bonzini , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Mon, Mar 14, 2022 at 12:45 PM Oliver Upton wrote: > > On Thu, Feb 24, 2022 at 05:25:52PM +0000, Raghavendra Rao Ananta wrote: > > Introduce the firmware register to hold the standard hypervisor > > service calls (owner value 5) as a bitmap. The bitmap represents > > the features that'll be enabled for the guest, as configured by > > the user-space. Currently, this includes support only for > > Paravirtualized time, represented by bit-0. > > > > The register is also added to the kvm_arm_vm_scope_fw_regs[] list > > as it maintains its state per-VM. > > > > Signed-off-by: Raghavendra Rao Ananta > > --- > > arch/arm64/include/asm/kvm_host.h | 2 ++ > > arch/arm64/include/uapi/asm/kvm.h | 4 ++++ > > arch/arm64/kvm/guest.c | 1 + > > arch/arm64/kvm/hypercalls.c | 20 +++++++++++++++++++- > > include/kvm/arm_hypercalls.h | 3 +++ > > 5 files changed, 29 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index 1909ced3208f..318148b69279 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -105,9 +105,11 @@ struct kvm_arch_memory_slot { > > * struct kvm_hvc_desc: KVM ARM64 hypercall descriptor > > * > > * @hvc_std_bmap: Bitmap of standard secure service calls > > + * @hvc_std_hyp_bmap: Bitmap of standard hypervisor service calls > > */ > > struct kvm_hvc_desc { > > u64 hvc_std_bmap; > > + u64 hvc_std_hyp_bmap; > > }; > > > > struct kvm_arch { > > diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h > > index 2decc30d6b84..9a2caead7359 100644 > > --- a/arch/arm64/include/uapi/asm/kvm.h > > +++ b/arch/arm64/include/uapi/asm/kvm.h > > @@ -295,6 +295,10 @@ struct kvm_arm_copy_mte_tags { > > #define KVM_REG_ARM_STD_BIT_TRNG_V1_0 BIT(0) > > #define KVM_REG_ARM_STD_BMAP_BIT_MAX 0 /* Last valid bit */ > > > > +#define KVM_REG_ARM_STD_HYP_BMAP KVM_REG_ARM_FW_BMAP_REG(1) > > +#define KVM_REG_ARM_STD_HYP_BIT_PV_TIME BIT(0) > > +#define KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX 0 /* Last valid bit */ > > + > > /* SVE registers */ > > #define KVM_REG_ARM64_SVE (0x15 << KVM_REG_ARM_COPROC_SHIFT) > > > > diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c > > index d66e6c742bbe..c42426d6137e 100644 > > --- a/arch/arm64/kvm/guest.c > > +++ b/arch/arm64/kvm/guest.c > > @@ -66,6 +66,7 @@ static const u64 kvm_arm_vm_scope_fw_regs[] = { > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1, > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2, > > KVM_REG_ARM_STD_BMAP, > > + KVM_REG_ARM_STD_HYP_BMAP, > > }; > > > > /** > > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c > > index 48c126c3da72..ebc0cc26cf2e 100644 > > --- a/arch/arm64/kvm/hypercalls.c > > +++ b/arch/arm64/kvm/hypercalls.c > > @@ -75,6 +75,10 @@ static bool kvm_hvc_call_supported(struct kvm_vcpu *vcpu, u32 func_id) > > case ARM_SMCCC_TRNG_RND64: > > return kvm_arm_fw_reg_feat_enabled(hvc_desc->hvc_std_bmap, > > KVM_REG_ARM_STD_BIT_TRNG_V1_0); > > + case ARM_SMCCC_HV_PV_TIME_FEATURES: > > + case ARM_SMCCC_HV_PV_TIME_ST: > > + return kvm_arm_fw_reg_feat_enabled(hvc_desc->hvc_std_hyp_bmap, > > + KVM_REG_ARM_STD_HYP_BIT_PV_TIME); > > default: > > /* By default, allow the services that aren't listed here */ > > return true; > > @@ -83,6 +87,7 @@ static bool kvm_hvc_call_supported(struct kvm_vcpu *vcpu, u32 func_id) > > > > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) > > { > > + struct kvm_hvc_desc *hvc_desc = &vcpu->kvm->arch.hvc_desc; > > u32 func_id = smccc_get_function(vcpu); > > u64 val[4] = {SMCCC_RET_NOT_SUPPORTED}; > > u32 feature; > > @@ -134,7 +139,10 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) > > } > > break; > > case ARM_SMCCC_HV_PV_TIME_FEATURES: > > - val[0] = SMCCC_RET_SUCCESS; > > + if (kvm_arm_fw_reg_feat_enabled( > > + hvc_desc->hvc_std_hyp_bmap, > > It is probably OK to keep this parameter on the line above (just stay > under 100 characters a line). > Will rearrange this in the next series. Thanks. Regards, Raghavendra > > + KVM_REG_ARM_STD_HYP_BIT_PV_TIME)) > > + val[0] = SMCCC_RET_SUCCESS; > > break; > > } > > break; > > @@ -179,6 +187,7 @@ static const u64 kvm_arm_fw_reg_ids[] = { > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1, > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2, > > KVM_REG_ARM_STD_BMAP, > > + KVM_REG_ARM_STD_HYP_BMAP, > > }; > > > > void kvm_arm_init_hypercalls(struct kvm *kvm) > > @@ -186,6 +195,7 @@ void kvm_arm_init_hypercalls(struct kvm *kvm) > > struct kvm_hvc_desc *hvc_desc = &kvm->arch.hvc_desc; > > > > hvc_desc->hvc_std_bmap = ARM_SMCCC_STD_FEATURES; > > + hvc_desc->hvc_std_hyp_bmap = ARM_SMCCC_STD_HYP_FEATURES; > > } > > > > int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu) > > @@ -272,6 +282,9 @@ int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > > case KVM_REG_ARM_STD_BMAP: > > val = READ_ONCE(hvc_desc->hvc_std_bmap); > > break; > > + case KVM_REG_ARM_STD_HYP_BMAP: > > + val = READ_ONCE(hvc_desc->hvc_std_hyp_bmap); > > + break; > > default: > > return -ENOENT; > > } > > @@ -294,6 +307,10 @@ static int kvm_arm_set_fw_reg_bmap(struct kvm_vcpu *vcpu, u64 reg_id, u64 val) > > fw_reg_bmap = &hvc_desc->hvc_std_bmap; > > fw_reg_features = ARM_SMCCC_STD_FEATURES; > > break; > > + case KVM_REG_ARM_STD_HYP_BMAP: > > + fw_reg_bmap = &hvc_desc->hvc_std_hyp_bmap; > > + fw_reg_features = ARM_SMCCC_STD_HYP_FEATURES; > > + break; > > default: > > return -ENOENT; > > } > > @@ -398,6 +415,7 @@ int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > > > > return 0; > > case KVM_REG_ARM_STD_BMAP: > > + case KVM_REG_ARM_STD_HYP_BMAP: > > return kvm_arm_set_fw_reg_bmap(vcpu, reg_id, val); > > default: > > return -ENOENT; > > diff --git a/include/kvm/arm_hypercalls.h b/include/kvm/arm_hypercalls.h > > index 64d30b452809..a1cb6e839c74 100644 > > --- a/include/kvm/arm_hypercalls.h > > +++ b/include/kvm/arm_hypercalls.h > > @@ -9,6 +9,9 @@ > > #define ARM_SMCCC_STD_FEATURES \ > > GENMASK_ULL(KVM_REG_ARM_STD_BMAP_BIT_MAX, 0) > > > > +#define ARM_SMCCC_STD_HYP_FEATURES \ > > + GENMASK_ULL(KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX, 0) > > + > > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu); > > > > static inline u32 smccc_get_function(struct kvm_vcpu *vcpu) > > -- > > 2.35.1.473.g83b2b277ed-goog > > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9981C433EF for ; Tue, 15 Mar 2022 00:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oSKkcEI+JMepJxWV9jZPCYYAYRIL1u1q8tkP412UrmE=; b=f6dIee/Sk9ZOrb eRfBGXSMlC4HBFRo7qlU49FG5m0B21Wo3vPeRA4vkl9+5JpfvVFFtE+/dZvsk2xFnUr3rvHnxHlRc 1icoZ9oV6KiOGOBSu9/1988zwESxFd/kR3kSQO5v+0P6weuLF51qUtiepgfcMmR2YPuDwbZnigd/r yp3V5kQWMWME6LVi98jWNjjrWJo+S7DFGt0rwu2nXV/oaSwadAgPWI4ht33pnNBaQEzlkdTT5xNPV eP+87zCyAJAt9eIlNFw0PAOcNkbrVuS/Q7NBARYxIDZgEtgN7l5cSYElNu5XF1KS7qCFQoFPJw3OZ 65juqJQ/rarSWirRgM0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTuyY-007J4F-FW; Tue, 15 Mar 2022 00:23:46 +0000 Received: from mail-yb1-xb33.google.com ([2607:f8b0:4864:20::b33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTuyU-007J2D-Vz for linux-arm-kernel@lists.infradead.org; Tue, 15 Mar 2022 00:23:44 +0000 Received: by mail-yb1-xb33.google.com with SMTP id v130so34151062ybe.13 for ; Mon, 14 Mar 2022 17:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=EGfNWx74UGuUub5piWt3tsVOuTbPS9Nq0NSKYIwZfOc=; b=PYRfwuzfXlVuwTmkFVHsCaGsito8gFKFX2Q5Ixo4mOCFQegWQ3Ua2OPPOyN3A0VimE Q3DNZDn0azVbow/4cs7W963T2YreqnPHkXWXX60007eVdm/TIwcbMxgLqqH5+XzO4yHM GUiu2DUkVT79FkM54HgFWJb2rPzZN2SE77olXoMm5rnY4A+F/HizB7IDBdvQ5dQ8Yf6l Psc/LChDPo9yVp7pL2PdGYEA6xTADKKX+PVtMqWag0gBVoGxx7n6y9xmQq7DerQ/2CVW 2go7i1Gdudvc7dveN2yVpzs4YRCoHosYoelNlPhGpvwZ14oklaed28LZ9BgCFhrR67UN FMVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EGfNWx74UGuUub5piWt3tsVOuTbPS9Nq0NSKYIwZfOc=; b=5OtR15kNjglxq/NwaxhRPbTqKFf2ErVUo0gvyCeHFYbOtKEClrnAtyCAnap6ePRkUU YPXr0Sa+gc7LTFR+UvKunfTSX9I8fbl2S4X/fcP+1DwpE1xewgHH9mOyBTqQxaRSzISX CmIz2ubqP1ZE6rgInmUSfJam7SAAvBP1df7F5pSTh5LYjM3kTwVTmnXYEFm9HkZrmrNc 8g4wBh75WRTVm9CUGSUjZ0jGSnMOUrEo071JsaB+Y/+RneXWkx7Dyeyoukuzj058g8cJ 1wHjW11r9m4ZTLL7bVttkpVz9ptykd3OnaeJQxUsED9a4a+uHFU91r+V2xbgUXdJ/Oeh pHJQ== X-Gm-Message-State: AOAM533QU+XxFUjlxIDX+OoGTXcEM9H3gTvPHJuDBuRrpcR8bPAvK/E4 ycqeycbxnANOuxjgUBreGDbSpDY60mBQTv1HFH+UYA== X-Google-Smtp-Source: ABdhPJwfwj8uxFtCbOhp08GGf72OizUn5mMAatGc9XWM0wr+mGQO9ZtqIutLsRpwHCI+V+8WZgRGYPvDEQOa43mJIy8= X-Received: by 2002:a25:d512:0:b0:61d:aded:1743 with SMTP id r18-20020a25d512000000b0061daded1743mr19336522ybe.526.1647303819857; Mon, 14 Mar 2022 17:23:39 -0700 (PDT) MIME-Version: 1.0 References: <20220224172559.4170192-1-rananta@google.com> <20220224172559.4170192-7-rananta@google.com> In-Reply-To: From: Raghavendra Rao Ananta Date: Mon, 14 Mar 2022 17:23:27 -0700 Message-ID: Subject: Re: [PATCH v4 06/13] KVM: arm64: Add standard hypervisor firmware register To: Oliver Upton Cc: Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose , Paolo Bonzini , Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Reiji Watanabe , Jing Zhang , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220314_172343_061520_4ACD6DC4 X-CRM114-Status: GOOD ( 28.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Mon, Mar 14, 2022 at 12:45 PM Oliver Upton wrote: > > On Thu, Feb 24, 2022 at 05:25:52PM +0000, Raghavendra Rao Ananta wrote: > > Introduce the firmware register to hold the standard hypervisor > > service calls (owner value 5) as a bitmap. The bitmap represents > > the features that'll be enabled for the guest, as configured by > > the user-space. Currently, this includes support only for > > Paravirtualized time, represented by bit-0. > > > > The register is also added to the kvm_arm_vm_scope_fw_regs[] list > > as it maintains its state per-VM. > > > > Signed-off-by: Raghavendra Rao Ananta > > --- > > arch/arm64/include/asm/kvm_host.h | 2 ++ > > arch/arm64/include/uapi/asm/kvm.h | 4 ++++ > > arch/arm64/kvm/guest.c | 1 + > > arch/arm64/kvm/hypercalls.c | 20 +++++++++++++++++++- > > include/kvm/arm_hypercalls.h | 3 +++ > > 5 files changed, 29 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index 1909ced3208f..318148b69279 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -105,9 +105,11 @@ struct kvm_arch_memory_slot { > > * struct kvm_hvc_desc: KVM ARM64 hypercall descriptor > > * > > * @hvc_std_bmap: Bitmap of standard secure service calls > > + * @hvc_std_hyp_bmap: Bitmap of standard hypervisor service calls > > */ > > struct kvm_hvc_desc { > > u64 hvc_std_bmap; > > + u64 hvc_std_hyp_bmap; > > }; > > > > struct kvm_arch { > > diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h > > index 2decc30d6b84..9a2caead7359 100644 > > --- a/arch/arm64/include/uapi/asm/kvm.h > > +++ b/arch/arm64/include/uapi/asm/kvm.h > > @@ -295,6 +295,10 @@ struct kvm_arm_copy_mte_tags { > > #define KVM_REG_ARM_STD_BIT_TRNG_V1_0 BIT(0) > > #define KVM_REG_ARM_STD_BMAP_BIT_MAX 0 /* Last valid bit */ > > > > +#define KVM_REG_ARM_STD_HYP_BMAP KVM_REG_ARM_FW_BMAP_REG(1) > > +#define KVM_REG_ARM_STD_HYP_BIT_PV_TIME BIT(0) > > +#define KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX 0 /* Last valid bit */ > > + > > /* SVE registers */ > > #define KVM_REG_ARM64_SVE (0x15 << KVM_REG_ARM_COPROC_SHIFT) > > > > diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c > > index d66e6c742bbe..c42426d6137e 100644 > > --- a/arch/arm64/kvm/guest.c > > +++ b/arch/arm64/kvm/guest.c > > @@ -66,6 +66,7 @@ static const u64 kvm_arm_vm_scope_fw_regs[] = { > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1, > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2, > > KVM_REG_ARM_STD_BMAP, > > + KVM_REG_ARM_STD_HYP_BMAP, > > }; > > > > /** > > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c > > index 48c126c3da72..ebc0cc26cf2e 100644 > > --- a/arch/arm64/kvm/hypercalls.c > > +++ b/arch/arm64/kvm/hypercalls.c > > @@ -75,6 +75,10 @@ static bool kvm_hvc_call_supported(struct kvm_vcpu *vcpu, u32 func_id) > > case ARM_SMCCC_TRNG_RND64: > > return kvm_arm_fw_reg_feat_enabled(hvc_desc->hvc_std_bmap, > > KVM_REG_ARM_STD_BIT_TRNG_V1_0); > > + case ARM_SMCCC_HV_PV_TIME_FEATURES: > > + case ARM_SMCCC_HV_PV_TIME_ST: > > + return kvm_arm_fw_reg_feat_enabled(hvc_desc->hvc_std_hyp_bmap, > > + KVM_REG_ARM_STD_HYP_BIT_PV_TIME); > > default: > > /* By default, allow the services that aren't listed here */ > > return true; > > @@ -83,6 +87,7 @@ static bool kvm_hvc_call_supported(struct kvm_vcpu *vcpu, u32 func_id) > > > > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) > > { > > + struct kvm_hvc_desc *hvc_desc = &vcpu->kvm->arch.hvc_desc; > > u32 func_id = smccc_get_function(vcpu); > > u64 val[4] = {SMCCC_RET_NOT_SUPPORTED}; > > u32 feature; > > @@ -134,7 +139,10 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) > > } > > break; > > case ARM_SMCCC_HV_PV_TIME_FEATURES: > > - val[0] = SMCCC_RET_SUCCESS; > > + if (kvm_arm_fw_reg_feat_enabled( > > + hvc_desc->hvc_std_hyp_bmap, > > It is probably OK to keep this parameter on the line above (just stay > under 100 characters a line). > Will rearrange this in the next series. Thanks. Regards, Raghavendra > > + KVM_REG_ARM_STD_HYP_BIT_PV_TIME)) > > + val[0] = SMCCC_RET_SUCCESS; > > break; > > } > > break; > > @@ -179,6 +187,7 @@ static const u64 kvm_arm_fw_reg_ids[] = { > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_1, > > KVM_REG_ARM_SMCCC_ARCH_WORKAROUND_2, > > KVM_REG_ARM_STD_BMAP, > > + KVM_REG_ARM_STD_HYP_BMAP, > > }; > > > > void kvm_arm_init_hypercalls(struct kvm *kvm) > > @@ -186,6 +195,7 @@ void kvm_arm_init_hypercalls(struct kvm *kvm) > > struct kvm_hvc_desc *hvc_desc = &kvm->arch.hvc_desc; > > > > hvc_desc->hvc_std_bmap = ARM_SMCCC_STD_FEATURES; > > + hvc_desc->hvc_std_hyp_bmap = ARM_SMCCC_STD_HYP_FEATURES; > > } > > > > int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu) > > @@ -272,6 +282,9 @@ int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > > case KVM_REG_ARM_STD_BMAP: > > val = READ_ONCE(hvc_desc->hvc_std_bmap); > > break; > > + case KVM_REG_ARM_STD_HYP_BMAP: > > + val = READ_ONCE(hvc_desc->hvc_std_hyp_bmap); > > + break; > > default: > > return -ENOENT; > > } > > @@ -294,6 +307,10 @@ static int kvm_arm_set_fw_reg_bmap(struct kvm_vcpu *vcpu, u64 reg_id, u64 val) > > fw_reg_bmap = &hvc_desc->hvc_std_bmap; > > fw_reg_features = ARM_SMCCC_STD_FEATURES; > > break; > > + case KVM_REG_ARM_STD_HYP_BMAP: > > + fw_reg_bmap = &hvc_desc->hvc_std_hyp_bmap; > > + fw_reg_features = ARM_SMCCC_STD_HYP_FEATURES; > > + break; > > default: > > return -ENOENT; > > } > > @@ -398,6 +415,7 @@ int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > > > > return 0; > > case KVM_REG_ARM_STD_BMAP: > > + case KVM_REG_ARM_STD_HYP_BMAP: > > return kvm_arm_set_fw_reg_bmap(vcpu, reg_id, val); > > default: > > return -ENOENT; > > diff --git a/include/kvm/arm_hypercalls.h b/include/kvm/arm_hypercalls.h > > index 64d30b452809..a1cb6e839c74 100644 > > --- a/include/kvm/arm_hypercalls.h > > +++ b/include/kvm/arm_hypercalls.h > > @@ -9,6 +9,9 @@ > > #define ARM_SMCCC_STD_FEATURES \ > > GENMASK_ULL(KVM_REG_ARM_STD_BMAP_BIT_MAX, 0) > > > > +#define ARM_SMCCC_STD_HYP_FEATURES \ > > + GENMASK_ULL(KVM_REG_ARM_STD_HYP_BMAP_BIT_MAX, 0) > > + > > int kvm_hvc_call_handler(struct kvm_vcpu *vcpu); > > > > static inline u32 smccc_get_function(struct kvm_vcpu *vcpu) > > -- > > 2.35.1.473.g83b2b277ed-goog > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel