From patchwork Mon Mar 14 06:19:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reiji Watanabe X-Patchwork-Id: 12779554 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 6587DC433F5 for ; Mon, 14 Mar 2022 06:23:56 +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:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=bRJsJogvO9oR4E/Hv7OchtNn7I7HmrQM1bOcwce3UQo=; b=BtGBWSkhpStY63fU3lH1JCjY0S /ys1Umi68dFOgNTOILgCqHPNMw8SDQhruyiCGNUSui1MZ/vNLauMc1jzN9aYfT5leyKuYS4d6Fbj5 pRH/2z4bvhIkd7Ss8B5AqZisX1I2QljkuPr+BR3B77klQFDOmgmF9YZAlWuXHzGtioGfOgiyVNglT xvZOpAmy9fIgDUTBxeALyl3MFr0lBQjjNZ2OumQLXFpYDwoEo4+bIhuSKWyhTkFkyXPAzWtw9ssev xjEShLCCpRvjQBG5eVuntA6mzoTRdNvTgLNM9SX4QfnU93GLBBIrNtpl0LlRtTk84GeRbosLh73oF P5gjX7MQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTe6P-003vqh-QB; Mon, 14 Mar 2022 06:22:45 +0000 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTe6M-003vpu-IK for linux-arm-kernel@lists.infradead.org; Mon, 14 Mar 2022 06:22:43 +0000 Received: by mail-pg1-x549.google.com with SMTP id s5-20020a637705000000b00380cf1d3eb0so8267790pgc.5 for ; Sun, 13 Mar 2022 23:22:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=xenb/1ISCk7dcRLaKlYQ+e2AP/GZy2ZjysoZ1kcszrY=; b=DSUsF7N3aIFH1i1fTiCK9CjN0QW6D948QKOUlGlh2UuiOkdNkXd8RKrg5hzi2McXzo Yby/XWXIvNWGESZTDF8EZBUzIjSXbtani23vt4vvf6d5zF+x20Ga5ICMET2gIZ/dvsUX QWYoNcTbBByUQiyuTCQYOj9Zti+Di3oUzex757zRF2Ny3h3//N1l284qlz1H1lufVjeg l5XOd+QHb3g5ky4wLgKXg5hj0zQZ9TTjtJciJm1xrJ+zgNPRZQb1eMmSeLfRIh9JcB30 8YS6rj1msDgtrUUuH45JJCSCpPjfij2qrjZgxUxpaXdQdKONK+7IhD224Vxfb1Xkkvln Cqxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=xenb/1ISCk7dcRLaKlYQ+e2AP/GZy2ZjysoZ1kcszrY=; b=ZfRWXjwyXfp91rQw+1Kli+q/7gOafxeuGaT4u+sFj0QhPH4BERxMCIMZo3aCGMMICP Yx2NwCaQYV99A8yTHKb/gggAY+mDBEYKZeR7yubhZy7Z5iQiN+bwS+DOkBE70keTPmRg D2f4JrC7J2Vk6r+DaFiRBsqdlTROJYv2cEOrSjnyeffLZYZBIvkUgUCvSsgakmv5/Xsj 6MGVBEJhGSJgzOHavX6hmf5PFKKZPtPq8ptmddl0uy7OaywOkxu3GjM9uSzP5Op0eaNe KXuBQYKiaf/FyCJG4250taZtkjAU8PkNuV5CmZPNOlKMs2q9fd2FU/mGSZL7DmdzCviN JU8Q== X-Gm-Message-State: AOAM533pwY7EXggcFcPNEmAYU0f2bH4XF8AxqFGIOgUUVDAV34anicqU r5aggKklzNjlOUvd2Wa2733NfctsWFk= X-Google-Smtp-Source: ABdhPJzOI3/KfFAuIBvluYrBdn2RPKcQ0dKj9zPVWBd0OLQsXs16GIBzPmI+10IH5RnAHwVrLDsOYvjMMZ8= X-Received: from reiji-vws-sp.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3d59]) (user=reijiw job=sendgmr) by 2002:a17:902:f708:b0:153:839f:bf2c with SMTP id h8-20020a170902f70800b00153839fbf2cmr1817565plo.113.1647238960836; Sun, 13 Mar 2022 23:22:40 -0700 (PDT) Date: Sun, 13 Mar 2022 23:19:57 -0700 In-Reply-To: <20220314061959.3349716-1-reijiw@google.com> Message-Id: <20220314061959.3349716-2-reijiw@google.com> Mime-Version: 1.0 References: <20220314061959.3349716-1-reijiw@google.com> X-Mailer: git-send-email 2.35.1.723.g4982287a31-goog Subject: [PATCH v4 1/3] KVM: arm64: Generalise VM features into a set of flags From: Reiji Watanabe To: Marc Zyngier , kvmarm@lists.cs.columbia.edu Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morse , Alexandru Elisei , Suzuki K Poulose , Paolo Bonzini , Will Deacon , Andrew Jones , Peng Liang , Peter Shier , Ricardo Koller , Oliver Upton , Jing Zhang , Raghavendra Rao Anata , Reiji Watanabe X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220313_232242_633229_74154091 X-CRM114-Status: GOOD ( 15.03 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Marc Zyngier 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 Reviewed-by: Andrew Jones Signed-off-by: Reiji Watanabe --- 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 5bc01e62c08a..11a7ae747ded 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 ecc5958e27fe..9a2d240ef6a3 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;