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=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 C8F21C432BE for ; Tue, 27 Jul 2021 18:10:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B5CB860F59 for ; Tue, 27 Jul 2021 18:10:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230271AbhG0SKe (ORCPT ); Tue, 27 Jul 2021 14:10:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:53860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbhG0SKd (ORCPT ); Tue, 27 Jul 2021 14:10:33 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1A0B060F4F; Tue, 27 Jul 2021 18:10:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627409433; bh=eAQ6Y5NFEbqzK+Qxa6eEtOaPVZxtmmYG8Cp8wn4awk0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZUdLTBGArL4F4dnHexEQOVZW0mHKBsiDWS3JVNmUjI74QPdj4B6Ri+jpbUV/xu6vi eR6EWfI50nJjGQ/Ud9qNfpzAu7g5qbFLSRBRr9LLgHzuiDlwmyBpqwt1rksx5FXj+W RjKFbP2JQp0zt2oawjyukgEhkFC/vYhsgmCrBT3mOYBm8yz2k/zHY5fu0Lw8eMA6dD wF3F28tyugzeNkNeGJ3McDWo3mCY7B/yGl/Vawcltq99rALZWYg5zEeeydatefT0q2 kA0irLtyHyn9i0FTjNibDfHiuOyP/Jund7o+A26RksFueTTT9tcVaYWmuBPYjuV6j3 xcNbI/axou1ew== Date: Tue, 27 Jul 2021 19:10:27 +0100 From: Will Deacon To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, qperret@google.com, dbrazdil@google.com, Srivatsa Vaddagiri , Shanker R Donthineni , James Morse , Suzuki K Poulose , Alexandru Elisei , kernel-team@android.com Subject: Re: [PATCH 01/16] KVM: arm64: Generalise VM features into a set of flags Message-ID: <20210727181026.GA19173@willie-the-truck> References: <20210715163159.1480168-1-maz@kernel.org> <20210715163159.1480168-2-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210715163159.1480168-2-maz@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 15, 2021 at 05:31:44PM +0100, Marc Zyngier wrote: > We currently deal with a set of booleans for VM features, > while they could be better represented as set of flags > contained in an unsigned long, similarily to what we are > doing on the CPU side. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/include/asm/kvm_host.h | 12 +++++++----- > arch/arm64/kvm/arm.c | 5 +++-- > arch/arm64/kvm/mmio.c | 3 ++- > 3 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 41911585ae0c..4add6c27251f 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -122,7 +122,10 @@ struct kvm_arch { > * should) opt in to this feature if KVM_CAP_ARM_NISV_TO_USER is > * supported. > */ > - bool return_nisv_io_abort_to_user; > +#define KVM_ARCH_FLAG_RETURN_NISV_IO_ABORT_TO_USER 0 > + /* Memory Tagging Extension enabled for the guest */ > +#define KVM_ARCH_FLAG_MTE_ENABLED 1 > + unsigned long flags; One downside of packing all these together is that updating 'flags' now requires an atomic rmw sequence (i.e. set_bit()). Then again, that's probably for the best anyway given that kvm_vm_ioctl_enable_cap() looks like it doesn't hold any locks. > /* > * VM-wide PMU filter, implemented as a bitmap and big enough for > @@ -133,9 +136,6 @@ struct kvm_arch { > > u8 pfr0_csv2; > u8 pfr0_csv3; > - > - /* Memory Tagging Extension enabled for the guest */ > - bool mte_enabled; > }; > > struct kvm_vcpu_fault_info { > @@ -777,7 +777,9 @@ 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_has_mte(kvm) (system_supports_mte() && (kvm)->arch.mte_enabled) > +#define kvm_has_mte(kvm) \ > + (system_supports_mte() && \ > + test_bit(KVM_ARCH_FLAG_MTE_ENABLED, &(kvm)->arch.flags)) Not an issue with this patch, but I just noticed that the system_supports_mte() check is redundant here as we only allow the flag to be set if that's already the case. Will