From: Christoffer Dall <cdall@linaro.org> To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, Marc Zyngier <marc.zyngier@arm.com>, Alexander Graf <agraf@suse.de>, Peter Maydell <peter.maydell@linaro.org>, Christoffer Dall <cdall@linaro.org> Subject: [PATCH 1/5] KVM: arm64: Allow creating the PMU without the in-kernel GIC Date: Wed, 3 May 2017 20:32:56 +0200 [thread overview] Message-ID: <20170503183300.4618-2-cdall@linaro.org> (raw) In-Reply-To: <20170503183300.4618-1-cdall@linaro.org> Since we got support for devices in userspace which allows reporting the PMU overflow output status to userspace, we should actually allow creating the PMU on systems without an in-kernel irqchip, which in turn requires us to slightly clarify error codes for the ABI and move things around for the initialization phase. Signed-off-by: Christoffer Dall <cdall@linaro.org> --- Documentation/virtual/kvm/devices/vcpu.txt | 16 +++++++++------- virt/kvm/arm/pmu.c | 27 +++++++++++++++++---------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Documentation/virtual/kvm/devices/vcpu.txt b/Documentation/virtual/kvm/devices/vcpu.txt index 02f5068..352af6e 100644 --- a/Documentation/virtual/kvm/devices/vcpu.txt +++ b/Documentation/virtual/kvm/devices/vcpu.txt @@ -16,7 +16,9 @@ Parameters: in kvm_device_attr.addr the address for PMU overflow interrupt is a Returns: -EBUSY: The PMU overflow interrupt is already set -ENXIO: The overflow interrupt not set when attempting to get it -ENODEV: PMUv3 not supported - -EINVAL: Invalid PMU overflow interrupt number supplied + -EINVAL: Invalid PMU overflow interrupt number supplied or + trying to set the IRQ number without using an in-kernel + irqchip. A value describing the PMUv3 (Performance Monitor Unit v3) overflow interrupt number for this vcpu. This interrupt could be a PPI or SPI, but the interrupt @@ -25,11 +27,11 @@ all vcpus, while as an SPI it must be a separate number per vcpu. 1.2 ATTRIBUTE: KVM_ARM_VCPU_PMU_V3_INIT Parameters: no additional parameter in kvm_device_attr.addr -Returns: -ENODEV: PMUv3 not supported - -ENXIO: PMUv3 not properly configured as required prior to calling this - attribute +Returns: -ENODEV: PMUv3 not supported or GIC not initialized + -ENXIO: PMUv3 not properly configured or in-kernel irqchip not + conigured as required prior to calling this attribute -EBUSY: PMUv3 already initialized -Request the initialization of the PMUv3. This must be done after creating the -in-kernel irqchip. Creating a PMU with a userspace irqchip is currently not -supported. +Request the initialization of the PMUv3. If using the PMUv3 with an in-kernel +virtual GIC implementation, this must be done after initializing the in-kernel +irqchip. diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c index 4b43e7f..f046b08 100644 --- a/virt/kvm/arm/pmu.c +++ b/virt/kvm/arm/pmu.c @@ -456,21 +456,25 @@ static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu) if (!kvm_arm_support_pmu_v3()) return -ENODEV; - /* - * We currently require an in-kernel VGIC to use the PMU emulation, - * because we do not support forwarding PMU overflow interrupts to - * userspace yet. - */ - if (!irqchip_in_kernel(vcpu->kvm) || !vgic_initialized(vcpu->kvm)) - return -ENODEV; - - if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features) || - !kvm_arm_pmu_irq_initialized(vcpu)) + if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features)) return -ENXIO; if (kvm_arm_pmu_v3_ready(vcpu)) return -EBUSY; + if (irqchip_in_kernel(vcpu->kvm)) { + /* + * If using the PMU with an in-kernel virtual GIC + * implementation, we require the GIC to be already + * initialized when initializing the PMU. + */ + if (!vgic_initialized(vcpu->kvm)) + return -ENODEV; + + if (!kvm_arm_pmu_irq_initialized(vcpu)) + return -ENXIO; + } + kvm_pmu_vcpu_reset(vcpu); vcpu->arch.pmu.ready = true; @@ -512,6 +516,9 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) int __user *uaddr = (int __user *)(long)attr->addr; int irq; + if (!irqchip_in_kernel(vcpu->kvm)) + return -EINVAL; + if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features)) return -ENODEV; -- 2.9.0
WARNING: multiple messages have this Message-ID (diff)
From: cdall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/5] KVM: arm64: Allow creating the PMU without the in-kernel GIC Date: Wed, 3 May 2017 20:32:56 +0200 [thread overview] Message-ID: <20170503183300.4618-2-cdall@linaro.org> (raw) In-Reply-To: <20170503183300.4618-1-cdall@linaro.org> Since we got support for devices in userspace which allows reporting the PMU overflow output status to userspace, we should actually allow creating the PMU on systems without an in-kernel irqchip, which in turn requires us to slightly clarify error codes for the ABI and move things around for the initialization phase. Signed-off-by: Christoffer Dall <cdall@linaro.org> --- Documentation/virtual/kvm/devices/vcpu.txt | 16 +++++++++------- virt/kvm/arm/pmu.c | 27 +++++++++++++++++---------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/Documentation/virtual/kvm/devices/vcpu.txt b/Documentation/virtual/kvm/devices/vcpu.txt index 02f5068..352af6e 100644 --- a/Documentation/virtual/kvm/devices/vcpu.txt +++ b/Documentation/virtual/kvm/devices/vcpu.txt @@ -16,7 +16,9 @@ Parameters: in kvm_device_attr.addr the address for PMU overflow interrupt is a Returns: -EBUSY: The PMU overflow interrupt is already set -ENXIO: The overflow interrupt not set when attempting to get it -ENODEV: PMUv3 not supported - -EINVAL: Invalid PMU overflow interrupt number supplied + -EINVAL: Invalid PMU overflow interrupt number supplied or + trying to set the IRQ number without using an in-kernel + irqchip. A value describing the PMUv3 (Performance Monitor Unit v3) overflow interrupt number for this vcpu. This interrupt could be a PPI or SPI, but the interrupt @@ -25,11 +27,11 @@ all vcpus, while as an SPI it must be a separate number per vcpu. 1.2 ATTRIBUTE: KVM_ARM_VCPU_PMU_V3_INIT Parameters: no additional parameter in kvm_device_attr.addr -Returns: -ENODEV: PMUv3 not supported - -ENXIO: PMUv3 not properly configured as required prior to calling this - attribute +Returns: -ENODEV: PMUv3 not supported or GIC not initialized + -ENXIO: PMUv3 not properly configured or in-kernel irqchip not + conigured as required prior to calling this attribute -EBUSY: PMUv3 already initialized -Request the initialization of the PMUv3. This must be done after creating the -in-kernel irqchip. Creating a PMU with a userspace irqchip is currently not -supported. +Request the initialization of the PMUv3. If using the PMUv3 with an in-kernel +virtual GIC implementation, this must be done after initializing the in-kernel +irqchip. diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c index 4b43e7f..f046b08 100644 --- a/virt/kvm/arm/pmu.c +++ b/virt/kvm/arm/pmu.c @@ -456,21 +456,25 @@ static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu) if (!kvm_arm_support_pmu_v3()) return -ENODEV; - /* - * We currently require an in-kernel VGIC to use the PMU emulation, - * because we do not support forwarding PMU overflow interrupts to - * userspace yet. - */ - if (!irqchip_in_kernel(vcpu->kvm) || !vgic_initialized(vcpu->kvm)) - return -ENODEV; - - if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features) || - !kvm_arm_pmu_irq_initialized(vcpu)) + if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features)) return -ENXIO; if (kvm_arm_pmu_v3_ready(vcpu)) return -EBUSY; + if (irqchip_in_kernel(vcpu->kvm)) { + /* + * If using the PMU with an in-kernel virtual GIC + * implementation, we require the GIC to be already + * initialized when initializing the PMU. + */ + if (!vgic_initialized(vcpu->kvm)) + return -ENODEV; + + if (!kvm_arm_pmu_irq_initialized(vcpu)) + return -ENXIO; + } + kvm_pmu_vcpu_reset(vcpu); vcpu->arch.pmu.ready = true; @@ -512,6 +516,9 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) int __user *uaddr = (int __user *)(long)attr->addr; int irq; + if (!irqchip_in_kernel(vcpu->kvm)) + return -EINVAL; + if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features)) return -ENODEV; -- 2.9.0
next prev parent reply other threads:[~2017-05-03 18:33 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-03 18:32 [PATCH 0/5] Userspace timer IRQ number control and PMU with userspace-gic Christoffer Dall 2017-05-03 18:32 ` Christoffer Dall 2017-05-03 18:32 ` Christoffer Dall [this message] 2017-05-03 18:32 ` [PATCH 1/5] KVM: arm64: Allow creating the PMU without the in-kernel GIC Christoffer Dall 2017-05-04 8:09 ` Marc Zyngier 2017-05-04 8:09 ` Marc Zyngier 2017-05-04 8:13 ` Christoffer Dall 2017-05-04 8:13 ` Christoffer Dall 2017-05-04 8:28 ` Marc Zyngier 2017-05-04 8:28 ` Marc Zyngier 2017-05-04 8:38 ` Christoffer Dall 2017-05-04 8:38 ` Christoffer Dall 2017-05-04 9:05 ` Marc Zyngier 2017-05-04 9:05 ` Marc Zyngier 2017-05-04 9:44 ` Christoffer Dall 2017-05-04 9:44 ` Christoffer Dall 2017-05-04 10:16 ` Marc Zyngier 2017-05-04 10:16 ` Marc Zyngier 2017-05-04 10:38 ` Christoffer Dall 2017-05-04 10:38 ` Christoffer Dall 2017-05-03 18:32 ` [PATCH 2/5] KVM: arm: Handle VCPU device attributes in guest.c Christoffer Dall 2017-05-03 18:32 ` Christoffer Dall 2017-05-03 18:32 ` [PATCH 3/5] KVM: arm/arm64: Move irq_is_ppi() to header file Christoffer Dall 2017-05-03 18:32 ` Christoffer Dall 2017-05-04 8:11 ` Marc Zyngier 2017-05-04 8:11 ` Marc Zyngier 2017-05-03 18:32 ` [PATCH 4/5] KVM: arm/arm64: Move timer IRQ default init to arch_timer.c Christoffer Dall 2017-05-03 18:32 ` Christoffer Dall 2017-05-03 18:33 ` [PATCH 5/5] KVM: arm/arm64: Allow setting the timer IRQ numbers from userspace Christoffer Dall 2017-05-03 18:33 ` Christoffer Dall 2017-05-04 9:34 ` Marc Zyngier 2017-05-04 9:34 ` Marc Zyngier 2017-05-04 9:59 ` Christoffer Dall 2017-05-04 9:59 ` Christoffer Dall 2017-05-04 10:54 ` Marc Zyngier 2017-05-04 10:54 ` Marc Zyngier 2017-05-04 11:22 ` Christoffer Dall 2017-05-04 11:22 ` Christoffer Dall 2017-05-16 6:54 ` Christoffer Dall 2017-05-16 6:54 ` Christoffer Dall 2017-05-16 10:38 ` Christoffer Dall 2017-05-16 10:38 ` Christoffer Dall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170503183300.4618-2-cdall@linaro.org \ --to=cdall@linaro.org \ --cc=agraf@suse.de \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=peter.maydell@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.