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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 386A1C49ED9 for ; Thu, 12 Sep 2019 08:59:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 11DAA2084F for ; Thu, 12 Sep 2019 08:59:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11DAA2084F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Kx9-0001a2-7h for qemu-devel@archiver.kernel.org; Thu, 12 Sep 2019 04:59:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38119) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Kvt-0000Tw-1X for qemu-devel@nongnu.org; Thu, 12 Sep 2019 04:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8Kvr-0004A2-QE for qemu-devel@nongnu.org; Thu, 12 Sep 2019 04:58:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34848) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8Kvp-00049C-1M; Thu, 12 Sep 2019 04:58:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5554A3082128; Thu, 12 Sep 2019 08:58:24 +0000 (UTC) Received: from [10.36.116.238] (ovpn-116-238.ams2.redhat.com [10.36.116.238]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5B22C194B9; Thu, 12 Sep 2019 08:58:22 +0000 (UTC) To: Andrew Jones References: <20190911155125.11932-1-eric.auger@redhat.com> <20190911155125.11932-3-eric.auger@redhat.com> <20190912073641.p5x4gtt2s5rlrhl6@kamzik.brq.redhat.com> From: Auger Eric Message-ID: <9e6a9dfc-8045-7bc4-8070-5de33b362b75@redhat.com> Date: Thu, 12 Sep 2019 10:58:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190912073641.p5x4gtt2s5rlrhl6@kamzik.brq.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 12 Sep 2019 08:58:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [RFC v2 2/3] intc/arm_gic: Support IRQ injection for more than 256 vpus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, maz@kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, yuzenghui@huawei.com, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Drew, On 9/12/19 9:36 AM, Andrew Jones wrote: > On Wed, Sep 11, 2019 at 05:51:24PM +0200, Eric Auger wrote: >> Host kernels that expose the KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 capability >> allow injection of interrupts 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. >> >> Given that we have two callsites that need to assemble >> the value for kvm_set_irq(), a new helper routine, kvm_arm_set_irq >> is introduced. >> >> Without that patch qemu exits with "kvm_set_irq: Invalid argument" >> message. >> >> Signed-off-by: Eric Auger >> Reported-by: Zenghui Yu >> --- >> hw/intc/arm_gic_kvm.c | 7 ++----- >> target/arm/cpu.c | 10 ++++------ >> target/arm/kvm.c | 16 ++++++++++++++++ >> target/arm/kvm_arm.h | 1 + >> 4 files changed, 23 insertions(+), 11 deletions(-) >> >> diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c >> index b56fda144f..9deb15e7e6 100644 >> --- a/hw/intc/arm_gic_kvm.c >> +++ b/hw/intc/arm_gic_kvm.c >> @@ -55,7 +55,7 @@ void kvm_arm_gic_set_irq(uint32_t num_irq, int irq, int level) >> * has separate fields in the irq number for type, >> * CPU number and interrupt number. >> */ >> - int kvm_irq, irqtype, cpu; >> + int irqtype, cpu; >> >> if (irq < (num_irq - GIC_INTERNAL)) { >> /* External interrupt. The kernel numbers these like the GIC >> @@ -72,10 +72,7 @@ void kvm_arm_gic_set_irq(uint32_t num_irq, int irq, int level) >> cpu = irq / GIC_INTERNAL; >> irq %= GIC_INTERNAL; >> } >> - kvm_irq = (irqtype << KVM_ARM_IRQ_TYPE_SHIFT) >> - | (cpu << KVM_ARM_IRQ_VCPU_SHIFT) | irq; >> - >> - kvm_set_irq(kvm_state, kvm_irq, !!level); >> + kvm_arm_set_irq(cpu, irqtype, irq, !!level); >> } >> >> static void kvm_arm_gicv2_set_irq(void *opaque, int irq, int level) >> diff --git a/target/arm/cpu.c b/target/arm/cpu.c >> index 2399c14471..13813fb213 100644 >> --- a/target/arm/cpu.c >> +++ b/target/arm/cpu.c >> @@ -576,16 +576,16 @@ static void arm_cpu_kvm_set_irq(void *opaque, int irq, int level) >> ARMCPU *cpu = opaque; >> CPUARMState *env = &cpu->env; >> CPUState *cs = CPU(cpu); >> - int kvm_irq = KVM_ARM_IRQ_TYPE_CPU << KVM_ARM_IRQ_TYPE_SHIFT; >> uint32_t linestate_bit; >> + int irq_id; >> >> switch (irq) { >> case ARM_CPU_IRQ: >> - kvm_irq |= KVM_ARM_IRQ_CPU_IRQ; >> + irq_id = KVM_ARM_IRQ_CPU_IRQ; >> linestate_bit = CPU_INTERRUPT_HARD; >> break; >> case ARM_CPU_FIQ: >> - kvm_irq |= KVM_ARM_IRQ_CPU_FIQ; >> + irq_id = KVM_ARM_IRQ_CPU_FIQ; >> linestate_bit = CPU_INTERRUPT_FIQ; >> break; >> default: >> @@ -597,9 +597,7 @@ static void arm_cpu_kvm_set_irq(void *opaque, int irq, int level) >> } else { >> env->irq_line_state &= ~linestate_bit; >> } >> - >> - kvm_irq |= cs->cpu_index << KVM_ARM_IRQ_VCPU_SHIFT; >> - kvm_set_irq(kvm_state, kvm_irq, level ? 1 : 0); >> + kvm_arm_set_irq(cs->cpu_index, KVM_ARM_IRQ_TYPE_CPU, irq_id, !!level); >> #endif >> } >> >> diff --git a/target/arm/kvm.c b/target/arm/kvm.c >> index b2eaa50b8d..6cdfa2204f 100644 >> --- a/target/arm/kvm.c >> +++ b/target/arm/kvm.c >> @@ -744,6 +744,22 @@ int kvm_arm_vgic_probe(void) >> } >> } >> >> +int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level) >> +{ >> + int kvm_irq = 0; > > No need to init to zero, and could just immediately init with the > line below instead. > >> + >> + kvm_irq = (irqtype << KVM_ARM_IRQ_TYPE_SHIFT) | irq; >> + >> + if (cpu != 0) { > > No need for this 'if' > >> + int cpu_idx2 = cpu / 256; >> + int cpu_idx1 = cpu % 256; >> + >> + kvm_irq |= (cpu_idx1 << KVM_ARM_IRQ_VCPU_SHIFT) | >> + ((cpu_idx2 & KVM_ARM_IRQ_VCPU2_MASK) << KVM_ARM_IRQ_VCPU2_SHIFT); > > Masking should be unnecessary as the only way it'll do anything is if we > have vcpus >= 4096, which I imagine will never happen or will be guarded > against happening elsewhere. Silently masking doesn't look right anyway, > so I'd either add an assert(cpu_idx2 < 16) and drop the masking or just > drop the masking. All that makes sense. Thank you for the review. Eric > >> + } >> + return kvm_set_irq(kvm_state, kvm_irq, !!level); >> +} >> + >> int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, >> uint64_t address, uint32_t data, PCIDevice *dev) >> { >> diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h >> index b3106c8600..b4e19457a0 100644 >> --- a/target/arm/kvm_arm.h >> +++ b/target/arm/kvm_arm.h >> @@ -253,6 +253,7 @@ int kvm_arm_vgic_probe(void); >> >> void kvm_arm_pmu_set_irq(CPUState *cs, int irq); >> void kvm_arm_pmu_init(CPUState *cs); >> +int kvm_arm_set_irq(int cpu, int irqtype, int irq, int level); >> >> #else >> >> -- >> 2.20.1 >> >> > > Thanks, > drew >