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 8AA7FCD14EC for ; Fri, 15 Sep 2023 19:34:04 +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: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=UZ+AA/2//beSYtzV3riZZMSj+X/3DLKBcXc7kammrpI=; b=QSAer4aaBONzBt 8RffFbgbfCKD+hwTq4Hhfj8G97Wy+ALgtPKPCBCvcVxWSQ5YhT/b0DQoYNVSg8fB98zLrEcGQovpX 5BWzC16cWl3eFmAXhLVFKpmQhWXrkd0WMYgf96AjsTn8/LqfRi/ko7FV51M2uePt6BVOJqB0yB1bh 4wXp/klIdtzSqieqJYqCvIK1UreapLd5/PLXIPTHUrqkj6eDzGGFANFmzwbht9hAwsqFE3nPituX5 kZVllMejV2lYrVrAaiWuwgdB92n+B9BZ6D7VrVBL8m4t+RZLvonM661wcpO3qjtu+znW6YPa3v9T0 hF6xa0TumFtyuqx4z4YA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qhEZM-00BGTh-1B; Fri, 15 Sep 2023 19:33:36 +0000 Received: from out-222.mta0.migadu.com ([2001:41d0:1004:224b::de]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qhEZH-00BGTI-0x for linux-arm-kernel@lists.infradead.org; Fri, 15 Sep 2023 19:33:33 +0000 Date: Fri, 15 Sep 2023 19:33:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1694806406; 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=6ggp2BB16iuPy0E9mpIKP4GvDgaoK0t3AKedagkTatk=; b=ZzbIXviTy6bhzqZZX5Ps8kN8VwMXijVJBl8SakQ+eOQu2eaUOTkrr24QCItPxAwDZ4fuyw 1hh5gZkmOd82Epwsq1elQzCHy8ZZ5gh9ICdXBB3IkqiWRAl/WGWSHhGVvs9I1YlmAb9C3v AQ/T2RAVP3V6v1p0eYFhGlBhKJs1Mpc= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: Raghavendra Rao Ananta Cc: Marc Zyngier , Alexandru Elisei , James Morse , Suzuki K Poulose , Paolo Bonzini , Zenghui Yu , Shaoqin Huang , Jing Zhang , Reiji Watanabe , Colton Lewis , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH v5 02/12] KVM: arm64: PMU: Set the default PMU for the guest on vCPU reset Message-ID: References: <20230817003029.3073210-1-rananta@google.com> <20230817003029.3073210-3-rananta@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230817003029.3073210-3-rananta@google.com> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230915_123331_756849_9B55C8C5 X-CRM114-Status: GOOD ( 23.75 ) 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 Thu, Aug 17, 2023 at 12:30:19AM +0000, Raghavendra Rao Ananta wrote: > From: Reiji Watanabe > > The following patches will use the number of counters information > from the arm_pmu and use this to set the PMCR.N for the guest > during vCPU reset. However, since the guest is not associated > with any arm_pmu until userspace configures the vPMU device > attributes, and a reset can happen before this event, call > kvm_arm_support_pmu_v3() just before doing the reset. > > No functional change intended. But there absolutely is a functional change here, and user visible at that. KVM_ARM_VCPU_INIT ioctls can now fail with -ENODEV, which is not part of the documented errors for the interface. > Signed-off-by: Reiji Watanabe > Signed-off-by: Raghavendra Rao Ananta > --- > arch/arm64/kvm/pmu-emul.c | 9 +-------- > arch/arm64/kvm/reset.c | 18 +++++++++++++----- > include/kvm/arm_pmu.h | 6 ++++++ > 3 files changed, 20 insertions(+), 13 deletions(-) > > diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c > index 0ffd1efa90c07..b87822024828a 100644 > --- a/arch/arm64/kvm/pmu-emul.c > +++ b/arch/arm64/kvm/pmu-emul.c > @@ -865,7 +865,7 @@ static bool pmu_irq_is_valid(struct kvm *kvm, int irq) > return true; > } > > -static int kvm_arm_set_vm_pmu(struct kvm *kvm, struct arm_pmu *arm_pmu) > +int kvm_arm_set_vm_pmu(struct kvm *kvm, struct arm_pmu *arm_pmu) > { > lockdep_assert_held(&kvm->arch.config_lock); > > @@ -937,13 +937,6 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) > if (vcpu->arch.pmu.created) > return -EBUSY; > > - if (!kvm->arch.arm_pmu) { > - int ret = kvm_arm_set_vm_pmu(kvm, NULL); > - > - if (ret) > - return ret; > - } > - > switch (attr->attr) { > case KVM_ARM_VCPU_PMU_V3_IRQ: { > int __user *uaddr = (int __user *)(long)attr->addr; > diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c > index bc8556b6f4590..4c20f1ccd0789 100644 > --- a/arch/arm64/kvm/reset.c > +++ b/arch/arm64/kvm/reset.c > @@ -206,6 +206,7 @@ static int kvm_vcpu_enable_ptrauth(struct kvm_vcpu *vcpu) > */ > int kvm_reset_vcpu(struct kvm_vcpu *vcpu) > { > + struct kvm *kvm = vcpu->kvm; > struct vcpu_reset_state reset_state; > int ret; > bool loaded; > @@ -216,6 +217,18 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) > vcpu->arch.reset_state.reset = false; > spin_unlock(&vcpu->arch.mp_state_lock); > > + /* > + * When the vCPU has a PMU, but no PMU is set for the guest > + * yet, set the default one. > + */ > + if (kvm_vcpu_has_pmu(vcpu) && unlikely(!kvm->arch.arm_pmu)) { > + ret = -EINVAL; > + if (kvm_arm_support_pmu_v3()) > + ret = kvm_arm_set_vm_pmu(kvm, NULL); > + if (ret) > + return ret; > + } > + On top of my prior suggestion w.r.t. the default PMU helper, I'd rather see this block look like: if (kvm_vcpu_has_pmu(vcpu)) { if (!kvm_arm_support_pmu_v3()) return -EINVAL; /* * When the vCPU has a PMU but no PMU is set for the * guest yet, set the default one. */ if (unlikely(!kvm->arch.arm_pmu) && kvm_set_default_pmu(kvm)) return -EINVAL; } This would eliminate the possibility of returning ENODEV to userspace where we shouldn't. -- Thanks, Oliver _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel