From patchwork Sat Jul 22 06:21:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 13322798 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59F75EB64DA for ; Sat, 22 Jul 2023 06:21:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229563AbjGVGVV (ORCPT ); Sat, 22 Jul 2023 02:21:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbjGVGVU (ORCPT ); Sat, 22 Jul 2023 02:21:20 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8715A26BA for ; Fri, 21 Jul 2023 23:21:18 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-31297125334so1613412f8f.0 for ; Fri, 21 Jul 2023 23:21:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1690006877; x=1690611677; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sCKadz1sa7B+pPByWCa2eSUlHWWYau2xZhNN+fFvTSE=; b=amHkH59ENGCnN2jKxyb6WgmweGcYn163+m+oXmMs6VrHrew3J0/0q6zB7Ot3PG37u/ CdIhwag54P2tJ14WmHKqpEw9Ie2mH4xeDr/KC+m6Bo5EThX43H+ePqcVOnkHZn7uWHja WP0HJFHgzz3O5r9OkuQoaXMfQx1JRESri2TBZWWUlSLpEDbptXZMPA5CfZVDY1CUx05x HF6rdNR/7N7QEEWhYRjVsd40DzchLpK/GMOyG1bK5LDS4OkE/A0Arqh0jph8NeJHfm5g rAZO2WSgaWyzJekgH6FtrdWh3TjKf8uSwWrpXdSBQkJp8r2JiahS5xY0OhlrbbFGodli Kd2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690006877; x=1690611677; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=sCKadz1sa7B+pPByWCa2eSUlHWWYau2xZhNN+fFvTSE=; b=CJJWsN/PwHU5L65susXFeELsQ7F2dyzvhURWNGy1FUKNK4J+c5fEYMjUo51wMjhvwd aBIHWhIVMROkxO3FF9/cdTWnNiPVb1x2534Dl1vOVQm+ZXCTjMuls81vOR1mfWbmcP2B ZL2YCenOo06wfGJpzdzCEIZ5st2FfYgSyuzcLY63kd3slvfij9Ozwp8/URxGH869T5Pi mac4qTZXpNFpX8fvSpJhV/RMB0xb1DCcMNk4yNp43TiuX7bDnbjd1vgOgTYFqq1SuICB WVUUyf83c4dSntHE/UOdLyf8hXBk6EGT5GC2crIjKmHQuwOUkbTJ38jx5TovloK/Wak4 1+ZA== X-Gm-Message-State: ABy/qLbnsfrv3Trn4m+UZuPUjjo2R4vH+cdMpXF3MllwggnPJi1m3JVI bbBbs+6jck8r/jcH7hO5XkjYEA== X-Google-Smtp-Source: APBJJlFg4BQVD/+fq5gDSBUNLzcoGaF27jAYI8khDVD0RfKWE/sHDbCxU7NomcQSUxgsp99BdzQ82Q== X-Received: by 2002:adf:e9c7:0:b0:311:360e:ea3a with SMTP id l7-20020adfe9c7000000b00311360eea3amr7111321wrn.34.1690006876834; Fri, 21 Jul 2023 23:21:16 -0700 (PDT) Received: from localhost (cst2-173-16.cust.vodafone.cz. [31.30.173.16]) by smtp.gmail.com with ESMTPSA id t16-20020a5d6a50000000b0030ae901bc54sm5983854wrw.62.2023.07.21.23.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 23:21:16 -0700 (PDT) From: Andrew Jones To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mtosatti@redhat.com, peter.maydell@linaro.org, pasic@linux.ibm.com, borntraeger@linux.ibm.com, thuth@redhat.com, dbarboza@ventanamicro.com, kvm@vger.kernel.org, qemu-arm@nongnu.org, qemu-s390x@nongnu.org Subject: [PATCH] kvm: Remove KVM_CREATE_IRQCHIP support assumption Date: Sat, 22 Jul 2023 08:21:16 +0200 Message-ID: <20230722062115.11950-2-ajones@ventanamicro.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-type: text/plain Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Since Linux commit 00f918f61c56 ("RISC-V: KVM: Skeletal in-kernel AIA irqchip support") checking KVM_CAP_IRQCHIP returns non-zero when the RISC-V platform has AIA. The cap indicates KVM supports at least one of the following ioctls: KVM_CREATE_IRQCHIP KVM_IRQ_LINE KVM_GET_IRQCHIP KVM_SET_IRQCHIP KVM_GET_LAPIC KVM_SET_LAPIC but the cap doesn't imply that KVM must support any of those ioctls in particular. However, QEMU was assuming the KVM_CREATE_IRQCHIP ioctl was supported. Stop making that assumption by introducing a KVM parameter that each architecture which supports KVM_CREATE_IRQCHIP sets. Adding parameters isn't awesome, but given how the KVM_CAP_IRQCHIP isn't very helpful on its own, we don't have a lot of options. Signed-off-by: Andrew Jones --- While this fixes booting guests on riscv KVM with AIA it's unlikely to get merged before the QEMU support for KVM AIA[1] lands, which would also fix the issue. I think this patch is still worth considering though since QEMU's assumption is wrong. [1] https://lore.kernel.org/all/20230714084429.22349-1-yongxuan.wang@sifive.com/ accel/kvm/kvm-all.c | 5 ++++- include/sysemu/kvm.h | 1 + target/arm/kvm.c | 3 +++ target/i386/kvm/kvm.c | 2 ++ target/s390x/kvm/kvm.c | 3 +++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 373d876c0580..0f5ff8630502 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -86,6 +86,7 @@ struct KVMParkedVcpu { }; KVMState *kvm_state; +bool kvm_has_create_irqchip; bool kvm_kernel_irqchip; bool kvm_split_irqchip; bool kvm_async_interrupts_allowed; @@ -2377,8 +2378,10 @@ static void kvm_irqchip_create(KVMState *s) if (s->kernel_irqchip_split == ON_OFF_AUTO_ON) { error_report("Split IRQ chip mode not supported."); exit(1); - } else { + } else if (kvm_has_create_irqchip) { ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP); + } else { + return; } } if (ret < 0) { diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 115f0cca79d1..84b1bb3dc91e 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -32,6 +32,7 @@ #ifdef CONFIG_KVM_IS_POSSIBLE extern bool kvm_allowed; +extern bool kvm_has_create_irqchip; extern bool kvm_kernel_irqchip; extern bool kvm_split_irqchip; extern bool kvm_async_interrupts_allowed; diff --git a/target/arm/kvm.c b/target/arm/kvm.c index b4c7654f4980..2fa87b495d68 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -250,6 +250,9 @@ int kvm_arm_get_max_vm_ipa_size(MachineState *ms, bool *fixed_ipa) int kvm_arch_init(MachineState *ms, KVMState *s) { int ret = 0; + + kvm_has_create_irqchip = kvm_check_extension(s, KVM_CAP_IRQCHIP); + /* For ARM interrupt delivery is always asynchronous, * whether we are using an in-kernel VGIC or not. */ diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index ebfaf3d24c79..6363e67f092d 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2771,6 +2771,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } } + kvm_has_create_irqchip = kvm_check_extension(s, KVM_CAP_IRQCHIP); + return 0; } diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index a9e5880349d9..c053304adf94 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -391,6 +391,9 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } kvm_set_max_memslot_size(KVM_SLOT_MAX_BYTES); + + kvm_has_create_irqchip = kvm_check_extension(s, KVM_CAP_S390_IRQCHIP); + return 0; }