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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66BFDC433EF for ; Wed, 6 Oct 2021 10:27:13 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1828861181 for ; Wed, 6 Oct 2021 10:27:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1828861181 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=DUQIrKUDDCK4q6KdKsshbwSGmAXYXsx/RVh1AsXggNQ=; b=zRaAifKGtDDWBb c9DlIoYVp6sQazKgo/0xzKQ/P+D9jvjgDpz+Qy2klklbEj16px3d++zsacylAa1ciBqvLlyN4R0XF CtX+GBKcVp/7ho7PD0wf4Vda50TcQ5/Wf+WmPxfmEHZ3g6tbHZqUsKUXvJ2A7I0H8Yl0BaKDTH4fe kj1OB1XW+cJh5GrxowEhfzxz01hPnsTpFZoT4yLgrWsqS6c5HJiYYbii46GcVxhYwwzOHL/jUA5ZQ BdQPOYgamYfrPYrBw3UCCa146GicBPjah0ud8cu5AXB8VPuPIVYpi8Btz90BLVMrVxNAhrsaaQagk V5b9SPz6GoJ/OwqnDRwA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mY46f-00Dqly-EL; Wed, 06 Oct 2021 10:25:01 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mY46b-00Dqkx-5G for linux-arm-kernel@lists.infradead.org; Wed, 06 Oct 2021 10:24:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633515895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MmWiCgB8uSNl6DOPQQvudamwXwcTydeBRX/uLyQwgQA=; b=Ps6uFmceHlYkWsq0hQtEbRVq6i+J46HWCTYaWHNhJ+iF3NyDOPJ7ehcwq/arrsgjhcMgM9 e16iV6dXwrs/dtDnreU+ODnXYiZRk64PJDQYYQ+/YQQlbsrtGVldmWzY1KAoj7KHu7erWK 17Und4MWUuM3bavHCvfTIe1VoYEcfxY= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-578-s0qq0K13PYmR8I5cnSHfbQ-1; Wed, 06 Oct 2021 06:24:54 -0400 X-MC-Unique: s0qq0K13PYmR8I5cnSHfbQ-1 Received: by mail-ed1-f70.google.com with SMTP id bo2-20020a0564020b2200b003db3540f206so1975877edb.23 for ; Wed, 06 Oct 2021 03:24:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=MmWiCgB8uSNl6DOPQQvudamwXwcTydeBRX/uLyQwgQA=; b=i+V9r6/zMW9lmxY2oyHDiiYbbfJhz7y/rMN840bVXfG4vz3Ilp+HFXkEilQS+4UYR+ GrlxlWIHWzjRx9w6UOhmAhCLhj7ArO8yxX386E4RkBtIZxjarPEF7xb/ekAc94VsdqIl PT3J2Rl/+V95HAkokoASyiyfQyPr0ww75Rot34FUX2gvSrSSq1bu07+JqMYfaN/qaVx5 t4sEVSslaPPWBDsmz4leHxxHX/lHwZHAsOZoL0C4uCBH9OO42kDkcb7slL8z5X1nSjwX 68DVOygmX1r4fRuOf933SdAKFIV74PpBkyMcM4VADwgFUDgU8LUWSr0YNT7w0b6c7ENl iEuw== X-Gm-Message-State: AOAM531g4aeFiv8xEEwosgYljGpODTKdtT/B4AZATH5JYESb1ZrbSO6c a2zFIDU9p6EvaLv2v7LPNZ/XBzMJin0jtqErz81OJrguae3ACYOmfaXsFUgZtzuzaOBDcYQghy5 779WpWLH6t+Arr8svcNTsNSQeqa9Qm98Vrdk= X-Received: by 2002:a17:906:7ac4:: with SMTP id k4mr32292454ejo.430.1633515893288; Wed, 06 Oct 2021 03:24:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0zZ6sW7WDT3oke9j4TDRc16AgVPN/PNWxEB0jdSUXa+T95wQObvHtsiMesHktZL1B3vMLxQ== X-Received: by 2002:a17:906:7ac4:: with SMTP id k4mr32292427ejo.430.1633515893066; Wed, 06 Oct 2021 03:24:53 -0700 (PDT) Received: from gator.home (cst2-174-28.cust.vodafone.cz. [31.30.174.28]) by smtp.gmail.com with ESMTPSA id m13sm3872442eda.41.2021.10.06.03.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 03:24:52 -0700 (PDT) Date: Wed, 6 Oct 2021 12:24:50 +0200 From: Andrew Jones To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, will@kernel.org, qperret@google.com, dbrazdil@google.com, Steven Price , Fuad Tabba , Srivatsa Vaddagiri , Shanker R Donthineni , James Morse , Suzuki K Poulose , Alexandru Elisei , kernel-team@android.com Subject: Re: [PATCH v2 01/16] KVM: arm64: Generalise VM features into a set of flags Message-ID: <20211006102450.4fkn46yqfbbh7i6y@gator.home> References: <20211004174849.2831548-1-maz@kernel.org> <20211004174849.2831548-2-maz@kernel.org> MIME-Version: 1.0 In-Reply-To: <20211004174849.2831548-2-maz@kernel.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211006_032457_298151_55B6CADB X-CRM114-Status: GOOD ( 23.93 ) 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, Oct 04, 2021 at 06:48:34PM +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 f8be56d5342b..f63ca8fb4e58 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; > > /* > * 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 { > @@ -786,7 +786,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)) > #define kvm_vcpu_has_pmu(vcpu) \ > (test_bit(KVM_ARM_VCPU_PMU_V3, (vcpu)->arch.features)) > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index fe102cd2e518..ed9c89ec0b4f 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -89,7 +89,8 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, > switch (cap->cap) { > case KVM_CAP_ARM_NISV_TO_USER: > r = 0; > - kvm->arch.return_nisv_io_abort_to_user = true; > + set_bit(KVM_ARCH_FLAG_RETURN_NISV_IO_ABORT_TO_USER, > + &kvm->arch.flags); > break; > case KVM_CAP_ARM_MTE: > mutex_lock(&kvm->lock); > @@ -97,7 +98,7 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, > r = -EINVAL; > } else { > r = 0; > - kvm->arch.mte_enabled = true; > + set_bit(KVM_ARCH_FLAG_MTE_ENABLED, &kvm->arch.flags); > } > mutex_unlock(&kvm->lock); > break; > diff --git a/arch/arm64/kvm/mmio.c b/arch/arm64/kvm/mmio.c > index 3e2d8ba11a02..3dd38a151d2a 100644 > --- a/arch/arm64/kvm/mmio.c > +++ b/arch/arm64/kvm/mmio.c > @@ -135,7 +135,8 @@ int io_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa) > * volunteered to do so, and bail out otherwise. > */ > if (!kvm_vcpu_dabt_isvalid(vcpu)) { > - if (vcpu->kvm->arch.return_nisv_io_abort_to_user) { > + if (test_bit(KVM_ARCH_FLAG_RETURN_NISV_IO_ABORT_TO_USER, > + &vcpu->kvm->arch.flags)) { > run->exit_reason = KVM_EXIT_ARM_NISV; > run->arm_nisv.esr_iss = kvm_vcpu_dabt_iss_nisv_sanitized(vcpu); > run->arm_nisv.fault_ipa = fault_ipa; > -- > 2.30.2 > Maybe a kvm_arm_has_feature(struct kvm *kvm) helper would be nice to avoid all the &vcpu->kvm->arch.flags types of references getting scattered around. Reviewed-by: Andrew Jones Thanks, drew _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel