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 021B5C433EF for ; Thu, 9 Jun 2022 06:17:15 +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=9i0X4hKQMZEzJAnAutepERPE8bm7aCG7qhFtXcG0EQc=; b=Ce0vIGgF5nrjtS S7BUjfsG0HalNVahtQD98udPyWplp8Umw4ITQkW0GsmicyMIQpQSSbr8zxK5FNRkxHhq3V+ZILPrO r/AA5Qx1z6znX4fqnPC/UABbU+lUxV5j7U1kCYKhhFFpdMDHwwh47DwvozhxNIkSXKJcZr6s6lnF8 0Jy5Ssk6w/33JhdG1wHL8BX0aphtQ+yhG/XmbYr7y4MI4KoSTJUHE+SuZnggBYNZXw7XsPmrYnanj TP3MHHWkX0W/2F+ppqlgoauvwAURMUzhCkMzaasQb4zp5SKZNR3NG3Ec9nDS8Xt9vpc5w9aYJOeoz onUn8Ib4RRKFFg4kMpTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzBSm-00H2J0-KJ; Thu, 09 Jun 2022 06:16:12 +0000 Received: from mail-oa1-x33.google.com ([2001:4860:4864:20::33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nzBSi-00H2Hm-KH for linux-arm-kernel@lists.infradead.org; Thu, 09 Jun 2022 06:16:10 +0000 Received: by mail-oa1-x33.google.com with SMTP id 586e51a60fabf-f2a4c51c45so29883778fac.9 for ; Wed, 08 Jun 2022 23:16:07 -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=/Z/1XTBKe1QWw98t46G1hNo7RgHv61Hc5Y6PJukHBko=; b=fkv+CAJR3Ffi7S0b0VTixB/Pb7JeMn6ZtnJSPTbyo34o893ptmubNaOhtImaGIow5/ hBT02/qz5ELlaAuyx5hof3GQb79MONUthEXjruk2Pm6cxRXuAg6FKLqt8azO/XZXOpMW cjqv2dhW8KgLtX7WI9cm4S/v/v1KTdSkZwDKwgY7Ym4nrvHmXXHY4uVyiGpvtwqDMf8Q wzM0WHOAZ4WLuDIC5i4+pgMaWgCct3Cf98a7luDufg0HAIZINbx/+knXTBSmWLYmEw1B KWbFicxkMimB2vSE+uag41fob+QqwYqTc1nUV+dgY67jry3oIIQC9G7dBC9GZY/8QbKn pyew== 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=/Z/1XTBKe1QWw98t46G1hNo7RgHv61Hc5Y6PJukHBko=; b=KfaZB1oD/OSBsZYhHfGEGqvgjISwkwP/FSWeiUSKTRj3ck6+e+QIPikndGIA/giwFB YED3H7G4GGCuelXPLhONQtbFzijxaWrJCMMgVBV2aaGOsXrMwwe6E7BEUDokOM5XlEL0 I/8jZKgXxmCdLQTN42iZWBDsUgo/ezr+BfYmFGpkfmgj88qZ7VMImOb83tded6Nd6y2Z RXtvYQoBxtBBmDWh4xeN/5839AcQjPeXmfvmlGxLNGB7Xy4vWpzR/+YXVmAHg9qOWma6 U0CaGyCpb243qIJIp3jS1bcKZ5OZ+StqVAqdqthR0jeuM13lu7YkaguHQ7QdwXOzFlH4 6pow== X-Gm-Message-State: AOAM531n14k5pFb5+qZCi/P/80k/C29dS/0kjWmJmTB1rrRtbS3B8ugT j1gdZYXASrOpSLOaBUzWMSVzNB5XemRB/ynwxGehhw== X-Google-Smtp-Source: ABdhPJxuZNri2roMZCEB2LGASmwWsTjThZXGjNAEetdXoOcgFQbw6VAtsZpP1s2K4b8NuHuoFRKboLKUW48EoyIanrs= X-Received: by 2002:a05:6870:5a8:b0:f4:2cf8:77eb with SMTP id m40-20020a05687005a800b000f42cf877ebmr844978oap.16.1654755366304; Wed, 08 Jun 2022 23:16:06 -0700 (PDT) MIME-Version: 1.0 References: <20220528113829.1043361-1-maz@kernel.org> <20220528113829.1043361-8-maz@kernel.org> In-Reply-To: <20220528113829.1043361-8-maz@kernel.org> From: Reiji Watanabe Date: Wed, 8 Jun 2022 23:15:50 -0700 Message-ID: Subject: Re: [PATCH 07/18] KVM: arm64: Move vcpu configuration flags into their own set To: Marc Zyngier Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Linux ARM , kernel-team@android.com, Will Deacon , Mark Brown X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220608_231608_705662_9C372BBC X-CRM114-Status: GOOD ( 23.05 ) 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 Sat, May 28, 2022 at 4:38 AM Marc Zyngier wrote: > > The KVM_ARM64_{GUEST_HAS_SVE,VCPU_SVE_FINALIZED,GUEST_HAS_PTRAUTH} > flags are purely configuration flags. Once set, they are never cleared, > but evaluated all over the code base. > > Move these three flags into the configuration set in one go, using > the new accessors, and take this opportunity to drop the KVM_ARM64_ > prefix which doesn't provide any help. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/include/asm/kvm_host.h | 17 ++++++++++------- > arch/arm64/kvm/reset.c | 6 +++--- > 2 files changed, 13 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index c9dd0d4e22f2..2b8f1265eade 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -459,6 +459,13 @@ struct kvm_vcpu_arch { > #define __flag_unpack(_set, _f, _m) _f > #define vcpu_flag_unpack(...) __flag_unpack(__VA_ARGS__) > > +/* SVE exposed to guest */ > +#define GUEST_HAS_SVE __vcpu_single_flag(cflags, BIT(0)) > +/* SVE config completed */ > +#define VCPU_SVE_FINALIZED __vcpu_single_flag(cflags, BIT(1)) > +/* PTRAUTH exposed to guest */ > +#define GUEST_HAS_PTRAUTH __vcpu_single_flag(cflags, BIT(2)) > + > > /* Pointer to the vcpu's SVE FFR for sve_{save,load}_state() */ > #define vcpu_sve_pffr(vcpu) (kern_hyp_va((vcpu)->arch.sve_state) + \ > @@ -483,9 +490,6 @@ struct kvm_vcpu_arch { > /* vcpu_arch flags field values: */ > #define KVM_ARM64_DEBUG_DIRTY (1 << 0) > #define KVM_ARM64_HOST_SVE_ENABLED (1 << 4) /* SVE enabled for EL0 */ > -#define KVM_ARM64_GUEST_HAS_SVE (1 << 5) /* SVE exposed to guest */ > -#define KVM_ARM64_VCPU_SVE_FINALIZED (1 << 6) /* SVE config completed */ > -#define KVM_ARM64_GUEST_HAS_PTRAUTH (1 << 7) /* PTRAUTH exposed to guest */ > #define KVM_ARM64_PENDING_EXCEPTION (1 << 8) /* Exception pending */ > /* > * Overlaps with KVM_ARM64_EXCEPT_MASK on purpose so that it can't be > @@ -522,13 +526,13 @@ struct kvm_vcpu_arch { > KVM_GUESTDBG_SINGLESTEP) > > #define vcpu_has_sve(vcpu) (system_supports_sve() && \ > - ((vcpu)->arch.flags & KVM_ARM64_GUEST_HAS_SVE)) > + vcpu_get_flag((vcpu), GUEST_HAS_SVE)) Minor nit: The parentheses around the vcpu above would be unnecessary. (as was omitted for vcpu_has_ptrauth/kvm_arm_vcpu_sve_finalized) Reviewed-by: Reiji Watanabe The new infrastructure for those flags looks nice. Thanks! Reiji > > #ifdef CONFIG_ARM64_PTR_AUTH > #define vcpu_has_ptrauth(vcpu) \ > ((cpus_have_final_cap(ARM64_HAS_ADDRESS_AUTH) || \ > cpus_have_final_cap(ARM64_HAS_GENERIC_AUTH)) && \ > - (vcpu)->arch.flags & KVM_ARM64_GUEST_HAS_PTRAUTH) > + vcpu_get_flag(vcpu, GUEST_HAS_PTRAUTH)) > #else > #define vcpu_has_ptrauth(vcpu) false > #endif > @@ -885,8 +889,7 @@ void kvm_init_protected_traps(struct kvm_vcpu *vcpu); > int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature); > bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu); > > -#define kvm_arm_vcpu_sve_finalized(vcpu) \ > - ((vcpu)->arch.flags & KVM_ARM64_VCPU_SVE_FINALIZED) > +#define kvm_arm_vcpu_sve_finalized(vcpu) vcpu_get_flag(vcpu, VCPU_SVE_FINALIZED) > > #define kvm_has_mte(kvm) \ > (system_supports_mte() && \ > diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c > index 6c70c6f61c70..0e08fbe68715 100644 > --- a/arch/arm64/kvm/reset.c > +++ b/arch/arm64/kvm/reset.c > @@ -81,7 +81,7 @@ static int kvm_vcpu_enable_sve(struct kvm_vcpu *vcpu) > * KVM_REG_ARM64_SVE_VLS. Allocation is deferred until > * kvm_arm_vcpu_finalize(), which freezes the configuration. > */ > - vcpu->arch.flags |= KVM_ARM64_GUEST_HAS_SVE; > + vcpu_set_flag(vcpu, GUEST_HAS_SVE); > > return 0; > } > @@ -120,7 +120,7 @@ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu) > } > > vcpu->arch.sve_state = buf; > - vcpu->arch.flags |= KVM_ARM64_VCPU_SVE_FINALIZED; > + vcpu_set_flag(vcpu, VCPU_SVE_FINALIZED); > return 0; > } > > @@ -177,7 +177,7 @@ static int kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu) > !system_has_full_ptr_auth()) > return -EINVAL; > > - vcpu->arch.flags |= KVM_ARM64_GUEST_HAS_PTRAUTH; > + vcpu_set_flag(vcpu, GUEST_HAS_PTRAUTH); > return 0; > } > > -- > 2.34.1 > > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel