From patchwork Wed Aug 25 16:18:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 12458365 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=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 1A9B5C4338F for ; Wed, 25 Aug 2021 16:45:42 +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 D05C9610E9 for ; Wed, 25 Aug 2021 16:45:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D05C9610E9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=M72TZwNpdSBmfEgxiNy4FsKdLRvP2S3+cgjuh4WdpwA=; b=zIqYS36aE+knB4 1jbfrt/km1wQq2M2qiQbfwrFBJIcJXydRhihB1gWiab7pN9MqqMX5qyzmwG1LnlmiHEvbh0r7KN60 rMjyqpFNKG0gVO+MDVJp5vccEL5mI1PzPj/rZ1jZ/VLjCZbVNblcQJjeEsme4+OkTZIP/s0WWuaQA WjSy0QwfI5XRfBiJLokHCEzdSHOUa6si2q30se2+VpYvSaWEoTQpypeF/oVIVd7pSHrDWvcv9/HyM M8Qy8UF4ffXFcIiHn9BcFfIFAIuH5vkYKf2dxruvDO8JLAvLe25HjntG7vksDanqG61aSd6/58P1U wjX9Lo2yG+zg9Eak+23Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIw03-007tCL-Aw; Wed, 25 Aug 2021 16:43:39 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIvbN-007glG-2H for linux-arm-kernel@lists.infradead.org; Wed, 25 Aug 2021 16:18:10 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DB4CF147A; Wed, 25 Aug 2021 09:18:08 -0700 (PDT) Received: from monolith.cable.virginm.net (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8AB543F66F; Wed, 25 Aug 2021 09:18:07 -0700 (PDT) From: Alexandru Elisei To: maz@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, will@kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v4 35/39] KVM: arm64: Add an userspace API to stop a VCPU profiling Date: Wed, 25 Aug 2021 17:18:11 +0100 Message-Id: <20210825161815.266051-36-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825161815.266051-1-alexandru.elisei@arm.com> References: <20210825161815.266051-1-alexandru.elisei@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210825_091809_239290_6231F05B X-CRM114-Status: GOOD ( 18.08 ) 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 Add the KVM_ARM_VCPU_SPE_CTRL(KVM_ARM_VCPU_SPE_STOP) VCPU attribute to allow userspace to request that KVM disables profiling for that VCPU. The ioctl does nothing yet. Signed-off-by: Alexandru Elisei --- Documentation/virt/kvm/devices/vcpu.rst | 36 +++++++++++++++++++++++++ arch/arm64/include/uapi/asm/kvm.h | 4 +++ arch/arm64/kvm/spe.c | 23 +++++++++++++--- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/Documentation/virt/kvm/devices/vcpu.rst b/Documentation/virt/kvm/devices/vcpu.rst index c275c320e500..b4e38261b00f 100644 --- a/Documentation/virt/kvm/devices/vcpu.rst +++ b/Documentation/virt/kvm/devices/vcpu.rst @@ -201,3 +201,39 @@ Returns: Request initialization of the Statistical Profiling Extension for this VCPU. Must be done after initializaing the in-kernel irqchip and after setting the Profiling Buffer management interrupt number for the VCPU. + +4.3 ATTRIBUTE: KVM_ARM_VCPU_SPE_STOP +------------------------------------ + +:Parameters: in kvm_device_attr.addr the address to the flag that specifies + what KVM should do when the guest enables profiling + +The flag must be exactly one of: + +- KVM_ARM_VCPU_SPE_STOP_TRAP: trap all register accesses and ignore the guest + trying to enable profiling. +- KVM_ARM_VCPU_SPE_STOP_EXIT: exit to userspace when the guest tries to enable + profiling. +- KVM_ARM_VCPU_SPE_RESUME: resume profiling, if it was previously stopped using + this attribute. + +If KVM detects that a vcpu is trying to run with SPE enabled when +KVM_ARM_VCPU_STOP_EXIT is set, KVM_RUN will return without entering the guest +with kvm_run.exit_reason equal to KVM_EXIT_FAIL_ENTRY, and the fail_entry struct +will be zeroed. + +Returns: + + ======= ============================================ + -EAGAIN SPE not initialized + -EFAULT Error accessing the flag + -EINVAL Invalid flag + -ENXIO SPE not supported or not properly configured + ======= ============================================ + +Request that KVM disables SPE for the given vcpu. This can be useful for +migration, which relies on tracking dirty pages by write-protecting memory, but +breaks SPE in the guest as KVM does not handle buffer stage 2 faults. + +The attribute must be set after SPE has been initialized successfully. It can be +set multiple times, with the latest value overwritting the previous one. diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index d4c0b53a5fb2..75a5113f610e 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -371,6 +371,10 @@ struct kvm_arm_copy_mte_tags { #define KVM_ARM_VCPU_SPE_CTRL 3 #define KVM_ARM_VCPU_SPE_IRQ 0 #define KVM_ARM_VCPU_SPE_INIT 1 +#define KVM_ARM_VCPU_SPE_STOP 2 +#define KVM_ARM_VCPU_SPE_STOP_TRAP (1 << 0) +#define KVM_ARM_VCPU_SPE_STOP_EXIT (1 << 1) +#define KVM_ARM_VCPU_SPE_RESUME (1 << 2) /* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_VCPU2_SHIFT 28 diff --git a/arch/arm64/kvm/spe.c b/arch/arm64/kvm/spe.c index 5b69501dc3da..2630e777fe1d 100644 --- a/arch/arm64/kvm/spe.c +++ b/arch/arm64/kvm/spe.c @@ -220,14 +220,14 @@ int kvm_spe_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) if (!kvm_vcpu_supports_spe(vcpu)) return -ENXIO; - if (vcpu->arch.spe.initialized) - return -EBUSY; - switch (attr->attr) { case KVM_ARM_VCPU_SPE_IRQ: { int __user *uaddr = (int __user *)(long)attr->addr; int irq; + if (vcpu->arch.spe.initialized) + return -EBUSY; + if (vcpu->arch.spe.irq_num) return -EBUSY; @@ -248,11 +248,27 @@ int kvm_spe_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) if (!vgic_initialized(vcpu->kvm)) return -ENXIO; + if (vcpu->arch.spe.initialized) + return -EBUSY; + if (kvm_vgic_set_owner(vcpu, vcpu->arch.spe.irq_num, &vcpu->arch.spe)) return -ENXIO; vcpu->arch.spe.initialized = true; return 0; + case KVM_ARM_VCPU_SPE_STOP: { + int __user *uaddr = (int __user *)(long)attr->addr; + int flags; + + if (!vcpu->arch.spe.initialized) + return -EAGAIN; + + if (get_user(flags, uaddr)) + return -EFAULT; + + if (!flags) + return -EINVAL; + } } return -ENXIO; @@ -290,6 +306,7 @@ int kvm_spe_has_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) switch(attr->attr) { case KVM_ARM_VCPU_SPE_IRQ: case KVM_ARM_VCPU_SPE_INIT: + case KVM_ARM_VCPU_SPE_STOP: return 0; }