From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
peter.maydell@linaro.org
Cc: yuzenghui@huawei.com, maz@kernel.org
Subject: [Qemu-devel] [RFC 2/3] intc/arm_gic: Support PPI injection for more than 256 vpus
Date: Tue, 27 Aug 2019 18:05:53 +0200 [thread overview]
Message-ID: <20190827160554.30995-3-eric.auger@redhat.com> (raw)
In-Reply-To: <20190827160554.30995-1-eric.auger@redhat.com>
Host kernels that expose the KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 capability
allow injection of PPIs along with vcpu ids larger than 255. Let's
encode the vpcu id on 12 bits according to the upgraded KVM_IRQ_LINE
ABI when needed.
Without that patch qemu exits with "kvm_set_irq: Invalid argument"
message.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reported-by: Zenghui Yu <yuzenghui@huawei.com>
---
hw/intc/arm_gic_kvm.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index b56fda144f..889293e97f 100644
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -56,6 +56,7 @@ void kvm_arm_gic_set_irq(uint32_t num_irq, int irq, int level)
* CPU number and interrupt number.
*/
int kvm_irq, irqtype, cpu;
+ int cpu_idx1 = 0, cpu_idx2 = 0;
if (irq < (num_irq - GIC_INTERNAL)) {
/* External interrupt. The kernel numbers these like the GIC
@@ -63,17 +64,20 @@ void kvm_arm_gic_set_irq(uint32_t num_irq, int irq, int level)
* internal ones.
*/
irqtype = KVM_ARM_IRQ_TYPE_SPI;
- cpu = 0;
irq += GIC_INTERNAL;
} else {
/* Internal interrupt: decode into (cpu, interrupt id) */
irqtype = KVM_ARM_IRQ_TYPE_PPI;
irq -= (num_irq - GIC_INTERNAL);
cpu = irq / GIC_INTERNAL;
+ cpu_idx2 = cpu / 256;
+ cpu_idx1 = cpu % 256;
irq %= GIC_INTERNAL;
}
- kvm_irq = (irqtype << KVM_ARM_IRQ_TYPE_SHIFT)
- | (cpu << KVM_ARM_IRQ_VCPU_SHIFT) | irq;
+ kvm_irq = (irqtype << KVM_ARM_IRQ_TYPE_SHIFT) |
+ (cpu_idx1 << KVM_ARM_IRQ_VCPU_SHIFT) |
+ ((cpu_idx2 & KVM_ARM_IRQ_VCPU2_MASK) << KVM_ARM_IRQ_VCPU2_SHIFT) |
+ irq;
kvm_set_irq(kvm_state, kvm_irq, !!level);
}
--
2.20.1
next prev parent reply other threads:[~2019-08-27 16:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 16:05 [Qemu-devel] [RFC 0/3] KVM/ARM: Fix >256 vcpus Eric Auger
2019-08-27 16:05 ` [Qemu-devel] [RFC 1/3] linux headers: update for KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 Eric Auger
2019-08-27 16:05 ` Eric Auger [this message]
2019-08-29 2:53 ` [Qemu-devel] [RFC 2/3] intc/arm_gic: Support PPI injection for more than 256 vpus Zenghui Yu
2019-08-29 7:58 ` Auger Eric
2019-08-29 9:21 ` Auger Eric
2019-09-03 8:29 ` Peter Maydell
2019-09-03 8:40 ` Auger Eric
2019-09-06 10:14 ` Peter Maydell
2019-08-27 16:05 ` [Qemu-devel] [RFC 3/3] virt: Check KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 for smp_cpus > 256 Eric Auger
2019-08-28 3:28 ` Richard Henderson
2019-08-28 6:19 ` Auger Eric
2019-09-06 10:16 ` Peter Maydell
2019-08-29 2:06 ` [Qemu-devel] [RFC 0/3] KVM/ARM: Fix >256 vcpus Zenghui Yu
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=20190827160554.30995-3-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=eric.auger.pro@gmail.com \
--cc=maz@kernel.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=yuzenghui@huawei.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).